Author: olamy
Date: Fri Feb 3 09:41:52 2012
New Revision: 1240045
URL: http://svn.apache.org/viewvc?rev=1240045&view=rev
Log:
[MRM-1598] use bootstrap css 2.x fix proxy connectors tab
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1240045&r1=1240044&r2=1240045&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Fri Feb 3 09:41:52 2012
@@ -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');
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1240045&r1=1240044&r2=1240045&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Fri Feb 3 09:41:52 2012
@@ -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>
