svn commit: r1239834 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback: roles.js templates/roles-tmpl.html

[ol...@apache.org]

Author: olamy
Date: Thu Feb  2 20:44:12 2012
New Revision: 1239834

URL: http://svn.apache.org/viewvc?rev=1239834&view=rev
Log:
[MRM-1598] use bootstrap css 2.x fix role management screen

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js?rev=1239834&r1=1239833&r2=1239834&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js Thu Feb  2 20:44:12 2012
@@ -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();
   }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html?rev=1239834&r1=1239833&r2=1239834&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html Thu Feb  2 20:44:12 2012
@@ -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>