3 files changed, 14 insertions, 7 deletions

diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 612a3d3c..d40d4e75 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -7,8 +7,12 @@
 <% end %>
 
 <div id="page_editor">
-<% form_for(@node) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@node) do |f| %>
+  <% if @node.errors.any? %>
+    <div class="error_messages">
+      <ul><% @node.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>
+    </div>
+  <% end %>
   
   <div id="metadata">
     <div class="node_description">Event</div>
@@ -35,7 +39,7 @@
          %>
     </div>
       
-    <% fields_for @draft do |d| %>
+    <%= fields_for @draft do |d| %>
     <div class="node_description">Tags - comma seperated</div>
     <div class="node_content"><%= text_field_tag :tag_list, @draft.tag_list %></div>
 
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index bf016459..e5a55d41 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -27,7 +27,7 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY") %>
       </td>
     </tr>
     <% end %>
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index 7d744de7..028d7270 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -1,11 +1,14 @@
 <h1>Create new node</h1>
 
-<%= error_messages_for( :node ).gsub("Slug", "Title") %>
-
+<% if @node.errors.any? %>
+  <div class="error_messages">
+    <ul><% @node.errors.full_messages.each do |msg| %><li><%= msg.to_s.gsub("Slug", "Title") %></li><% end %></ul>
+  </div>
+<% end %>
 
 <p>What kind of node do you want to create?</p>
 
-<% form_tag nodes_path do %>
+<%= form_tag nodes_path do %>
 <table id="new_node">
   <tr>
     <td class="description">Type</td>