Author: olamy
Date: Thu Feb 2 20:42:21 2012
New Revision: 1239826
URL: http://svn.apache.org/viewvc?rev=1239826&view=rev
Log:
[MRM-1598] use bootstrap css 2.x fix change password form
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html?rev=1239826&r1=1239825&r2=1239826&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
Thu Feb 2 20:42:21 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1239826&r1=1239825&r2=1239826&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Thu Feb 2 20:42:21 2012
@@ -478,7 +478,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("password-change-form",validator,errorMap,errorMap);
}
});