Commit cd8f166d

@@ -23,7 +23,7 @@
     <li class="nav-header"><%= current_user.name %></li>
     <li><a href="<%= url_for profile_path(current_user) %>"><i class="icon-user"></i> My Creations</a></li>
     <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> My Favorites</a></li>
-    <li><a href="<%= url_for edit_user_registration_path %>"><i class="icon-cog"></i> My Settings</a></li>
+    <li><a href="<%= url_for settings_path %>"><i class="icon-cog"></i> My Settings</a></li>
     <li class="nav-header">share</li>
     <li><a href="<%= url_for new_creation_path %>"><i class="icon-plus"></i> Add Creation</a></li>
     <li><a href="<%= url_for new_tutorial_path %>"><i class="icon-plus-sign"></i> Add Tutorial</a></li>

@@ -1,4 +1,5 @@
 <% provide(:title, "My Favorites") -%>
+<%= render :partial => "shared/account_nav", :locals => { :selected => :favorites } %>
 <div class="row">
   <div class="span3">
     <%= render :partial => "me_box"  %>

@@ -7,8 +7,6 @@ $(function(){
 </script>
 <% end %>
 
-<%= render :partial => "shared/account_nav" %>
-
 <div class="row">
   <div class="span3">
     <%= render "profiles/me_box" %>
@@ -65,32 +63,9 @@ $(function(){
     <% end %>
   </div>
   <div class="span2">
-    <p><a id="change-avatar" class="btn btn-primary" data-toggle="modal" href="#change-avatar-dialog">Change My Picture</a></p>
     <!--
     <h4>Cancel My Account</h4>
     <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => "btn btn-danger" %></p>
     -->
   </div>
 </div>
-<div id="change-avatar-dialog" class="modal hide fade">
-  <%= form_tag(avatars_path(current_user), :method => "post", :multipart => true) do |f| %>
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal">x</button>
-      <h3>Change My Picture</h3>
-    </div>
-    <div class="modal-body">
-      <p style="margin-left:auto; margin-right:auto;text-align:center;"> 
-        <%= avatar_for(current_user) %>
-      </p>
-      <p style="margin-left:auto; margin-right:auto;text-align:center;">
-      <%= fields_for Avatar.new do |f| %>
-        <%= f.file_field :avatar, :rel => avatars_path(current_user) %>
-      <% end %>
-      </p>
-    </div>
-    <div class="modal-footer">
-      <input type="submit" class="btn btn-primary" value="Save changes" />
-      <a href="#" class="btn" data-dismiss="modal">Close</a>
-    </div>
-  <% end %>
-</div>

@@ -4,6 +4,8 @@
       <li class="<%= selected == :basic_info ? "active" : "" %>"><%= link_to "Basic info", settings_path %></li>
       <li class="<%= selected == :password ? "active" : "" %>"><%= link_to "Password", passwords_path %></li>
       <li class="<%= selected == :picture ? "active" : "" %>"><%= link_to "Picture", edit_avatar_path(@user) %></li>
+      <li class="<%= selected == :profile ? "active" : "" %>"><%= link_to "Creations", profile_path(@user) %></li>
+      <li class="<%= selected == :favorites ? "active" : "" %>"><%= link_to "Favorites", profiles_favorites_path %></li>
     </ul>
   </div>
 </div>