From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 16:59:44 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
src/com/gitblit/wicket/pages/BasePage.html | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html
index aaf3a35..a089e2a 100644
--- a/src/com/gitblit/wicket/pages/BasePage.html
+++ b/src/com/gitblit/wicket/pages/BasePage.html
@@ -7,20 +7,14 @@
<!-- Head -->
<wicket:head>
<title wicket:id="title">[page title]</title>
- <link rel="stylesheet" type="text/css" href="gitblit.css"/>
+ <link rel="stylesheet" href="bootstrap.130.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/">
- <img src="gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/>
- </a>
- <span>
- <span wicket:id="siteName">[site name]</span> / <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 />
@@ -28,10 +22,14 @@
<!-- 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 -->
--
Gitblit v1.9.1