From f3b7e29b210bba61c64ba9aee07cf2eef20ea5f4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 27 May 2015 08:12:49 -0400
Subject: [PATCH] Merged #57 "My Tickets needs a repository filter"

---
 src/main/java/com/gitblit/wicket/pages/EditTicketPage.html |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html
index 5d8f682..b12d0c7 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html
@@ -38,9 +38,12 @@
 				</div>
 				</div>
 			</td></tr>
-			<tr><th><wicket:message key="gb.type"></wicket:message><span style="color:red;">*</span></th><td class="edit"><select class="input-large" wicket:id="type"></select></td></tr>
+			<tr wicket:id="status"></tr>
+            <tr><th><wicket:message key="gb.severity"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="severity"></select></td></tr>
+            <tr wicket:id="priority"></tr>
 			<tr wicket:id="responsible"></tr>
 			<tr wicket:id="milestone"></tr>
+			<tr wicket:id="mergeto"></tr>
 		</table>
 	</div>
 	</div>	
@@ -54,6 +57,10 @@
 </div>
 </body>
 
+<wicket:fragment wicket:id="statusFragment">
+	<tr><th><wicket:message key="gb.status"></wicket:message><span style="color:red;">*</span></th><td class="edit"><select class="input-large" wicket:id="status"></select></td></tr>
+</wicket:fragment>
+
 <wicket:fragment wicket:id="responsibleFragment">
 	<th><wicket:message key="gb.responsible"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="responsible"></select></td>
 </wicket:fragment>
@@ -62,5 +69,13 @@
 	<th><wicket:message key="gb.milestone"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="milestone"></select></td>
 </wicket:fragment>
 
+<wicket:fragment wicket:id="mergeToFragment">
+	<th><wicket:message key="gb.mergeTo"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="mergeto"></select></td>
+</wicket:fragment>
+
+<wicket:fragment wicket:id="priorityFragment">
+    <th><wicket:message key="gb.priority"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="priority"></select></td>
+</wicket:fragment>
+
 </wicket:extend>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1