You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/02 21:40:15 UTC
svn commit: r1239815 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/templates/menu.html
Author: olamy
Date: Thu Feb 2 20:40:15 2012
New Revision: 1239815
URL: http://svn.apache.org/viewvc?rev=1239815&view=rev
Log:
[MRM-1598] use bootstrap css 2.x . fix sidebar display
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/archiva/templates/menu.html
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=1239815&r1=1239814&r2=1239815&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:40:15 2012
@@ -19,16 +19,17 @@
<div id="topbar-menu-container"></div>
<div class="container-fluid" style="min-height: 450px">
- <div class="sidebar" id="sidebar-content"></div>
-
- <div class="content">
- <div id="user-messages"></div>
-
- <div id="main-content">
+ <div class="row-fluid">
+ <div class="span2">
+ <div class="well sidebar-nav" id="sidebar-content"></div>
+ </div>
+ <div class="span10">
+ <div class="content">
+ <div id="user-messages"></div>
+ <div id="main-content"></div>
</div>
-
</div>
-
+ </div>
</div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html?rev=1239815&r1=1239814&r2=1239815&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html Thu Feb 2 20:40:15 2012
@@ -16,8 +16,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
- <div class='well' id="main-menu" redback-permissions="{permissions: ['archiva-manage-users','archiva-manage-configuration']}" style="display: none">
- <ul class="navigation">
+ <div id="main-menu" redback-permissions="{permissions: ['archiva-manage-users','archiva-manage-configuration']}" style="display: none">
+
+ <ul class="nav nav-list">
<li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}">
<a href="#" id="menu-users-list-a" onclick="displayUsersGrid()">${$.i18n.prop('menu.users')}</a>
</li>