Return-Path: 
 <commits-return-10208-apmail-allura-commits-archive=allura.apache.org@allura.apache.org>
X-Original-To: apmail-allura-commits-archive@www.apache.org
Delivered-To: apmail-allura-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 57AF1118B1
	for <apmail-allura-commits-archive@www.apache.org>;
 Tue, 26 Aug 2014 20:20:07 +0000 (UTC)
Received: (qmail 88753 invoked by uid 500); 26 Aug 2014 20:20:07 -0000
Delivered-To: apmail-allura-commits-archive@allura.apache.org
Received: (qmail 88728 invoked by uid 500); 26 Aug 2014 20:20:07 -0000
Mailing-List: contact commits-help@allura.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@allura.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@allura.apache.org>
List-Post: <mailto:commits@allura.apache.org>
List-Id: <commits.allura.apache.org>
Reply-To: dev@allura.apache.org
Delivered-To: mailing list commits@allura.apache.org
Received: (qmail 88676 invoked by uid 99); 26 Aug 2014 20:20:07 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Aug 2014 20:20:07 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id F374E9CEB35; Tue, 26 Aug 2014 20:20:06 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: brondsem@apache.org
To: commits@allura.apache.org
Date: Tue, 26 Aug 2014 20:20:10 -0000
Message-Id: <8e6932288b9144858c4e8fef880be29f@git.apache.org>
In-Reply-To: <182fe7d250214ff4b952d5c7928034e8@git.apache.org>
References: <182fe7d250214ff4b952d5c7928034e8@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [5/6] git commit: [#7585] ticket:639 Small amends

[#7585] ticket:639 Small amends


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

Branch: refs/heads/master
Commit: e8938e54f50dde7b919c1173c482c70aadd06529
Parents: ce6c4aa
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Mon Aug 25 14:31:27 2014 +0300
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Tue Aug 26 19:24:58 2014 +0000

----------------------------------------------------------------------
 Allura/allura/templates/user_prefs.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/e8938e54/Allura/allura/templates/user_prefs.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_prefs.html b/Allura/allura/templates/user_prefs.html
index b4dcc85..883dcd9 100644
--- a/Allura/allura/templates/user_prefs.html
+++ b/Allura/allura/templates/user_prefs.html
@@ -113,12 +113,9 @@
             </tr>
           </table>
           <div class="grid-22">
-            <p></p>
-            <input type="hidden" name="password">
-          </div>
-          <div class="grid-22">
             {{lib.submit_button('Save', name='addr-save')}}
           </div>
+          {{lib.hidden_field('password', '')}}
           {{lib.csrf_token()}}
         </fieldset>
       </form>
@@ -235,7 +232,7 @@
           if ($("input[name='password']").val() == ''){
             e.preventDefault();
           }
-          if ($("input[name='new_addr.addr']").val().length != 0){
+          if ($(this).attr('name') == 'addr-save' || $("input[name='new_addr.addr']").val().length != 0) {
             launch();
           }
         });
@@ -251,4 +248,4 @@
         });
       });
   </script>
- {% endblock %}
\ No newline at end of file
+ {% endblock %}