From 4b0e0641076f802e8da1695fe8a40ff7646b811a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 05 Oct 2011 08:05:40 -0400 Subject: [PATCH] Merge branch 'master' into rpc --- src/com/gitblit/wicket/pages/RepositoryPage.html | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index e793a1e..c60275a 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -8,24 +8,37 @@ <wicket:extend> <!-- page header bar --> <div> - <!-- floating search form on right --> - <div class="search"> - <form wicket:id="searchForm"> - <select wicket:id="searchType"/> - <input type="text" id="searchBox" wicket:id="searchBox" size="25" value=""/> - </form> - </div> - <!-- page nav links --> - <div class="page_nav"> - <a style="text-decoration: none;" wicket:id="syndication"> + <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> + + <span wicket:id="navPanel"></span> + + <a class="brand" style="text-decoration: none;" wicket:id="syndication"> <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img> - </a> - <a wicket:id="summary"><wicket:message key="gb.summary"></wicket:message></a> | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> | <a wicket:id="branches"><wicket:message key="gb.branches"></wicket:message></a> | <a wicket:id="tags"><wicket:message key="gb.tags"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> <span wicket:id="extra"><span wicket:id="extraSeparator"></span><span wicket:id="extraLink"></span></span> + </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> + </div> + </div> </div> </div> - <div style="text-align:center;" wicket:id="feedback">[Feedback Panel]</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 /> -- Gitblit v1.9.1