Commit dd7d513b

@@ -25,16 +25,30 @@
             <% end %>
           </li>
           <% @categories.each do |category| %>
-              <li class="<%= "active" if params["slug"] == category.slug %>"><%= link_to category.name.pluralize, category_path(category) %></li>
+            <li class="<%= "active" if params["slug"] == category.slug %>"><%= link_to category.name.pluralize, category_path(category) %></li>
           <% end %>
           <li class="<%= "active" if params["controller"] == "profiles" %>"> <%= link_to "Artists", profiles_path %> </li>
           <li class="<%= "active" if params["controller"] == "tutorials" %>"> <%= link_to "Tutorials", tutorials_path %> </li>
-          <li>
-            <%= link_to user_signed_in? ? my_root_path(anchor: 'cakes/new') : login_path do %>
-              <i class="icon-edit icon-large"></i> Add Creation
-            <% end %>
+          <% if user_signed_in? %>
+          <li class="dropdown">
+            <a class="dropdown-toggle" data-toggle="dropdown" href="#"> 
+              <i class="icon-plus"></i> <b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+              <li>
+                <%= link_to my_root_path(anchor: 'cakes/new') do %>
+                  <i class="icon-camera"></i> New Cake
+                <% end %>
+              </li>
+              <li>
+                <%= link_to my_root_path(anchor: 'tutorials/new') do %>
+                  <i class="icon-edit"></i> New Tutorial
+                <% end %>
+              </li>
+            </ul>
           </li>
         </ul>
+        <% end %>
       </div><!--/.nav-collapse -->
     </div>
   </div>

@@ -1,4 +1,3 @@
-<%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
   <div class="span2">
     <%= render partial: "my/shared/my_nav" %>

@@ -1,5 +1,4 @@
 <% provide(:title, "Dashboard") -%>
-<%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
   <div class="span2">
     <%= render partial: "my/shared/my_nav" %>

@@ -1,5 +1,4 @@
 <% provide(:title, "My Favorites") -%>
-<%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
   <div class="span2">
     <%= render partial: "my/shared/my_nav" %>

@@ -14,8 +14,6 @@
   <% end %>
 <% end -%>
 
-<%= render partial: "shared/account_nav" %>
-
 <div class="row-fluid">
   <div class="span2">
     <%= render partial: "my/shared/my_nav" %>

@@ -1,5 +1,3 @@
-<%= render partial: "shared/account_nav" %>
-
 <div class="row-fluid">
   <div class="span2">
     <%= render partial: "my/shared/my_nav" %>

@@ -7,8 +7,6 @@
 </script>
 <% end %>
 
-<%= render partial: "shared/account_nav" %>
-
 <div class="row-fluid">
   <div class="span2">
     <%= render partial: "my/shared/my_nav" %>

@@ -8,16 +8,21 @@
     <li class="<%= 'active' if controller?('settings') %>"><%= link_to "Settings", my_settings_path %></li>
     <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "Password", my_passwords_path %></li>
     <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "Picture", edit_my_avatar_path(current_user) %></li>
-    <li class="nav-header">Sidebar</li>
-    <li><a href="#">Link</a></li>
-    <li><a href="#">Link</a></li>
-    <li><a href="#">Link</a></li>
-    <li><a href="#">Link</a></li>
-    <li><a href="#">Link</a></li>
-    <li><a href="#">Link</a></li>
-    <li class="nav-header">Sidebar</li>
-    <li><a href="#">Link</a></li>
-    <li><a href="#">Link</a></li>
-    <li><a href="#">Link</a></li>
+    <li class="nav-header">Actions</li>
+    <li>
+      <%= link_to my_root_path(anchor: 'cakes/new') do %>
+        <i class="icon-camera"></i> New Cake
+      <% end %>
+    </li>
+    <li>
+      <%= link_to my_root_path(anchor: 'tutorials/new') do %>
+        <i class="icon-edit"></i> New Tutorial
+      <% end %>
+    </li>
+    <li class="nav-header">Other</li>
+    <% if current_user.admin? %>
+    <li><%= link_to t('.admin'), admin_root_path %></li>
+    <% end %>
+    <li><%= link_to t('.logout'), logout_path, method: :delete %></li>
   </ul>
 </div>

@@ -28,7 +28,8 @@ en:
     updated: 'Your password was updated.'
   profile_saved: 'Your settings have been updated successfully!'
   avatar_uploaded: 'Your avatar has been updated.'
-  shared:
-    account_nav:
-      admin: 'Admin'
-      logout: 'Log Out'
+  my:
+    shared:
+      my_nav:
+        admin: 'Admin'
+        logout: 'Log Out'