4 files changed, 18 insertions, 4 deletions

diff --git a/app/views/nodes/_preview.html.erb b/app/views/nodes/_preview.html.erb
new file mode 100644
index 00000000..e8d7b9fa
--- /dev/null
+++ b/app/views/nodes/_preview.html.erb
@@ -0,0 +1,5 @@
+<div id="preview_disclaimer">
+  <strong>Preview draft.</strong>
+  Clicking on links will redirected you to the public site.
+  <%= link_to 'Back to admin interface', nodes_path %>
+</div
\ No newline at end of file
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 929bbf6a..2dade0fe 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -13,9 +13,14 @@
     <%= f.error_messages %>
     
     <% fields_for @draft do |d| %>
+    
+    <p>
+      <%= d.label :published_at %><br />
+      <%= d.datetime_select :published_at %>
+    </p>
     <p>
       <%= d.label :template_name %>
-      <%= d.select :template_name, custom_page_templates %>
+      <%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %>
     </p>
     <p>
       <%= d.label :title %><br />
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 833ffed8..a2a42b1a 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -11,6 +11,7 @@
       <th class="path">Path</th>
       <th class="actions">Actions</th>
       <th class="editor">Locked by</th>
+      <th class="revision">Rev.</th>
     </tr>
     <% @nodes.each do |node| %>
     <tr class="<%= cycle("even", "odd") %>">
@@ -29,6 +30,9 @@
       <td>
         <%= "#{node.draft.user.login}" if node.draft && node.draft.user %>
       </td>
+      <td>
+        <%= node.head.revision if node.head %>
+      </td>
     </tr>
     <% end %>
   </table>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index dd37c280..67dd7fc5 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -1,5 +1,5 @@
 <h1>Node</h1>
 
-<%= @node.unique_name %>
-
-<%= link_to 'Edit', edit_node_path %>
\ No newline at end of file
+There is no draft to preview. Click <%= link_to 'edit', edit_node_path %> to 
+create one or view the currently 
+<%= link_to_path 'published version', @node.unique_path %>. 
\ No newline at end of file