From f8b50c278f097a7532ec33fc935fd8e02df0f3ab Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 08 Sep 2014 15:34:52 -0400
Subject: [PATCH] Merged #170 "New ticket reponsible selections are missing users with RW access"
---
src/main/java/com/gitblit/wicket/pages/ComparePage.html | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.html b/src/main/java/com/gitblit/wicket/pages/ComparePage.html
index 8fb6e4f..d7df717 100644
--- a/src/main/java/com/gitblit/wicket/pages/ComparePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.html
@@ -16,6 +16,7 @@
<div class="tab-pane active" id="refs">
<form wicket:id="compareRefsForm" class="form-inline">
<select wicket:id="fromRef" class="span3" />
+ <i class="icon-arrow-right"></i>
<select wicket:id="toRef" class="span3" />
<button class="btn" type="submit"><wicket:message key="gb.compare"></wicket:message></button>
</form>
@@ -23,6 +24,7 @@
<div class="tab-pane" id="ids">
<form wicket:id="compareIdsForm" class="form-inline">
<input wicket:id="fromId" type="text" class="span3" />
+ <i class="icon-arrow-right"></i>
<input wicket:id="toId" type="text" class="span3" />
<button class="btn" type="submit"><wicket:message key="gb.compare"></wicket:message></button>
</form>
@@ -36,15 +38,15 @@
<div class="tabbable">
<ul class="nav nav-tabs">
- <li class="active"><a href="#commits" data-toggle="tab"><wicket:message key="gb.commits"></wicket:message></a></li>
- <li><a href="#diff" data-toggle="tab"><wicket:message key="gb.diff"></wicket:message></a></li>
+ <li><a href="#commits" data-toggle="tab"><wicket:message key="gb.commits"></wicket:message></a></li>
+ <li class="active"><a href="#diff" data-toggle="tab"><wicket:message key="gb.diff"></wicket:message></a></li>
</ul>
<div class="tab-content">
- <div class="tab-pane active" id="commits">
+ <div class="tab-pane" id="commits">
<!-- commit list -->
<div wicket:id="commitList">[commit list]</div>
</div>
- <div class="tab-pane" id="diff">
+ <div class="tab-pane active" id="diff">
<!-- <div class="page_nav2"> -->
<!-- <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> -->
<!-- </div> -->
@@ -53,15 +55,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