[MRM-1598] use bootstrap css 2.x fix pill with roles in user edition

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1239833 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 904bb2e65962da23c131c4a6b1b8f981ec5a4741..362d2874fec4636c9b2f85a9dcf86adf95d29f4b 100644 (file)
--- 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
@@ -18,18 +18,18 @@
 -->
 <script id='redback/user-edit-tmpl' type='text/x-jquery-tmpl'>
 <div id="edit-user-details-pills">
-  <ul id="edit_user_details_pills_headers" class="pills">
+  <ul id="edit_user_details_pills_headers" class="nav nav-pills" data-target="#edit-user-details-pills-content">
     <li class="active" id="user-view-detail-li">
-      <a href="#user-create-div">${$.i18n.prop('edit')}</a>
+      <a data-toggle="tab" href="#user-create-div">${$.i18n.prop('edit')}</a>
     </li>
     <li id="user-edit-roles-edit-li">
-      <a href="#user-edit-roles-edit">${$.i18n.prop('effective.roles.edit')}</a>
+      <a data-toggle="tab" href="#user-edit-roles-edit">${$.i18n.prop('effective.roles.edit')}</a>
     </li>
   </ul>
   <div class="pill-content" id="edit-user-details-pills-content">
-    <div id="user-create-div" class="active">
-      <div class="row">
-        <div class="span6 columns">
+    <div id="user-create-div" class="active pill-pane">
+      <div class="row-fluid">
+        <div class="span8 columns">
           <form id="user-create" class="form-horizontal" data-bind="submit: save">
             <fieldset id="user-create-fieldset">
               <div class="control-group">
@@ -89,13 +89,13 @@
             <button class="btn" id="user-create-form-cancel-button">${$.i18n.prop('cancel')}</button>
           </form>
         </div>
-        <div class="span6 columns" id="user-edit-roles">
+        <div class="span4 columns" id="user-edit-roles">
           <div id="user-edit-roles-view"></div>
         </div>
       </div>
     </div>
 
-    <div id="user-edit-roles-edit">
+    <div id="user-edit-roles-edit" class="pill-pane">
       roles edit
     </div>
   </div>

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 8f51fc4742bdca410e97f1d1cfbfb271b1bf461d..6494ebce15f5b8cd99bdb9a14c1de5553161826a 100644 (file)
--- 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
@@ -167,7 +167,7 @@ $(function() {
             // user roles binding
             $("#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").tabs();
+            $("#main-content #edit_user_details_pills_headers a:first").tab('show');
 
             $("#main-content #edit_user_details_pills_headers").bind('change', function (e) {
               if ($(e.target).attr("href")=="#user-edit-roles-edit") {