From f22a0633d08e38ac4bf92b5165a708e11b4d6598 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 03 Oct 2012 17:31:37 -0400 Subject: [PATCH] Implemented support for toggling User.canFork in Manager --- src/com/gitblit/wicket/pages/BasePage.html | 51 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html index aaf3a35..4a642e7 100644 --- a/src/com/gitblit/wicket/pages/BasePage.html +++ b/src/com/gitblit/wicket/pages/BasePage.html @@ -6,40 +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" type="text/css" href="gitblit.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> - <!-- 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> <!-- page content --> <wicket:child /> <!-- page footer --> - <div class="page_footer"> - <div style="float:right"> - <span wicket:id="gbVersion"></span> - </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> + + <!-- 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