From 431a302123ab3c724db39b3c680862cefb4b601e Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 2 Feb 2012 20:42:21 +0000
Subject: [PATCH] [MRM-1598] use bootstrap css 2.x fix change password form

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1239826 13f79535-47bb-0310-9956-ffa450edef68
---
 .../templates/password-change-form.html       | 20 +++++++++----------
 .../src/main/webapp/js/redback/user.js        |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
index 18ce617c5..411abeea2 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
@@ -22,27 +22,27 @@
     <h3>${$.i18n.prop('password.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-password-change-content">
-      <form id="password-change-form">
+      <form id="password-change-form" class="form-horizontal">
         <div id="modal-password-change-err-message" class="alert-message error" style="display:none"></div>
         <fieldset>
           <!-- part displayed only when a logged user want to change password will be hide when validate user registration -->
-          <div class="clearfix" id="password-change-form-current-password-div">
-            <label for="password-change-form-current-password">${$.i18n.prop('password.existing')}</label>
-            <div class="input">
+          <div class="control-group" id="password-change-form-current-password-div">
+            <label class="control-label" for="password-change-form-current-password">${$.i18n.prop('password.existing')}</label>
+            <div class="controls">
               <input type="password" id="password-change-form-current-password" name="password-change-form-current-password" class="required" value=""/>
             </div>
           </div>
 
-          <div class="clearfix">
-            <label for="passwordChangeFormNewPassword">${$.i18n.prop('password.new')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label" for="passwordChangeFormNewPassword">${$.i18n.prop('password.new')}</label>
+            <div class="controls">
               <input type="password" id="passwordChangeFormNewPassword" name="passwordChangeFormNewPassword" class="required" value=""/>
             </div>
           </div>
 
-          <div class="clearfix">
-            <label for="passwordChangeFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
-            <div class="input">
+          <div class="control-group">
+            <label class="control-label"  for="passwordChangeFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
+            <div class="controls">
               <input type="password" id="passwordChangeFormNewPasswordConfirm" name="passwordChangeFormNewPasswordConfirm" class="required" value=""/>
             </div>
           </div>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index 6783ae457..e3ce82eff 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -478,7 +478,7 @@ $(function() {
         }
       },
       showErrors: function(validator, errorMap, errorList) {
-        customShowError(validator,errorMap,errorMap);
+        customShowError("password-change-form",validator,errorMap,errorMap);
       }
     });
 
-- 
2.39.5