Commit 80c0dc4b

@@ -30,5 +30,5 @@ class CakeSide.Controllers.CakesController extends Marionette.Controller
     @comment_view.hide()
 
   selectTab: ->
-    $('.nav-tabs').children().removeClass('active')
+    $('.nav-list').children().removeClass('active')
     $('#cakes-tab').addClass('active')

@@ -16,5 +16,5 @@ class CakeSide.Controllers.TutorialsController extends Marionette.Controller
     @content_region.show(new @views.NewView(collection: @tutorials))
 
   selectTab: ->
-    $('.nav-tabs').children().removeClass('active')
+    $('.nav-list').children().removeClass('active')
     $('#tutorial-tab').addClass('active')

@@ -1,6 +1,9 @@
 <%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
-  <div class="span12">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <%= avatar_for(current_user) %>
     <%= form_for(@avatar, :url => my_avatar_path(@avatar), :method => :put, :multipart => true, remote: true, authenticity_token: true) do |f| %>
       <div class="control-group">

@@ -1,7 +1,10 @@
 <% provide(:title, "Dashboard") -%>
 <%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
-  <div class="span7">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span5">
     <% @items.each do |item| %>
       <%= render item.class.to_s.downcase, item: item %>
     <% end %>

@@ -1,22 +1,27 @@
 <% provide(:title, "My Favorites") -%>
 <%= render partial: "shared/account_nav" %>
 <div class="row-fluid">
-  <% @creations.each_slice(6).each do |batch| %>
-    <ul class='thumbnails'>
-      <% batch.each do |creation| %>
-        <li class="span2">
-          <div class="thumbnail">
-            <%= link_to creation do %>
-              <%= image_tag creation.primary_image.url_for(:thumb) %>
-            <% end %>
-            <div class="caption">
-              <h4><%= link_to shrink(creation.name, 12), creation %></h4>
-              <p><%= link_to shrink(creation.user.name, 20), profile_path(creation.user) %></p>
-              <p><small><%= time_ago_in_words(creation.created_at) %> ago.</small></p>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
+    <% @creations.each_slice(6).each do |batch| %>
+      <ul class='thumbnails'>
+        <% batch.each do |creation| %>
+          <li class="span2">
+            <div class="thumbnail">
+              <%= link_to creation do %>
+                <%= image_tag creation.primary_image.url_for(:thumb) %>
+              <% end %>
+              <div class="caption">
+                <h4><%= link_to shrink(creation.name, 12), creation %></h4>
+                <p><%= link_to shrink(creation.user.name, 20), profile_path(creation.user) %></p>
+                <p><small><%= time_ago_in_words(creation.created_at) %> ago.</small></p>
+              </div>
             </div>
-          </div>
-        </li>
-      <% end %>
-    </ul>
-  <% end %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
 </div>

@@ -15,6 +15,14 @@
 <% end -%>
 
 <%= render partial: "shared/account_nav" %>
-<div id="backbone-content"></div>
-<div id="disqus_thread"></div>
+
+<div class="row-fluid">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
+    <div id="backbone-content"></div>
+    <div id="disqus_thread"></div>
+  </div>
+</div>
 <div id="modal" class="modal hide fade"></div>

@@ -1,7 +1,10 @@
 <%= render partial: "shared/account_nav" %>
 
 <div class="row-fluid">
-  <div class="span12">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <%= form_for(@user, :url => my_password_path(@user), :html => { :method => :patch, :class => "form-horizontal" }) do |f| %>
       <div class="control-group">
         <%= f.label :password, "New password", :class => "control-label" %>

@@ -10,7 +10,10 @@
 <%= render partial: "shared/account_nav" %>
 
 <div class="row-fluid">
-  <div class="span12">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <%= form_for(@user, :url => my_setting_path(@user), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
       <fieldset>
         <div class="control-group">

@@ -0,0 +1,23 @@
+<div class="well sidebar-nav">
+  <ul class="nav nav-list">
+    <li class="nav-header">My</li>
+    <li class="<%= "active" if controller?("dashboard") %>"><%= link_to "Dashboard", my_dashboard_path %></li>
+    <li id="cakes-tab" class="<%= "active" if controller?("cakes") %>"><%= link_to "Creations", my_root_path(anchor: 'cakes') %></li>
+    <li id="tutorial-tab"><%= link_to "Tutorials", my_root_path(anchor: 'tutorials') %></li>
+    <li class="<%= "active" if controller?("favorites") %>"><%= link_to "Favorites", my_favorites_path %></li>
+    <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>
+  </ul>
+</div>

@@ -1,13 +1,6 @@
 <div class="row-fluid">
   <div class="span12">
     <ul class="nav nav-tabs">
-      <li class="<%= "active" if controller?("dashboard") %>"><%= link_to "Dashboard", my_dashboard_path %></li>
-      <li id="cakes-tab" class="<%= "active" if controller?("cakes") %>"><%= link_to "Creations", my_root_path(anchor: 'cakes') %></li>
-      <li id="tutorial-tab"><%= link_to "Tutorials", my_root_path(anchor: 'tutorials') %></li>
-      <li class="<%= "active" if controller?("favorites") %>"><%= link_to "Favorites", my_favorites_path %></li>
-      <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="pull-right"><%= link_to t('.logout'), logout_path, method: :delete, class: "btn btn-inverse" %></li>
       <% if current_user.admin? %>
       <li class="pull-right"><%= link_to t('.admin'), admin_root_path %></li>