From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/BasePage.html | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.html b/src/main/java/com/gitblit/wicket/pages/BasePage.html
index 4a642e7..b998428 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.html
@@ -2,15 +2,20 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"
xml:lang="en"
- lang="en">
+ lang="en"
+ ng-app>
<!-- Head -->
<wicket:head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<title wicket:id="title">[page title]</title>
<link rel="icon" href="gitblt-favicon.png" type="image/png" />
<link rel="stylesheet" href="bootstrap/css/bootstrap.css"/>
+ <link rel="stylesheet" href="bootstrap/css/iconic.css"/>
+ <link rel="stylesheet" href="fontawesome/css/font-awesome.min.css"/>
+ <link rel="stylesheet" href="octicons/octicons.css"/>
<link rel="stylesheet" type="text/css" href="gitblit.css"/>
</wicket:head>
@@ -27,7 +32,6 @@
<span wicket:id="gbVersion"></span>
</a>
</p>
- <div wicket:id="userPanel">[user panel]</div>
</footer>
</div>
@@ -35,7 +39,7 @@
<style>
@media (max-width: 979px) {
.nav-collapse .nav > li > a:hover, .nav-collapse .dropdown-menu a:hover {
- background-color: #000070;
+ background-color: #002060;
}
.navbar div > ul .dropdown-menu li a {
@@ -47,16 +51,6 @@
<!-- 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>
+ <wicket:container wicket:id="bottomScripts"></wicket:container>
</body>
-
- <!-- user fragment -->
- <wicket:fragment wicket:id="userFragment">
- <span class="userPanel" wicket:id="username"></span>
- <span class="userPanel" wicket:id="loginLink"></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