From 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66 Mon Sep 17 00:00:00 2001 From: Eddy Young <jeyoung@priscimon.com> Date: Fri, 22 May 2015 03:47:09 -0400 Subject: [PATCH] Merge branch 'develop' into ticket-57_develop --- src/main/java/com/gitblit/wicket/pages/ComparePage.html | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.html b/src/main/java/com/gitblit/wicket/pages/ComparePage.html index 494d0b5..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> @@ -64,7 +66,7 @@ <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