From f6196b803b7351da29f5d24958abbedf0df41a05 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Fri, 26 Sep 2014 04:52:15 -0400
Subject: [PATCH] Extract authenticate method from CachingPublicKeyAuthenticator
---
src/main/java/com/gitblit/wicket/pages/RootPage.html | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.html b/src/main/java/com/gitblit/wicket/pages/RootPage.html
index b35b1b3..2ff305f 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.html
@@ -14,18 +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>
-
- <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 class="nav-collapse">
+ <div wicket:id="navPanel"></div>
+ <ul class="nav pull-right">
+ <span wicket:id="userPanel"></span>
+ </ul>
+ </div>
</div>
</div>
</div>
@@ -33,9 +30,40 @@
<!-- subclass content -->
<div class="container">
<div style="text-align:center" wicket:id="feedback">[Feedback Panel]</div>
-
- <wicket:child/>
</div>
+
+ <wicket:child/>
+
+ <wicket:fragment wicket:id="loginFormFragment">
+ <li>
+ <form class="pull-right" wicket:id="loginForm">
+ <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" type="submit"><wicket:message key="gb.login"></wicket:message></button>
+ </span>
+ </form>
+ </li>
+ </wicket:fragment>
+
+ <!-- user fragment -->
+ <wicket:fragment wicket:id="userMenuFragment">
+ <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">
+ <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>
</html>
\ No newline at end of file
--
Gitblit v1.9.1