From f5fa7958b07d0e585542b712b13f7ad9b47a8be9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 Dec 2011 08:28:15 -0500
Subject: [PATCH] Improved logging of GitblitUserService
---
src/com/gitblit/wicket/pages/BasePage.html | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html
index 0da37d4..9983e30 100644
--- a/src/com/gitblit/wicket/pages/BasePage.html
+++ b/src/com/gitblit/wicket/pages/BasePage.html
@@ -4,27 +4,17 @@
xml:lang="en"
lang="en">
- <!-- Head with Wicket-controlled resources in this package -->
+ <!-- Head -->
<wicket:head>
<title wicket:id="title">[page title]</title>
- <wicket:link>
- <link rel="stylesheet" type="text/css" href="/com/gitblit/wicket/resources/gitblit.css"/>
- <link rel="shortcut icon" href="/com/gitblit/wicket/resources/gitblt-favicon.png" type="image/png" />
- </wicket:link>
+ <link rel="stylesheet" href="bootstrap.140.css"/>
+ <link rel="stylesheet" type="text/css" href="bootstrap.gb.css"/>
+ <link rel="icon" href="gitblt-favicon.png" type="image/png" />
</wicket:head>
- <body>
- <!-- page header -->
- <div class="page_header">
- <a title="gitblit homepage" href="http://gitblit.com/">
- <wicket:link>
- <img src="/com/gitblit/wicket/resources/gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/>
- </wicket:link>
- </a>
- <span>
- <a href="/"><span wicket:id="siteName">[site name]</span></a> / <span wicket:id="repositoryName">[repository name]</span> <span wicket:id="pageName">[page name]</span>
- </span>
- </div>
+ <body style="padding-top: 40px;">
+ <div class="container">
+ <div class="content">
<!-- page content -->
<wicket:child />
@@ -32,9 +22,22 @@
<!-- page footer -->
<div class="page_footer">
<div style="float:right">
- <span wicket:id="gbVersion"></span>
+ <a title="gitblit homepage" href="http://gitblit.com/">
+ <span wicket:id="gbVersion"></span>
+ </a>
</div>
<div wicket:id="userPanel">[user panel]</div>
</div>
+ </div>
+ </div>
</body>
+
+ <!-- user fragment -->
+ <wicket:fragment wicket:id="userFragment">
+ <span class="userPanel" wicket:id="username"></span>
+ <span class="userPanel" wicket:id="loginLink"></span>
+ <span class="userPanel" wicket:id="separator"></span>
+ <span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span>
+ </wicket:fragment>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1