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/CommitDiffPage.html | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.html b/src/com/gitblit/wicket/pages/CommitDiffPage.html index 2759de8..610b017 100644 --- a/src/com/gitblit/wicket/pages/CommitDiffPage.html +++ b/src/com/gitblit/wicket/pages/CommitDiffPage.html @@ -7,31 +7,36 @@ <body> <wicket:extend> - <!-- page nav links --> - <div wicket:id="pageLinks">[page links]</div> - <!-- commitdiff nav links --> <div class="page_nav2"> <wicket:message key="gb.parent"></wicket:message>: <span wicket:id="parentLink">[parent link]</span> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <a wicket:id="commitLink"><wicket:message key="gb.commit"></wicket:message></a> </div> - <!-- shortlog header --> - <div class="header" wicket:id="shortlog">[shortlog header]</div> + <!-- commit header --> + <div wicket:id="commitHeader">[commit header]</div> <!-- changed paths --> - <table style="margin-top:10px;border-top:1px solid #bbb;" class="pretty"> + <div style="padding-top:15px;"> + <!-- commit legend --> + <div style="text-align:right;" wicket:id="commitLegend"></div> + + <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div> + </div> + + <table class="pretty"> <tr wicket:id="changedPath"> + <td class="changeType"><span wicket:id="changeType">[change type]</span></td> <td class="path"><span wicket:id="pathName">[commit path]</span></td> - <td> - <div class="link"> + <td class="rightAlign"> + <span class="link"> <a wicket:id="patch"><wicket:message key="gb.patch"></wicket:message></a> | <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> - </div> + </span> </td> </tr> </table> <!-- diff content --> - <pre wicket:id="diffText">[diff text]</pre> + <pre style="padding-top:10px;" wicket:id="diffText">[diff text]</pre> </wicket:extend> </body> -- Gitblit v1.9.1