From a34e44ad5a2e088f8483b0281eebd30f4ed63030 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 11:09:57 -0400
Subject: [PATCH] Merge pull request #167 from Hybris95/master

---
 src/main/java/com/gitblit/wicket/pages/TicketPage.html |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index 2e0288a..a2f105d 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
@@ -136,8 +136,8 @@
 </wicket:fragment>
 
 
-<!-- TICKET CONTROLS FRAGMENT -->
-<wicket:fragment wicket:id="controlsFragment">
+<!-- OPEN TICKET CONTROLS FRAGMENT -->
+<wicket:fragment wicket:id="openControlsFragment">
 	<div class="hidden-phone hidden-tablet">
 		<div class="btn-group" style="display:inline-block;">
 			<a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><wicket:message key="gb.status"></wicket:message> <span class="caret"></span></a>
@@ -159,6 +159,17 @@
 				<li wicket:id="newMilestone"><a wicket:id="link">[milestone]</a></li>    						
 			</ul>
 		</div>
+		
+		<div class="btn-group" style="display:inline-block;">
+			<a class="btn btn-small" wicket:id="editLink"></a>
+		</div>
+	</div>
+</wicket:fragment>
+
+
+<!-- CLOSED TICKET CONTROLS FRAGMENT -->
+<wicket:fragment wicket:id="closedControlsFragment">
+	<div class="hidden-phone hidden-tablet">
 		
 		<div class="btn-group" style="display:inline-block;">
 			<a class="btn btn-small" wicket:id="editLink"></a>
@@ -287,6 +298,22 @@
 </wicket:fragment>
 
 
+<!-- CAN NOT PROPOSE FRAGMENT -->
+<wicket:fragment wicket:id="canNotProposeFragment">
+	<div class="featureWelcome">
+		<div class="row">
+			<div class="icon span2 hidden-phone"><i class="fa fa-ban"></i></div>
+			<div class="span9">		
+				<h1><wicket:message key="gb.canNotProposePatchset"></wicket:message></h1>
+				<div class="markdown">
+					<p><span wicket:id="reason"></span></p>
+				</div>
+			</div>
+		</div>
+	</div>
+</wicket:fragment>
+
+
 <!-- PATCHSET FRAGMENT -->
 <wicket:fragment wicket:id="patchsetFragment">
 	<div class="row" style="padding: 0px 0px 20px;">

--
Gitblit v1.9.1