You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/02 21:41:38 UTC
svn commit: r1239821 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js: pom.xml
src/main/webapp/js/redback/templates/password-change-form.html
src/main/webapp/js/redback/templates/user-edit-form.html
src/main/webapp/js/redback/user.js
Author: olamy
Date: Thu Feb 2 20:41:38 2012
New Revision: 1239821
URL: http://svn.apache.org/viewvc?rev=1239821&view=rev
Log:
[MRM-1598] use bootstrap css 2.x fix edit user details form
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
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/templates/user-edit-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/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1239821&r1=1239820&r2=1239821&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Thu Feb 2 20:41:38 2012
@@ -615,6 +615,9 @@
<archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
<archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
</systemProperties>
+ <additionalClasspathDirs>
+ <additionalClasspathDir>src/test/tomcat</additionalClasspathDir>
+ </additionalClasspathDirs>
</configuration>
<dependencies>
<dependency>
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=1239821&r1=1239820&r2=1239821&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:41:38 2012
@@ -18,7 +18,7 @@
-->
<div id="modal-password-change" class="modal hide fade">
<div class="modal-header">
- <a href="#" class="close">×</a>
+ <a href="#" class="close" data-dismiss="modal">×</a>
<h3>${$.i18n.prop('password.section.title')}</h3>
</div>
<div class="modal-body" id="modal-password-change-content">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html?rev=1239821&r1=1239820&r2=1239821&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html Thu Feb 2 20:41:38 2012
@@ -18,48 +18,48 @@
-->
<div id="modal-user-edit" class="modal hide fade">
<div class="modal-header">
- <a href="#" class="close">×</a>
+ <a href="#" class="close" data-dismiss="modal">×</a>
<h3>${$.i18n.prop('password.section.title')}</h3>
</div>
<div class="modal-body" id="modal-user-edit-content">
- <form id="user-edit-form">
+ <form id="user-edit-form" class="form-horizontal">
<div id="modal-user-edit-err-message" class="alert-message error" style="display:none"></div>
<fieldset>
- <div class="clearfix">
- <label for="username">${$.i18n.prop('username')}</label>
- <div class="input" id="username-div">
+ <div class="control-group">
+ <label class="control-label" for="username">${$.i18n.prop('username')}</label>
+ <div class="controls" id="username-div">
<span class="uneditable-input" id="username"></span>
</div>
</div>
- <div class="clearfix">
- <label for="fullname">${$.i18n.prop('full.name')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
+ <div class="controls">
<input type="text" id="fullname" name="fullname" size="30" class="required"/>
</div>
</div>
- <div class="clearfix">
- <label for="email">${$.i18n.prop('email.address')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
+ <div class="controls">
<input type="text" id="email" name="email" size="30" class="required email"/>
</div>
</div>
- <div class="clearfix" id="user-edit-form-current-password-div">
- <label for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
- <div class="input">
+ <div class="control-group" id="user-edit-form-current-password-div">
+ <label class="control-label" for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
+ <div class="controls">
<input type="password" id="userEditFormCurrentPassword" name="userEditFormCurrentPassword" class="required" value=""/>
</div>
</div>
- <div class="clearfix">
- <label for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
+ <div class="controls">
<input type="password" id="userEditFormNewPassword" name="userEditFormNewPassword" class="" value=""/>
</div>
</div>
- <div class="clearfix">
- <label for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
+ <div class="controls">
<input type="password" id="userEditFormNewPasswordConfirm" name="userEditFormNewPasswordConfirm" class="" 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=1239821&r1=1239820&r2=1239821&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:41:38 2012
@@ -528,7 +528,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("user-edit-form",validator,errorMap,errorMap);
}
});