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/panels/ActivityPanel.html | 45 +++++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.html b/src/com/gitblit/wicket/panels/ActivityPanel.html index 1b3dd05..41541df 100644 --- a/src/com/gitblit/wicket/panels/ActivityPanel.html +++ b/src/com/gitblit/wicket/panels/ActivityPanel.html @@ -9,32 +9,29 @@ <div wicket:id="activity" style="padding-bottom:10px;"> <div class="header"><i class="icon-refresh" style="vertical-align: middle;"></i> <span style="font-weight:bold;" wicket:id="title">[title]</span></div> - <table class="activity" wicket:id="commits"> - <tr wicket:id="commit"></tr> + <table class="activity"> + <tr wicket:id="commit"> + <td class="date" style="width:60px; vertical-align: middle;text-align: right;padding-right:10px;" ><span wicket:id="time">[time of day]</span></td> + <td style="width:10em;text-align:left;vertical-align: middle;"> + <span wicket:id="repository" class="repositorySwatch">[repository link]</span> + </td> + <td style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td> + <td style="vertical-align: middle;"> + <img wicket:id="commitIcon" style="vertical-align: middle;"></img> + <span wicket:id="message">[shortlog commit link]</span><br/> + <span wicket:id="author" style="padding-left:20px;">[author link]</span> <wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span> on <span wicket:id="branch"></span> + </td> + <td style="text-align:right;vertical-align: middle;"> + <div wicket:id="commitRefs">[commit refs]</div> + </td> + <td class="rightAlign" style="width:7em;vertical-align: middle;"> + <span class="link"> + <a wicket:id="view" target="_blank"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff" target="_blank"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree" target="_blank"><wicket:message key="gb.tree"></wicket:message></a> + </span> + </td> + </tr> </table> </div> - - <wicket:fragment wicket:id="commitFragment"> - <td class="date" style="width:60px; vertical-align: middle;text-align: right;padding-right:10px;" ><span wicket:id="time">[time of day]</span></td> - <td style="width:10em;text-align:left;vertical-align: middle;"> - <span wicket:id="repository" class="repositorySwatch">[repository link]</span> - </td> - <td style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td> - <td style="vertical-align: middle;"> - <img wicket:id="commitIcon" style="vertical-align: middle;"></img> - <span wicket:id="message">[shortlog commit link]</span><br/> - <span wicket:id="author" style="padding-left:20px;">[author link]</span> <wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span> on <span wicket:id="branch"></span> - </td> - <td style="text-align:right;vertical-align: middle;"> - <div wicket:id="commitRefs">[commit refs]</div> - </td> - <td class="rightAlign" style="width:7em;vertical-align: middle;"> - <span class="link"> - <a wicket:id="view" target="_blank"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff" target="_blank"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree" target="_blank"><wicket:message key="gb.tree"></wicket:message></a> - </span> - </td> - </wicket:fragment> - </wicket:panel> </body> </html> \ No newline at end of file -- Gitblit v1.9.1