From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001
From: Thomas Pummer <dev@nullpointer.at>
Date: Fri, 22 Feb 2013 11:10:11 -0500
Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit
---
src/com/gitblit/wicket/pages/BasePage.html | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html
index a089e2a..4a642e7 100644
--- a/src/com/gitblit/wicket/pages/BasePage.html
+++ b/src/com/gitblit/wicket/pages/BasePage.html
@@ -6,38 +6,57 @@
<!-- Head -->
<wicket:head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title wicket:id="title">[page title]</title>
- <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" />
+
+ <link rel="stylesheet" href="bootstrap/css/bootstrap.css"/>
+ <link rel="stylesheet" type="text/css" href="gitblit.css"/>
</wicket:head>
- <body style="padding-top: 40px;">
- <div class="container">
- <div class="content">
+ <body>
<!-- page content -->
<wicket:child />
<!-- page footer -->
- <div class="page_footer">
- <div style="float:right">
- <a title="gitblit homepage" href="http://gitblit.com/">
- <span wicket:id="gbVersion"></span>
- </a>
- </div>
- <div wicket:id="userPanel">[user panel]</div>
+ <div class="container">
+ <footer class="footer">
+ <p class="pull-right">
+ <a title="gitblit homepage" href="http://gitblit.com/">
+ <span wicket:id="gbVersion"></span>
+ </a>
+ </p>
+ <div wicket:id="userPanel">[user panel]</div>
+ </footer>
</div>
- </div>
- </div>
+
+ <!-- Override Bootstrap's responsive menu background highlighting -->
+ <style>
+ @media (max-width: 979px) {
+ .nav-collapse .nav > li > a:hover, .nav-collapse .dropdown-menu a:hover {
+ background-color: #000070;
+ }
+
+ .navbar div > ul .dropdown-menu li a {
+ color: #ccc;
+ }
+ }
+ </style>
+
+ <!-- Include scripts at end for faster page loading -->
+ <script type="text/javascript" src="bootstrap/js/jquery.js"></script>
+ <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script>
</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>
+ <span class="hidden-phone">
+ <span class="userPanel" wicket:id="separator"></span>
+ <span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span>
+ </span>
</wicket:fragment>
</html>
\ No newline at end of file
--
Gitblit v1.9.1