From 1607b9f90face68eecd5df3e8e7677ba1f22e1e7 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gmail.com> Date: Sat, 16 Jan 2016 18:23:46 -0500 Subject: [PATCH] Merge pull request #990 from dbywalec/authenthication-of-federation-user --- src/main/java/com/gitblit/wicket/pages/ComparePage.html | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.html b/src/main/java/com/gitblit/wicket/pages/ComparePage.html index 5716c5d..74c9831 100644 --- a/src/main/java/com/gitblit/wicket/pages/ComparePage.html +++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.html @@ -18,6 +18,7 @@ <select wicket:id="fromRef" class="span3" /> <i class="icon-arrow-right"></i> <select wicket:id="toRef" class="span3" /> + <label style="padding:0px 5px;" class="checkbox"><input type="checkbox" wicket:id="ignoreWhitespaceCheckbox" /> <span wicket:id="ignoreWhitespaceLabel"></span></label> <button class="btn" type="submit"><wicket:message key="gb.compare"></wicket:message></button> </form> </div> @@ -26,6 +27,7 @@ <input wicket:id="fromId" type="text" class="span3" /> <i class="icon-arrow-right"></i> <input wicket:id="toId" type="text" class="span3" /> + <label style="padding:0px 5px;" class="checkbox"><input type="checkbox" wicket:id="ignoreWhitespaceCheckbox" /> <span wicket:id="ignoreWhitespaceLabel"></span></label> <button class="btn" type="submit"><wicket:message key="gb.compare"></wicket:message></button> </form> </div> @@ -55,15 +57,16 @@ <div> <!-- commit legend --> <div class="hidden-phone" 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 class="header"><span wicket:id="diffStat"></span><span style="padding-left:5px;"><wicket:message key="gb.changedFiles">[changed files]</wicket:message></span></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 class="hidden-phone rightAlign"> + <span class="hidden-tablet" style="padding-right:20px;" wicket:id="diffStat"></span> <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> + <span class="hidden-tablet"><a wicket:id="patch"><wicket:message key="gb.patch"></wicket:message></a> | </span><a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <span class="hidden-tablet"><a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | </span><a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> </span> </td> </tr> -- Gitblit v1.9.1