[MRM-1598] use bootstrap css 2.x . fix sidebar display

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
index 348b16afcb3c13743d1a9df8a16056d36a509d46..3b87b5a2daba4c06caffecf10b8d6ae64d9ed476 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
@@ -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>
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
index fd4a397d53eb65183a8f056e6486704e9d14d722..c922035c91dd1aad81ad89adc0afeedaeff350da 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
@@ -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>