From 811cf093827e31f7ece5d2b24c56f2dd9cc800de Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Fri, 29 Apr 2016 17:39:46 -0400
Subject: [PATCH] Fixes #1062 - Upgraded to Prosemirror 0.6.1

---
 src/main/java/com/gitblit/wicket/pages/TicketPage.html |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index aa52d8f..974dcc0 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
@@ -33,7 +33,7 @@
 		
 	<!-- DISCUSSION TAB -->
 	<div class="tab-pane active" id="discussion">
-		<div class="row">
+		<div class="row" style="min-height: 500px;">
 				
 			<!-- LEFT SIDE -->
 			<div class="span8">		
@@ -67,6 +67,8 @@
 				<div style="border: 1px solid #ccc;padding: 10px;margin: 5px 0px;">
 					<table class="summary" style="width: 100%">
 						<tr><th><wicket:message key="gb.type"></wicket:message></th><td><span wicket:id="ticketType">[type]</span></td></tr>
+						<tr><th><wicket:message key="gb.priority"></wicket:message></th><td><span wicket:id="priority">[priority]</span></td></tr>
+						<tr><th><wicket:message key="gb.severity"></wicket:message></th><td><span wicket:id="severity">[severity]</span></td></tr>
 						<tr><th><wicket:message key="gb.topic"></wicket:message></th><td><span wicket:id="ticketTopic">[topic]</span></td></tr>
 						<tr><th><wicket:message key="gb.responsible"></wicket:message></th><td><span wicket:id="responsible">[responsible]</span></td></tr>
 						<tr><th><wicket:message key="gb.milestone"></wicket:message></th><td><span wicket:id="milestone">[milestone]</span></td></tr>
@@ -460,6 +462,7 @@
 					<span wicket:id="patchsetType">[revision type]</span>					
 				</td>
 				<td><span class="hidden-phone hidden-tablet aui-lozenge aui-lozenge-subtle" wicket:id="patchsetRevision">[R1]</span>
+					<span class="fa fa-fw" style="padding-left:15px;"><a wicket:id="deleteRevision" class="fa fa-fw fa-trash delete-patchset"></a></span>
 					<span class="hidden-tablet hidden-phone" style="padding-left:15px;"><span wicket:id="patchsetDiffStat"></span></span>
 				</td>			
 				<td style="text-align:right;"><span class="attribution-date" wicket:id="changeDate">[patch date]</span></td>	
@@ -555,7 +558,6 @@
 	</div>
 </wicket:fragment>
 
-
 <!-- VETOED PATCHSET FRAGMENT -->
 <wicket:fragment wicket:id="vetoedFragment">
 	<div class="alert alert-error submit-info" style="padding:4px;">
@@ -596,7 +598,7 @@
        		quality="high"
        		wmode="transparent"
        		scale="noscale"
-       		allowScriptAccess="always"></object>
+       		allowScriptAccess="sameDomain"></object>
 </wicket:fragment>
 	
 </wicket:extend>    

--
Gitblit v1.9.1