From 805f8878b9457d41f277c81ff8d6e64b5d494903 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 08 Sep 2014 16:17:56 -0400
Subject: [PATCH] Merge branch 'ticket/171' into develop
---
src/main/java/com/gitblit/wicket/pages/TicketPage.html | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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..36dca4c 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,11 +298,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 +352,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;">
@@ -569,7 +596,7 @@
quality="high"
wmode="transparent"
scale="noscale"
- allowScriptAccess="always"></object>
+ allowScriptAccess="sameDomain"></object>
</wicket:fragment>
</wicket:extend>
--
Gitblit v1.9.1