From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/wicket/pages/RootPage.html | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.html b/src/main/java/com/gitblit/wicket/pages/RootPage.html
index 11f7f38..2ff305f 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.html
@@ -51,16 +51,18 @@
<li class="dropdown">
<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>
+ <span wicket:id="standardMenu"></span>
+ <span wicket:id="adminMenu"></span>
+ <span wicket:id="extensionsMenu"></span>
<li><a wicket:id="logout"><wicket:message key="gb.logout"></wicket:message></a></li>
</ul>
</li>
</wicket:fragment>
+
+ <wicket:fragment wicket:id="submenuFragment">
+ <li style="color:#ccc;padding-left:15px;font-weight:bold;"><span wicket:id="submenuTitle"></span></li>
+ <li wicket:id="submenuItem"><span wicket:id="submenuLink"></span></li>
+ </wicket:fragment>
</wicket:extend>
</body>
--
Gitblit v1.9.1