changed the ui click flow a bit

5 files changed, 37 insertions, 10 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index e442bd2..20aea5a 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -90,7 +90,7 @@ class NodesController < ApplicationController
       flash[:notice] = "Cannot unlock"
     end
     
-    redirect_to nodes_path
+    redirect_to :back
   end
   
   def move_to
diff --git a/app/models/node.rb b/app/models/node.rb
index b23e43b..4e94efc 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -137,6 +137,10 @@ class Node < ActiveRecord::Base
     self.save
   end
   
+  def locked?
+    !self.lock_owner.nil?
+  end
+  
   def unlock!
     self.lock_owner = nil
     self.save
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index c23381f..0635dac 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -48,7 +48,7 @@
       </tr>
       <tr>
         <td class="description">Publish at</td>
-        <td><%= d.datetime_select :published_at %></td>
+        <td><%= d.datetime_select :published_at, :value => @draft.published_at %></td>
       </tr>
       <tr>
         <td class="description">Template</td>
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 2f6069f..0603c08 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -16,11 +16,11 @@
     <tr class="<%= cycle("even", "odd") %>">
       <td class="node_id"><%= node.id %></td>
       <td class="title">
-        <h4><%= link_to title_for_node(node), edit_node_path(node) %></h4>
+        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
         <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
       </td>
       <td class="actions">
-          <%= link_to 'Preview',     node_path(node) %>
+          <%= link_to 'show',      node_path(node) %>
           <%= link_to 'Revisions', :controller => :revisions, :action => :show, :id => node.id %>
           <%# 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?" %>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 15547f9..8d8a985 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -1,26 +1,49 @@
 <% content_for :subnavigation do %>
   <%= link_to 'Edit', edit_node_path(@node), :class => "unselected" %>
   <%= link_to 'Preview', preview_page_path(@page) %>
-  <%= link_to 'Revisions', revision_path(params[:id]) %>  
+  <%= link_to 'Revisions', revision_path(params[:id]) %>
+  <%= link_to 'Unlock', unlock_node_path(@node), :method => :put, :confirm => "Are you sure you want to unlock?" %>
 <% end %>
 
 
 <div id="page_editor" class="show_node">
   <table id="content">
     <tr>
-      <th class="description"></th>
-      <th class="content"></th>
+      <td class="description">Path</td>
+      <td><%= @page.public_link %></td>
     </tr>
     <tr>
-      <td class="description">Title</td>
+      <td class="description">Author</td>
+      <td><%= @page.user.try(:login) %></td>
+    </tr>
+    <% if @page.node.locked? %>
+    <tr>
+      <td class="description">Locked by</td>
+      <td><%= @page.node.lock_owner.login %></td>
+    </tr>
+    <% end %>
+    <tr>
+      <td class="description">Last updated</td>
+      <td><%= @page.updated_at %></td>
+    </tr>
+    <tr>
+      <td class="description">Published at</td>
+      <td><%= @page.published_at %></td>
+    </tr>
+    <tr>
+      <td class="description">Revision</td>
+      <td><%= @page.revision %></td>
+    </tr>
+    <tr>
+      <td class="description"><strong>Title</strong></td>
       <td><%= @page.title %></td>
     </tr>
     <tr>
-      <td class="description">Abstract</td>
+      <td class="description"><strong>Abstract</strong></td>
       <td><%= @page.abstract %></td>
     </tr>
     <tr>
-      <td class="description">Body</td>
+      <td class="description"><strong>Body</strong></td>
       <td><%= @page.body %></td>
     </tr>
     <tr>