[MRM-1598] use bootstrap css 2.x fix role management screen

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1239834 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
index 935067508a6edf07c9c67ae40bff7f37ad192c2f..aeadba4d4fd4f65df082636634303ff7f7ffca0c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
@@ -146,7 +146,7 @@ $(function() {
     window.redbackModel.rolesViewModel.loadRoles();
     $("#main-content").html($("#rolesTabs").tmpl());
     ko.applyBindings(window.redbackModel.rolesViewModel,jQuery("#main-content").get(0));
-    $("#main-content #roles-view-tabs").pills();
+    $("#main-content #roles-view-tabs a:first").tab("show");
     activateRolesGridTab();
     removeMediumSpinnerImg();
   }

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
index b29a533044892f03b23ea2df92c4c381ef329285..9664890fc23968e890509907f00aab4dcc7c23b7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
@@ -21,22 +21,22 @@
     <h2>${$.i18n.prop('roles.management.header')}</h2>
   </div>
 
-  <ul id="roles-view-tabs" class="tabs">
+  <ul id="roles-view-tabs" class="nav nav-tabs" data-target="roles-view-tabs-content">
     <li class="active" id="roles-view-tabs-li-roles-grid">
-      <a href="#roles-view" id="roles-view-tabs-a-roles-grid">${$.i18n.prop('roles.grid.tab.title')}</a>
+      <a data-toggle="tab" href="#roles-view" id="roles-view-tabs-a-roles-grid">${$.i18n.prop('roles.grid.tab.title')}</a>
     </li>
     <li id="roles-view-tabs-li-roles-edit">
-      <a href="#role-edit">${$.i18n.prop('edit')}</a>
+      <a data-toggle="tab" href="#role-edit">${$.i18n.prop('edit')}</a>
     </li>
   </ul>
-  <div id="roles-view-tabs-content" class="tab-content">
-    <div id="roles-view">
+  <div id="roles-view-tabs-content" class="pill-content">
+    <div id="roles-view" class="pill-pane">
         <table class="table table-striped table-bordered" id="usersTable"
                data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_rolesGrid',pageLinksId:'rolesPagination'">
         </table>
         <div id="rolesPagination"></div>
     </div>
-    <div id="role-edit"></div>
+    <div id="role-edit" class="pill-pane"></div>
   </div>
 
 </script>
@@ -45,7 +45,7 @@
   <div class="page-header">
     <h3>${$.i18n.prop('role')}</h3>
   </div>
-  <table class="bordered-table" id="editRoleTable">
+  <table class="table table-bordered" id="editRoleTable">
     <tbody>
       <tr>
         <td>${$.i18n.prop('name')}:</td>