2 files changed, 19 insertions, 16 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d671384..e0098b0 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -29,46 +29,49 @@ class AdminController < ApplicationController
               .order("updated_at desc")
               .uniq.first(50)
   end
-  
+
+  def conventions
+    @node_kinds = CccConventions::NODE_KINDS
+  end
+
   def search
     @results = Node.search params[:search_term], :per_page => 1000
-    
+
     respond_to do |format|
       format.html do
         render :template => 'admin/search_results'
       end
-      format.js do 
-        render( :json => @results.map do |node| 
+      format.js do
+        render( :json => @results.map do |node|
             if node
               { :id => node.id, :title => node.title, :unique_name => node.unique_name, :node_path => node_path(node) }
             end
           end
         )
-        
-      end 
+
+      end
     end
   end
-  
+
   def menu_search
     if params[:search_term] == "Root"
       @results = [Node.root]
     else
       @results = Node.search params[:search_term]
     end
-    
+
     respond_to do |format|
       format.html do
         render :partial => 'admin/menu_search_results'
       end
-      
-      format.js do 
-        render( :json => @results.map do |node| 
-          {:node_id => node.id, :title => node.title, :unique_name => node.unique_name} 
+
+      format.js do
+        render( :json => @results.map do |node|
+          {:node_id => node.id, :title => node.title, :unique_name => node.unique_name, :node_path => node_path(node)}
           end
         )
-        
-      end 
+
+      end
     end
   end
-  
 end
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 4536693..a7ce68a 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -49,7 +49,7 @@
           <span>Search: </span><%= text_field_tag :search_term, nil, autocomplete: "off" %>
         <% end %>
       </div>
-      <div id="search_results" style="display: none">
+      <div id="menu_search_results" style="display: none">
         
       </div>
     </div>