allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [2/6] git commit: [#7585] ticket:642 Move popup to prefs block
Date Tue, 26 Aug 2014 20:20:07 GMT
[#7585] ticket:642 Move popup to prefs block


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7c30568b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7c30568b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7c30568b

Branch: refs/heads/master
Commit: 7c30568b9f2af9aa44b43a79e629fdb080a1b0b8
Parents: e8938e5
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Aug 26 14:23:59 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Tue Aug 26 19:24:58 2014 +0000

----------------------------------------------------------------------
 Allura/allura/templates/user_prefs.html | 33 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/7c30568b/Allura/allura/templates/user_prefs.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_prefs.html b/Allura/allura/templates/user_prefs.html
index 883dcd9..fec5dcd 100644
--- a/Allura/allura/templates/user_prefs.html
+++ b/Allura/allura/templates/user_prefs.html
@@ -84,7 +84,7 @@
               {% set obj = c.user.address_object(a) %}
               {% if obj.confirmed %}
                 <td>{{lib.radio_button('primary_addr', None, a, c.user.preferences.email_address)}}</td>
-              {% else %} 
+              {% else %}
                 <td> <input type="radio" disabled="disabled"></td>
               {% endif %}
               <td>{{a}}</td>
@@ -119,6 +119,22 @@
           {{lib.csrf_token()}}
         </fieldset>
       </form>
+
+      <!-- popup -->
+      <form class="cur_password" style="display:none">
+        <div class="grid-13">
+          <p>{{lib.password_field('current_password', 'Current password:')}}</p>
+        </div>
+        <div class="grid-13">
+          <p>
+          <input type="submit" name="enter_pass_submit" value="Ok">
+          <input type="button" name="cancel_lightbox" value="Cancel">
+          </p>
+        </div>
+      </form>
+      {{c.enter_password.display(content='<h1>Enter password</h1>')}}
+      <!-- end popup -->
+
       {% endif %}  {# allow_edit_prefs #}
     {% endblock edit_prefs_form %}
 
@@ -157,19 +173,6 @@
           </form>
         </fieldset>
       {% endif %}
-      
-      <form class="cur_password" style="display:none">
-        <div class="grid-13"> 
-          <p>{{lib.password_field('current_password', 'Current password:')}}</p>
-        </div>
-        <div class="grid-13">
-          <p>  
-          <input type="submit" name="enter_pass_submit" value="Ok">
-          <input type="button" name="cancel_lightbox" value="Cancel">
-          </p>
-        </div>
-      </form>
-      {{c.enter_password.display(content='<h1>Enter password</h1>')}}
     {% endblock %}
   </div>
 {% endblock %}
@@ -209,7 +212,7 @@
 
           enter_password_popup.append(enter_password_form.show());
           enter_password_popup.lightbox_me({
-            onLoad: function() { 
+            onLoad: function() {
             $('.cur_password').find('input:first').focus();
             }
           });


Mime
View raw message