From 2fca824e349f5fecbf71d940c4521644e92cb0dd Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Wed, 06 Apr 2016 14:49:09 -0400
Subject: [PATCH] Merge pull request #1039 from gitblit/962-Patchset-Revision-Delete
---
src/main/java/com/gitblit/wicket/pages/TicketPage.html | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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..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>
@@ -136,8 +138,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 +161,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,11 +300,28 @@
</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;">
+ <div class="row" style="padding: 0px;">
<div class="span12 attribution-border">
- <div wicket:id="panel"></div>
+ <div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>
+ <div wicket:id="panel"></div>
</div>
</div>
@@ -324,9 +354,8 @@
<!-- COLLAPSIBLE PATCHSET (temp) -->
<wicket:fragment wicket:id="collapsiblePatchsetFragment">
-<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>
<div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;">
-<div class="patch-group">
+<div class="patch-group" style="margin-bottom: 20px;">
<div class="accordion-heading">
<div class="attribution-patch-pullright">
<div style="padding-bottom: 2px;">
@@ -433,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>
@@ -528,7 +558,6 @@
</div>
</wicket:fragment>
-
<!-- VETOED PATCHSET FRAGMENT -->
<wicket:fragment wicket:id="vetoedFragment">
<div class="alert alert-error submit-info" style="padding:4px;">
@@ -569,7 +598,7 @@
quality="high"
wmode="transparent"
scale="noscale"
- allowScriptAccess="always"></object>
+ allowScriptAccess="sameDomain"></object>
</wicket:fragment>
</wicket:extend>
--
Gitblit v1.9.1