From b0dc61b667976b1c5deac1f63a5c475c760aaeff Mon Sep 17 00:00:00 2001
From: Gregory Koberger <gkoberger@gmail.com>
Date: Mon, 25 Jul 2011 13:08:37 -0700
Subject: [PATCH] Reorder items on user edit page (bug 674018)

---
 apps/users/templates/users/edit_impala.html | 60 +++++++++++----------
 media/js/impala/users.js                    |  8 +++
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/apps/users/templates/users/edit_impala.html b/apps/users/templates/users/edit_impala.html
index a1b36b12ab4..d462ff5156a 100644
--- a/apps/users/templates/users/edit_impala.html
+++ b/apps/users/templates/users/edit_impala.html
@@ -58,6 +58,11 @@ <h4>{{ _('Delete Account') }}</h4>
               </label>
               {{ form.emailhidden.errors }}
             </li>
+            <li>
+              <label>&nbsp;</label>
+              <a href="#acct-password" id="change-acct-password">
+                {{ _('Change Password') }}</a>
+            </li>
           </ul>
         </fieldset>
 
@@ -85,27 +90,6 @@ <h4>{{ _('Delete Account') }}</h4>
             </li>
           </ol>
         </fieldset>
-
-        <fieldset id="acct-notify">
-          <legend>{{ _('Notifications') }}</legend>
-          <p>
-            {% trans %}
-            From time to time, Mozilla may send you email about upcoming
-            releases and add-on events. Please select the topics you are
-            interested in below:
-            {% endtrans %}
-          </p>
-          {{ form.notifications }}
-
-          <p class="note">
-            {% trans %}
-              Mozilla reserves the right to contact you individually about
-              specific concerns with your hosted add-ons.
-            {% endtrans %}
-          </p>
-        </fieldset>
-      </div>{# /#user-account #}
-      <div id="user-profile" class="tab-panel">
         <fieldset id="profile-personal">
           <legend>{{ _('Profile information') }}</legend>
           <ol>
@@ -157,24 +141,44 @@ <h4>{{ _('Delete Account') }}</h4>
           {{ some_html_tip() }}
           {{ form.bio.errors }}
         </fieldset> {# /.profile-detail #}
-
-        <ul>
-          <li>
+        <fieldset id="profile-detail" class="clearboth">
+          <legend>{{ _('Miscellaneous') }}</legend>
+          <ul>
+            <li>
             <label for="id_display_collections" class="check">
               {{ form.display_collections }}
               {{ _('Display the collections I have created') }}
             </label>
             {{ form.display_collections.errors }}
-          </li>
-          <li>
+            </li>
+            <li>
             <label for="id_display_collections_fav" class="check">
               {{ form.display_collections_fav }}
               {{ _("Display collections I'm following") }}
             </label>
             {{ form.display_collections_fav.errors }}
-          </li>
-        </ul>
+            </li>
+          </ul>
+        </fieldset>
+
+        <fieldset id="acct-notify">
+          <legend>{{ _('Notifications') }}</legend>
+          <p>
+            {% trans %}
+            From time to time, Mozilla may send you email about upcoming
+            releases and add-on events. Please select the topics you are
+            interested in below:
+            {% endtrans %}
+          </p>
+          {{ form.notifications }}
 
+          <p class="note">
+            {% trans %}
+              Mozilla reserves the right to contact you individually about
+              specific concerns with your hosted add-ons.
+            {% endtrans %}
+          </p>
+        </fieldset>
       </div>{# /#user-profile #}
       <div class="listing-footer">
         <button type="submit" class="button prominent">{{ _('Update') }}</button>
diff --git a/media/js/impala/users.js b/media/js/impala/users.js
index 584ff9ff787..e2f99a62be9 100644
--- a/media/js/impala/users.js
+++ b/media/js/impala/users.js
@@ -5,4 +5,12 @@ $(function() {
             $this.closest('li').find('input:not([disabled]').attr('checked', $this.hasClass('more-all'));
         }));
     }
+
+    // Hide change password box
+    $('#acct-password').hide();
+    $('#change-acct-password').click(_pd(function() {
+          $('#acct-password').show();
+          $('#id_oldpassword').focus();
+          $(this).closest('li').hide();
+    }));
 });