Commit 7955a047

@@ -52,7 +52,7 @@
             <% end %>
           </li>
           <li>
-            <%= link_to my_settings_path do %>
+            <%= link_to my_root_path(anchor: 'profile') do %>
               <i class="fa fa-cog"></i>
             <% end %>
           </li>

@@ -3,22 +3,31 @@
     <%= 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="page-header">
+      <h1>Change Password</h1>
+    </div>
+    <%= 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" %>
+        <%= f.label :old_password, "Old password", class: "control-label" %>
+        <div class="controls">
+          <%= f.password_field :old_password %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :password, "New password", class: "control-label" %>
         <div class="controls">
           <%= f.password_field :password %>
         </div>
       </div>
       <div class="control-group">
-        <%= f.label :password_confirmation, "Confirm new password", :class => "control-label" %>
+        <%= f.label :password_confirmation, "Confirm new password", class: "control-label" %>
         <div class="controls">
           <%= f.password_field :password_confirmation %>
         </div>
       </div>
       <div class="control-group">
         <div class="controls">
-          <%= f.submit "Change password", :class=>"btn btn-primary" %>
+          <%= f.submit "Update password", class: "btn btn-primary" %>
         </div>
       </div>
     <% end %>

@@ -9,9 +9,10 @@
     <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?('settings') %>"><%= link_to "<i class='fa fa-cog'></i> Settings".html_safe, my_settings_path %></li>-->
+    <li id='profile-tab'><%= link_to "<i class='fa fa-cog'></i> Profile".html_safe, my_root_path(anchor: 'profile') %></li>
+    <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "<i class='fa fa-eye'></i> Account Settings".html_safe, my_passwords_path %></li>
     <li class="<%= "active" if controller?("favorites") %>"><%= link_to "<i class='fa fa-star'></i> Favorites".html_safe, my_favorites_path %></li>
-    <li class="<%= 'active' if controller?('settings') %>"><%= link_to "<i class='fa fa-cog'></i> Settings".html_safe, my_settings_path %></li>
-    <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "<i class='fa fa-eye'></i> Password".html_safe, my_passwords_path %></li>
     <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "<i class='fa fa-picture-o'></i> Picture".html_safe, new_my_avatar_path %></li>
     <li class="nav-header">Actions</li>
     <li>