From 1aa6e081ffe319ff3ddfa246783cb65dc1c71b3b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 28 Mar 2012 17:57:35 -0400 Subject: [PATCH] Fixed symlink absolute path/canonical path mixup with JGit (issue 78) --- src/com/gitblit/wicket/pages/BasePage.html | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html index 9983e30..6eefa17 100644 --- a/src/com/gitblit/wicket/pages/BasePage.html +++ b/src/com/gitblit/wicket/pages/BasePage.html @@ -6,30 +6,35 @@ <!-- 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.140.css"/> - <link rel="stylesheet" type="text/css" href="bootstrap.gb.css"/> + <link rel="stylesheet" href="bootstrap/css/bootstrap.css"/> + <link rel="stylesheet" type="text/css" href="gitblit.css"/> + <!-- Responsive CSS must be included after the above body css! --> + <!-- <link rel="stylesheet" href="bootstrap/css/bootstrap-responsive.css"/> --> <link rel="icon" href="gitblt-favicon.png" type="image/png" /> + + <script type="text/javascript" src="bootstrap/js/jquery.js"></script> + <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> </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> + </body> <!-- user fragment --> -- Gitblit v1.9.1