2 files changed, 17 insertions, 11 deletions

diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index cb13c8d..ea6c26f 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -39,11 +39,11 @@ module LinkHelper
   end
 
   def unlock_link
-    message = "Are you sure you want to unlock?\n" +
-              "Locked by #{@node.lock_owner.login}\n" +
-              "Last modified #{@page.updated_at.to_fs(:db)}"
-
-    link_to 'Unlock', unlock_node_path(@node), :method => :put, :data => { :confirm => message }
+    message = "Are you sure you want to unlock?\n" \
+      "Locked by #{@node.lock_owner.login}\n" \
+      "Last modified #{@page.updated_at.to_fs(:db)}"
+    button_to 'Unlock', unlock_node_path(@node),
+      method: :put,
+      form: { data: { confirm: message } }
   end
-
 end
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index c739ccd..a054a2e 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -28,14 +28,20 @@ module NodesHelper
   def user_list
     User.all.map {|u| [u.login, u.id]}
   end
-  
+
   def event_information
     if @node.event
-      "#{@node.event.start_time.to_fs(:db)} - #{@node.event.end_time.to_fs(:db)} > " \
-      "#{link_to 'show', event_path(@node.event)} " \
-      "#{link_to 'edit', edit_event_path(@node.event)}"
+      safe_join([
+        "#{@node.event.start_time.to_fs(:db)} - #{@node.event.end_time.to_fs(:db)} > ",
+        link_to('show', event_path(@node.event)),
+        ' ',
+        link_to('edit', edit_event_path(@node.event))
+      ])
     else
-      "no event attached > #{link_to 'add', new_event_path(:node_id => @node.id)}"
+      safe_join([
+        'no event attached > ',
+        link_to('add', new_event_path(:node_id => @node.id))
+      ])
     end
   end
 end