From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001 From: Mohamed Ragab <moragab@gmail.com> Date: Wed, 02 May 2012 11:15:01 -0400 Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command --- src/com/gitblit/wicket/pages/RepositoryPage.html | 60 ++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index ffb484f..169d4f0 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -6,27 +6,55 @@ <body> <wicket:extend> - <!-- page header bar --> - <div> - <!-- floating search form on right --> - <form wicket:id="searchForm"> - <div class="search"> - <select wicket:id="searchType"/> - <input type="text" id="searchBox" wicket:id="searchBox" size="25" value=""/> + <!-- 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> + + <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> + + <form class="pull-right" style="margin-top:7px;" wicket:id="searchForm"> + <span class="search"> + <select class="small" wicket:id="searchType"/> + <input type="text" id="searchBox" wicket:id="searchBox" value=""/> + </span> + </form> </div> - </form> - - <!-- page nav links --> - <div class="page_nav"> - <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> | <a wicket:id="metrics"><wicket:message key="gb.metrics"></wicket:message></a> <span wicket:id="extra"><span wicket:id="extraSeparator"></span><span wicket:id="extraLink"></span></span> </div> </div> - - <div style="text-align:center;" wicket:id="feedback">[Feedback Panel]</div> - + <!-- page content --> - <wicket:child /> + <div class="container"> + <div style="text-align:center;padding-top:5px;" wicket:id="feedback">[Feedback Panel]</div> + + <!-- page header --> + <div class="pageTitle"> + + <span wicket:id="workingCopy"></span> + + <h2><span wicket:id="repositoryName">[repository name]</span> <small><span wicket:id="pageName">[page name]</span></small></h2> + </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 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