From fe9da129005a40786537a06011ff0b19bdf0ce12 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 23 Oct 2014 15:42:25 -0400
Subject: [PATCH] Merged #106 "Consider integrating GitHub Octicons"
---
src/main/java/com/gitblit/wicket/pages/TicketPage.html | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index a2f105d..f3c6b2a 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>
@@ -316,9 +318,10 @@
<!-- 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>
@@ -351,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;">
@@ -596,7 +598,7 @@
quality="high"
wmode="transparent"
scale="noscale"
- allowScriptAccess="always"></object>
+ allowScriptAccess="sameDomain"></object>
</wicket:fragment>
</wicket:extend>
--
Gitblit v1.9.1