From cbd0caa7f95ea331ecd7b6daf71b11854f14e4ee Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 09 Aug 2012 09:49:06 -0400 Subject: [PATCH] Merge branch 'ldap+tls' of https://github.com/StephenKing/gitblit --- src/com/gitblit/wicket/pages/RepositoryPage.html | 72 +++++++++++++++++++++-------------- 1 files changed, 43 insertions(+), 29 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index c60275a..3195a93 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -6,43 +6,57 @@ <body> <wicket:extend> - <!-- page header bar --> - <div> - <!-- page nav links --> - <div class="topbar"> - <div class="fill"> - <div class="container"> - <a class="brand" wicket:id="rootLink"> - <img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/> - </a> + <!-- page nav links --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </a> + <a class="brand" wicket:id="rootLink"> + <img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/> + </a> - <span wicket:id="navPanel"></span> + <div class="nav-collapse" wicket:id="navPanel"></div> - <a class="brand" style="text-decoration: none;" wicket:id="syndication"> - <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img> - </a> + <a class="hidden-phone hidden-tablet brand" style="text-decoration: none;" wicket:id="syndication"> + <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img> + </a> - <form class="pull-right" wicket:id="searchForm"> - <div class="search"> - <select class="small" wicket:id="searchType"/> - <input type="text" id="searchBox" wicket:id="searchBox" value=""/> - </div> - </form> + <form class="hidden-phone hidden-tablet pull-right" style="margin-top:10px;" wicket:id="searchForm"> + <span class="search"> + <select class="small" wicket:id="searchType"/> + <input type="text" id="searchBox" wicket:id="searchBox" value=""/> + </span> + </form> </div> </div> - </div> </div> - - <div style="text-align:center;padding-top:5px;" wicket:id="feedback">[Feedback Panel]</div> - - <!-- page header --> - <div class="page-header"> - <h2><span wicket:id="repositoryName">[repository name]</span> <small><span wicket:id="pageName">[page name]</span></small></h2> - </div> - + <!-- page content --> - <wicket:child /> + <div class="container"> + <div style="text-align:center;" wicket:id="feedback">[Feedback Panel]</div> + + <!-- page header --> + <div class="pageTitle"> + <div class="row"> + <div wicket:id="workingCopy"></div> + <div class="span9"> + <h2><span wicket:id="repositoryName">[repository name]</span> <small><span wicket:id="pageName">[page name]</span></small></h2> + </div> + </div> + </div> + + <wicket:child /> + </div> + <wicket:fragment wicket:id="workingCopyFragment"> + <p class="pull-right" style="padding-top:5px;"> + <span class="alert alert-info" style="padding: 8px 14px 8px 14px;vertical-align: middle;"><i class="icon-exclamation-sign" style="vertical-align: middle;"></i> <span class="hidden-phone" wicket:id="workingCopy" style="font-weight:bold;">[working copy]</span></span> + </p> + </wicket:fragment> </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1