From 06eb51f13d9dcd4e4e5d9d7bb0db4cf18a67b23e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:42:34 -0500
Subject: [PATCH] Allow integration (mergeTo) branch to be changed in edit ticket
---
src/main/java/com/gitblit/wicket/pages/RootPage.html | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.html b/src/main/java/com/gitblit/wicket/pages/RootPage.html
index 5ff570e..11f7f38 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.html
@@ -14,14 +14,15 @@
<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"/>
+ <img src="logo.png" height="45" width="120" class="logo"/>
</a>
- <div class="nav-collapse" wicket:id="navPanel"></div>
-
- <ul class="nav pull-right">
- <span wicket:id="userPanel"></span>
- </ul>
+ <div class="nav-collapse">
+ <div wicket:id="navPanel"></div>
+ <ul class="nav pull-right">
+ <span wicket:id="userPanel"></span>
+ </ul>
+ </div>
</div>
</div>
</div>
@@ -39,7 +40,7 @@
<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>
+ <button class="btn" type="submit"><wicket:message key="gb.login"></wicket:message></button>
</span>
</form>
</li>
@@ -48,10 +49,11 @@
<!-- user fragment -->
<wicket:fragment wicket:id="userMenuFragment">
<li class="dropdown">
- <a data-toggle="dropdown" class="dropdown-toggle" href="#"><span wicket:id="username"></span> <b class="caret"></b></a>
+ <a data-toggle="dropdown" class="dropdown-toggle" style="text-decoration: none;" href="#"><span wicket:id="username"></span> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li style="color:#ccc;padding-left:15px;font-weight:bold;"><span wicket:id="displayName"></span></li>
<li class="divider"></li>
+ <li><a wicket:id="newRepository"><wicket:message key="gb.newRepository"></wicket:message></a></li>
<li><a wicket:id="myProfile"><wicket:message key="gb.myProfile"></wicket:message></a></li>
<li><a wicket:id="changePassword"><wicket:message key="gb.changePassword"></wicket:message></a></li>
<li class="divider"></li>
--
Gitblit v1.9.1