From 14ab7462a35f95f6bbbce763f12faeb4f2945e22 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 16 Jun 2014 09:21:31 -0400 Subject: [PATCH] Merge pull request #196 from giamma/release-v1.6.0 --- src/main/java/com/gitblit/wicket/pages/EditTicketPage.html | 11 ++++++++++- 1 files changed, 10 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..b5fe0ae 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html +++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html @@ -38,9 +38,10 @@ </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 wicket:id="responsible"></tr> <tr wicket:id="milestone"></tr> + <tr wicket:id="mergeto"></tr> </table> </div> </div> @@ -54,6 +55,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 +67,9 @@ <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:extend> </html> \ No newline at end of file -- Gitblit v1.9.1