From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Oct 2012 10:50:35 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit
---
src/com/gitblit/wicket/pages/RootPage.html | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RootPage.html b/src/com/gitblit/wicket/pages/RootPage.html
index 59a0fe1..b35b1b3 100644
--- a/src/com/gitblit/wicket/pages/RootPage.html
+++ b/src/com/gitblit/wicket/pages/RootPage.html
@@ -5,32 +5,37 @@
lang="en">
<body>
<wicket:extend>
- <div class="topbar">
- <div class="fill">
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
<div class="container">
- <a class="brand" title="gitblit homepage" href="http://gitblit.com/">
- <img src="gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/>
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" wicket:id="rootLink">
+ <img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>
</a>
- <ul class="nav">
- <li><a wicket:id="repositories"><wicket:message key="gb.repositories"></wicket:message></a></li>
- <li><a wicket:id="users"><wicket:message key="gb.users"></wicket:message></a></li>
- <li><a wicket:id="federation"><wicket:message key="gb.federation"></wicket:message></a></li>
- </ul>
+ <div class="nav-collapse" wicket:id="navPanel"></div>
- <form class="pull-right" wicket:id="loginForm">
- <input wicket:id="username" class="input-small" type="text" placeholder="Username">
- <input wicket:id="password" class="input-small" type="password" placeholder="Password">
- <button class="btn primary" type="submit">Sign in</button>
+ <form class="pull-right" wicket:id="loginForm" style="padding-top:3px;">
+ <span class="form-search">
+ <input wicket:id="username" class="input-small" type="text" />
+ <input wicket:id="password" class="input-small" type="password" />
+ <button class="btn btn-primary" type="submit"><wicket:message key="gb.login"></wicket:message></button>
+ </span>
</form>
</div>
</div>
</div>
-
- <div style="text-align:center;padding-top:5px;" wicket:id="feedback">[Feedback Panel]</div>
-
+
<!-- subclass content -->
- <wicket:child/>
+ <div class="container">
+ <div style="text-align:center" wicket:id="feedback">[Feedback Panel]</div>
+
+ <wicket:child/>
+ </div>
</wicket:extend>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1