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:39:50 UTC
svn commit: r1239813 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/templates/topbar.html
Author: olamy
Date: Thu Feb 2 20:39:50 2012
New Revision: 1239813
URL: http://svn.apache.org/viewvc?rev=1239813&view=rev
Log:
[MRM-1598] use bootstrap css 2.x .
fix topbar class names
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/topbar.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=1239813&r1=1239812&r2=1239813&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:39:50 2012
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css"/>
- <link rel="stylesheet" href="css/bootstrap.min.2.0.0.css">
+ <link rel="stylesheet" href="css/bootstrap.css">
<link rel="stylesheet" href="css/archiva.css">
@@ -14,7 +14,7 @@
</head>
-<body style="padding-top: 20px;">
+<body> <!-- style="padding-top: 20px;" -->
<div id="topbar-menu-container"></div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1239813&r1=1239812&r2=1239813&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html Thu Feb 2 20:39:50 2012
@@ -17,40 +17,43 @@
~ under the License.
-->
<div id="topbar-menu">
-<div class="navbar navbar-fixed-top" style="z-index: 5;">
+<div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
+ <div style="max-height: 40px" class="navbar-inner">
<div class="container-fluid">
- <a class="brand" href="index.html">Archiva</a>
+ <a class="brand pull-left" href="index.html">Archiva</a>
<div class="nav-collapse">
- <ul class="nav secondary-nav">
- <li id="create-admin-link" style="display: none">
+ <ul class="nav pull-right">
+ <li id="create-admin-link" class="pull-right" style="display: none">
<a href="#" onclick="adminCreateBox();" id="create-admin-link-a">
- <span class="label important">${$.i18n.prop('create.admin.page.link')}</span>
+ <span class="label label-important">${$.i18n.prop('create.admin.page.link')}</span>
</a>
</li>
- <li id="login-link" style="display: none">
+ <li id="login-link" class="pull-right" style="display: none">
<a href="#" onclick="loginBox();" id="login-link-a">
- <span class="label success">${$.i18n.prop('login')}</span>
+ <span class="label label-success">${$.i18n.prop('login')}</span>
</a>
</li>
- <li id="change-password-link" style="">
+ <li id="change-password-link" class="pull-right" style="">
<a href="#" onclick="editUserDetailsBox();">${$.i18n.prop('edit.details')}</a>
</li>
- <li id="logout-link" style="display: none">
+ <li id="logout-link" class="pull-right" style="display: none">
<a href="#" onclick="logout();" id="logout-link-a">
- <span class="label important">${$.i18n.prop('logout')}</span>
+ <span class="label label-important">${$.i18n.prop('logout')}</span>
</a>
</li>
- <li id="register-link" style="display: none">
+ <li id="register-link" class="pull-right" style="display: none">
<a href="#" onclick="registerBox();" id="register-link-a">
- <span class="label notice">${$.i18n.prop('register')}</span>
+ <span class="label label-info">${$.i18n.prop('register')}</span>
</a>
</li>
+ <li class="pull-right">
+ <form class="pull-right" action="">
+ <input type="text" placeholder="Search" />
+ </form>
+ </li>
</ul>
- <form class="pull-right" action="">
- <input type="text" placeholder="Search" />
- </form>
+
</div>
</div>
</div>