Merge pull request #156 from ChrisBr/remove_admin_dd

Removes admin from dropdown

app/views/layouts/_user_menu.html.haml

@@ -13,26 +13,13 @@
     Sign out
 -if has_role?(current_user, "admin") || has_role?(current_user, "organizer")
   %li.divider
-  %li.dropdown-header
-    Conferences
-  - @conferences.each do |conference|
     %li
-      = link_to(admin_conference_path(conference.short_title)) do
+      = link_to(admin_conference_index_path()) do
-        %span.glyphicon.glyphicon-cog
+        %span.glyphicon.glyphicon-home
-        Manage
+        Administration
-        = conference.short_title
+    -if @conference and @conference.id
-  %li
+      %li
-    = link_to(new_admin_conference_path) do
+        = link_to(admin_conference_path(@conference.short_title)) do
-      %span.glyphicon.glyphicon-plus
+          %span.glyphicon.glyphicon-cog
-      New Conference
+          Manage
-  %li.divider
+          = @conference.short_title
-  %li.dropdown-header
-    People
-  %li
-    = link_to(admin_users_path) do
-      %span.glyphicon.glyphicon-user
-      Users
-  %li
-    = link_to(admin_people_path) do
-      %span.glyphicon.glyphicon-star-empty
-      People