[MRM-1598] use bootstrap css 2.x fix proxy connectors tab

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
index 149f1f7de11327992a681ff558152c1148088ba0..0b0deab0e25709a5cc8f1966e1f80675fed22f5f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
@@ -153,7 +153,7 @@ $(function() {
       this.gridViewModel.getManagedRepository=getManagedRepository;
       ko.applyBindings(this,$("#main-content #proxyConnectorsTable").get(0));
       removeSmallSpinnerImg("#main-content");
-      $("#main-content #proxy-connectors-view-tabs").tabs();
+      $("#main-content #proxy-connectors-view-tabs a:first").tab('show');
     }
 
   }

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
index 3567effdddea9fac6cfbc98e3c0c8eef01e48ee4..3df9759ef41794895685ed601c64f26490afc40f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
@@ -21,22 +21,22 @@
     <h2>${$.i18n.prop('proxy-connectors.list')}</h2>
   </div>
 
-  <ul id="proxy-connectors-view-tabs" class="tabs">
+  <ul id="proxy-connectors-view-tabs" class="nav nav-tabs">
     <li id="proxy-connectors-view-tabs-li-grid" class="active">
-      <a href="#proxy-connectors-view" id="proxy-connectors-view-tabs-a-network-proxies-grid">${$.i18n.prop('proxy-connectors.grid.tab.title')}</a>
+      <a data-toggle="tab" href="#proxy-connectors-view" id="proxy-connectors-view-tabs-a-network-proxies-grid">${$.i18n.prop('proxy-connectors.grid.tab.title')}</a>
     </li>
     <li id="proxy-connectors-view-tabs-li-edit">
-      <a href="#proxy-connectors-edit">${$.i18n.prop('add')}</a>
+      <a data-toggle="tab" href="#proxy-connectors-edit">${$.i18n.prop('add')}</a>
     </li>
   </ul>
   <div id="proxy-connectors-view-tabs-content" class="tab-content">
-    <div id="proxy-connectors-view" class="active">
+    <div id="proxy-connectors-view" class="tab-pane active">
       <table class="table table-striped table-bordered" id="proxyConnectorsTable"
              data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-proxy-connectors-grid',pageLinksId:'proxy-connectorsPagination'">
       </table>
       <div id="proxy-connectorsPagination"></div>
     </div>
-    <div id="proxy-connectors-edit" data-bind='template: {name:"proxy-connectors-edit-tmpl"}'></div>
+    <div id="proxy-connectors-edit" class="tab-pane" data-bind='template: {name:"proxy-connectors-edit-tmpl"}'></div>
   </div>
 
 </script>