From: Olivier Lamy Date: Thu, 2 Feb 2012 20:42:35 +0000 (+0000) Subject: [MRM-1598] use bootstrap css 2.x fix user edition form X-Git-Tag: archiva-1.4-M3~1398 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=96f35efebfa98711dc11f47bb2f99992b1b0b8e4;p=archiva.git [MRM-1598] use bootstrap css 2.x fix user edition form git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1239827 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html index 6620ac438..5bd61c45e 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html @@ -30,11 +30,11 @@
-
+
-
- -
+
+ +
{{if $data.username.length>0}} ${$data.username} {{else}} @@ -42,45 +42,45 @@ {{/if}}
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
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 e3ce82eff..29cedc470 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 @@ -300,7 +300,7 @@ $(function() { } }, showErrors: function(validator, errorMap, errorList) { - customShowError(validator,errorMap,errorMap); + customShowError("user-create",validator,errorMap,errorMap); } }); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js index bbbdb9212..fa3b6c45e 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js @@ -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