changed some node related methods and implementation of unlock

2 files changed, 4 insertions, 6 deletions

diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index d78a997..46c58f6 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -20,10 +20,8 @@
         <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
       </td>
       <td class="actions">
-          <%= link_to 'show',      node_path(node) %>
-          <%= link_to 'Revisions', node_revisions_path(node) %>
-          <%# link_to 'Destroy',  node, :method => :delete, :confirm => "Are you sure you want to delete this node?" %>
-          <%= link_to 'Unlock', unlock_node_path(node), :method => :put, :confirm => "Are you sure you want to unlock?" %>
+        <%= link_to 'show',      node_path(node) %>
+        <%= link_to 'Revisions', node_revisions_path(node) %>
       </td>
       <td>
         <%= node.lock_owner.login if node.lock_owner %>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 99fb264..87f65f5 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -2,7 +2,7 @@
   <%= link_to 'Edit', edit_node_path(@node), :class => "unselected" %>
   <%= link_to 'Preview', preview_page_path(@page) %>
   <%= link_to 'Revisions', node_revisions_path(@node) %>
-  <%= link_to 'Unlock', unlock_node_path(@node), :method => :put, :confirm => "Are you sure you want to unlock?" %>
+  <%= unlock_link if @node.locked? %>
 <% end %>
 
 
@@ -19,7 +19,7 @@
     <% if @page.node.locked? %>
     <tr>
       <td class="description">Locked by</td>
-      <td><%= @page.node.lock_owner.login %></td>
+      <td><span class="warning"><%= @page.node.lock_owner.login %></span></td>
     </tr>
     <% end %>
     <tr>