From 8d2caa7e81fcd995f0a5c07fa4454ae2f8e86e6e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 01 May 2014 14:31:18 -0400
Subject: [PATCH] Show open milestone progress and change milestones list layout

---
 src/main/java/com/gitblit/wicket/pages/TicketsPage.html |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
index e144bea..a40d312 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
@@ -141,15 +141,49 @@
 		<div class="row">
 			<span class="span12" style="padding-bottom:10px;" wicket:id="newMilestone"></span>
 		</div>
+
 		<div class="row">
-			<div class="span9" wicket:id="milestoneList" style="padding-bottom: 10px;">
-				<h3><span wicket:id="milestoneName"></span> <small><span wicket:id="milestoneState"></span></small></h3>
-				<i style="color:#888;"class="fa fa-calendar"></i> <span wicket:id="milestoneDue"></span> <span wicket:id="editMilestone"></span>
+			<div class="span12"><h2><wicket:message key="gb.openMilestones"></wicket:message></h2></div>
+			<div class="span12"><hr/></div>
+		</div>		
+		<div class="row">
+			<div class="span4" wicket:id="openMilestonesList" style="padding-bottom: 20px;">
+				<div wicket:id="entryPanel"></div>
 			</div>
 		</div>
+
+		<div class="row">
+			<div class="span12"><h2><wicket:message key="gb.closedMilestones"></wicket:message></h2></div>
+			<div class="span12"><hr/></div>
+		</div>		
+		<div class="row">
+			<div class="span4" wicket:id="closedMilestonesList" style="padding-bottom: 15px;">
+				<div wicket:id="entryPanel"></div>
+			</div>
+		</div>
+		
 	</div>
 </div>
 
+<wicket:fragment wicket:id="milestoneListFragment">
+	<h3><span wicket:id="milestoneName"></span> <small><span wicket:id="milestoneState"></span></small></h3>
+	<i style="color:#888;"class="fa fa-calendar"></i> <span wicket:id="milestoneDue"></span> <span wicket:id="editMilestone"></span>
+	<div wicket:id="milestonePanel"></div>
+</wicket:fragment>
+
+<wicket:fragment wicket:id="openMilestoneFragment">
+	<div style="clear:both;padding-bottom: 10px;">
+		<div style="margin-bottom: 5px;" class="progress progress-success">
+			<div class="bar" wicket:id="progress"></div>
+		</div>
+		<div class="milestoneOverview">
+			<span wicket:id="openTickets" />,
+			<span wicket:id="closedTickets" />,
+			<span wicket:id="totalTickets" />
+		</div>
+	</div>
+</wicket:fragment>
+
 <wicket:fragment wicket:id="noMilestoneFragment">
 <table style="width: 100%;padding-bottom: 5px;">
 <tbody>

--
Gitblit v1.9.1