5 files changed, 43 insertions, 60 deletions

diff --git a/app/views/admin/search_results.html.erb b/app/views/admin/search_results.html.erb
index f8aece0..a757197 100644
--- a/app/views/admin/search_results.html.erb
+++ b/app/views/admin/search_results.html.erb
@@ -1,7 +1,10 @@
 <h1>Search Results</h1>
 
-<ul>
-<%- @results.each do |result| %>
-  <li><%= link_to "#{result.title} (#{result.unique_name})", edit_node_path(result) %></li>
-<% end %>
+<ul class="search_results_list">
+  <% @results.each do |result| %>
+    <li>
+      <%= link_to title_for_node(result), node_path(result) %>
+      <span class="field_hint"><%= link_to_path("#{result.unique_name} ↗", result.unique_name) %></span>
+    </li>
+  <% end %>
 </ul>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 00d7075..61bb5c3 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -27,6 +27,14 @@
         <div id="main_navigation">
           <%= render :partial => 'admin/menu' if current_user %>
         </div>
+        <div id="search_widget" style="display: none;">
+          <div>
+            <%= form_tag admin_search_path, method: :get do %>
+              <span>Search: </span><%= text_field_tag :search_term, nil, autocomplete: "off" %>
+            <% end %>
+          </div>
+          <div id="menu_search_results" class="search_results" style="display: none"></div>
+        </div>
       </div>
       <div class="admin_content_spacer"></div>
       <% if flash[:notice].present? || flash[:error].present? %>
@@ -50,14 +58,5 @@
       
       <div id="results"></div>
     </div>
-    
-    <div id="search_widget" style="display: none;">
-      <div>
-        <%= form_tag admin_search_path, method: :get do %>
-          <span>Search: </span><%= text_field_tag :search_term, nil, autocomplete: "off" %>
-        <% end %>
-      </div>
-      <div id="menu_search_results" class="search_results" style="display: none"></div>
-    </div>
   </body>
 </html>
diff --git a/app/views/menu_items/new.html.erb b/app/views/menu_items/new.html.erb
index 223cb8e..8957293 100644
--- a/app/views/menu_items/new.html.erb
+++ b/app/views/menu_items/new.html.erb
@@ -1,30 +1,20 @@
 <h1>Add Menu Item</h1>
 
 <%= form_for @menu_item do |f| %>
-  <table>
-    
-    <tr>
-      <td class="description">Search</td>
-      <td>
-        <%= text_field_tag :menu_search_term %>
-        <div id="menu_item_search_results" class="search_results"></div>
-      </td>
-    </tr>
-    <tr>
-      <td class="description">Node Id</td>
-      <td><%= f.text_field :node_id %></td>
-    </tr>
-    <tr>
-      <td class="description">Path</td>
-      <td><%= f.text_field :path %></td>
-    </tr>
-    <tr>
-      <td class="description">Title</td>
-      <td><%= f.text_field :title %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td class="right"><%= f.submit 'Create' %></td>
-    </tr>
-  </table>
+  <div class="node_description">Search</div>
+  <div class="node_content">
+    <%= text_field_tag :menu_search_term %>
+    <div id="menu_item_search_results" class="search_results"></div>
+  </div>
+
+  <div class="node_description">Node Id</div>
+  <div class="node_content"><%= f.text_field :node_id %></div>
+
+  <div class="node_description">Path</div>
+  <div class="node_content"><%= f.text_field :path %></div>
+
+  <div class="node_description">Title</div>
+  <div class="node_content"><%= f.text_field :title %></div>
+
+  <div class="node_content"><%= f.submit 'Create' %></div>
 <% end %>
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index bb7e078..b63a606 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -46,7 +46,7 @@
   </div>
 
   <div class="node_description"></div>
-  <div class="node_content right"><%= submit_tag "Create" %></div>
+  <div class="node_content"><%= submit_tag "Create" %></div>
 
 </div>
 <% end %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 3c10303..23952b7 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,24 +1,15 @@
 <div id="login_form">
   <%= form_tag session_path do -%>
-  <table>
-    <tr>
-      <td></td>
-      <td>
-        <%= flash[:error] %>&nbsp;
-      </td>
-    </tr>
-    <tr>
-      <td class="description">Login</td>
-      <td><%= text_field_tag 'login', @login %></td>
-    </tr>
-    <tr>
-      <td class="description">Password</td>
-      <td><%= password_field_tag 'password', nil %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td class="right"><%= submit_tag 'log in' %></td>
-    </tr>
-  </table>
+    <% if flash[:error] %>
+      <div class="error_messages"><%= flash[:error] %></div>
+    <% end %>
+
+    <div class="node_description">Login</div>
+    <div class="node_content"><%= text_field_tag 'login', @login %></div>
+
+    <div class="node_description">Password</div>
+    <div class="node_content"><%= password_field_tag 'password', nil %></div>
+
+    <div class="node_content"><%= submit_tag 'log in' %></div>
   <% end -%>
 </div>