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:42:35 UTC
svn commit: r1239827 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback:
templates/user-edit.html user.js users.js
Author: olamy
Date: Thu Feb 2 20:42:35 2012
New Revision: 1239827
URL: http://svn.apache.org/viewvc?rev=1239827&view=rev
Log:
[MRM-1598] use bootstrap css 2.x fix user edition form
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html?rev=1239827&r1=1239826&r2=1239827&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html Thu Feb 2 20:42:35 2012
@@ -30,11 +30,11 @@
<div id="user-create-div" class="active">
<div class="row">
<div class="span8 columns">
- <form id="user-create">
+ <form id="user-create" class="form-horizontal">
<fieldset id="user-create-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">
{{if $data.username.length>0}}
<span class="uneditable-input">${$data.username}</span>
{{else}}
@@ -42,45 +42,45 @@
{{/if}}
</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" data-bind="value: fullName"/>
</div>
</div>
- <div class="clearfix">
- <label for="password">${$.i18n.prop('password')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="password">${$.i18n.prop('password')}</label>
+ <div class="controls">
<input type="password" id="password" name="password" class="required" data-bind="value: password"/>
</div>
</div>
- <div class="clearfix">
- <label for="confirmPassword">${$.i18n.prop('confirm.password')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="confirmPassword">${$.i18n.prop('confirm.password')}</label>
+ <div class="controls">
<input type="password" id="confirmPassword" name="confirmPassword" data-bind="value: confirmPassword"/>
</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" class="required email" data-bind="value: email"/>
</div>
</div>
- <div class="clearfix">
- <label for="validated">${$.i18n.prop('validated')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="validated">${$.i18n.prop('validated')}</label>
+ <div class="controls">
<input type="checkbox" id="validated" name="validated" data-bind="checked: validated"/>
</div>
</div>
- <div class="clearfix">
- <label for="locked">${$.i18n.prop('locked')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="locked">${$.i18n.prop('locked')}</label>
+ <div class="controls">
<input type="checkbox" id="locked" name="locked" data-bind="checked: locked"/>
</div>
</div>
- <div class="clearfix">
- <label for="passwordChangeRequired">${$.i18n.prop('user.change.password.required')}</label>
- <div class="input">
+ <div class="control-group">
+ <label class="control-label" for="passwordChangeRequired">${$.i18n.prop('user.change.password.required')}</label>
+ <div class="controls">
<input type="checkbox" id="passwordChangeRequired" name="passwordChangeRequired" data-bind="checked: passwordChangeRequired"/>
</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=1239827&r1=1239826&r2=1239827&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:35 2012
@@ -300,7 +300,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("user-create",validator,errorMap,errorMap);
}
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1239827&r1=1239826&r2=1239827&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js Thu Feb 2 20:42:35 2012
@@ -74,7 +74,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("user-create",validator,errorMap,errorMap);
}
});
$("#main-content #createUserForm #user-create").delegate("#user-create-form-register-button", "click keydown", function(e) {
@@ -133,7 +133,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("user-create",validator,errorMap,errorMap);
}
});
$("#main-content #user-create").delegate("#user-create-form-save-button", "click keydown", function(e) {
@@ -159,7 +159,7 @@ $(function() {
$("#main-content #user-edit-roles-view").attr("data-bind",'template: {name:"user_view_roles_list_tmpl"}');
ko.applyBindings(viewModel,$("#user-edit-roles-view").get(0));
- $("#main-content #edit_user_details_pills_headers").pills();
+ $("#main-content #edit_user_details_pills_headers").tabs();
$("#main-content #edit_user_details_pills_headers").bind('change', function (e) {
//$.log( $(e.target).attr("href") ); // activated tab