[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

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 18ce617c5d0a53088e7d0d9f73b2085a5b2eeb05..411abeea2e0f15e8efd606908540bbbe7157e3bd 100644 (file)
--- 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 6783ae457737ea3b0ed5be48065f8443c49b6212..e3ce82effad92db2c3d28f7d4e3eaa9d11b4db79 100644 (file)
--- 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);
       }
     });