Author: olamy
Date: Thu Feb 2 20:41:24 2012
New Revision: 1239820
URL: http://svn.apache.org/viewvc?rev=1239820&view=rev
Log:
[MRM-1598] use bootstrap css 2.x fix users tabs
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1239820&r1=1239819&r2=1239820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
Thu Feb 2 20:41:24 2012
@@ -20,10 +20,10 @@
<div class="container-fluid" style="min-height: 450px">
<div class="row-fluid">
- <div class="span2">
+ <div class="span2 columns">
<div class="well sidebar-nav" id="sidebar-content"></div>
</div>
- <div class="span10">
+ <div class="span10 columns">
<div class="content">
<div id="user-messages"></div>
<div id="main-content"></div>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html?rev=1239820&r1=1239819&r2=1239820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
Thu Feb 2 20:41:24 2012
@@ -93,16 +93,16 @@
<div class="page-header">
<h2>${$.i18n.prop('users.list')}</h2>
</div>
- <ul id="users-view-tabs" class="tabs">
+ <ul id="users-view-tabs" class="nav nav-tabs"
data-target="#users-view-tabs-content">
<li class="active" id="users-view-tabs-li-users-grid">
- <a href="#users-view">${$.i18n.prop('users.grid.tab.title')}</a>
+ <a data-toggle="tab"
href="#users-view">${$.i18n.prop('users.grid.tab.title')}</a>
</li>
<li id="users-view-tabs-li-user-edit">
- <a href="#createUserForm"
id="users-view-tabs-li-user-edit-a">${$.i18n.prop('add')}</a>
+ <a data-toggle="tab" href="#createUserForm"
id="users-view-tabs-li-user-edit-a">${$.i18n.prop('add')}</a>
</li>
</ul>
<div id="users-view-tabs-content" class="tab-content">
- <div id="users-view">
+ <div id="users-view" class="tab-pane">
<button data-bind='click: sortByName' class="btn">
${$.i18n.prop('users.sort.byname')}
</button>
@@ -111,7 +111,7 @@
</table>
<div id="usersPagination"></div>
</div>
- <div id="createUserForm"></div>
+ <div id="createUserForm" class="tab-pane"></div>
</div>
</script>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1239820&r1=1239819&r2=1239820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Thu Feb 2 20:41:24 2012
@@ -216,8 +216,8 @@ $(function() {
window.redbackModel.usersViewModel = new usersViewModel();
window.redbackModel.usersViewModel.loadUsers();
ko.applyBindings(window.redbackModel.usersViewModel,jQuery("#main-content").get(0));
- $("#main-content #users-view-tabs").tabs();
- $("#main-content #users-view-tabs").bind('change', function (e) {
+ $("#main-content").tab('show');//#users-view-tabs
+ $("#main-content a[data-toggle='tab']").on('show', function (e) {
//$.log( $(e.target).attr("href") ); // activated tab
//e.relatedTarget // previous tab
if ($(e.target).attr("href")=="#createUserForm") {
