From 0514f28dc561e030af42f6df00ff785594f72646 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 01 May 2014 16:14:15 -0400 Subject: [PATCH] Refine localized strings --- src/main/java/com/gitblit/wicket/pages/TicketsPage.html | 49 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html index 9054490..a40d312 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html @@ -53,9 +53,9 @@ <div class="btn-group"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><wicket:message key="gb.status"></wicket:message>: <span style="font-weight:bold;" wicket:id="selectedStatii"></span> <span class="caret"></span></a> <ul class="dropdown-menu"> - <li><a wicket:id="openTickets">open</a></li> - <li><a wicket:id="closedTickets">closed</a></li> - <li><a wicket:id="allTickets">all</a></li> + <li><a wicket:id="openTickets"><wicket:message key="gb.open"></wicket:message></a></li> + <li><a wicket:id="closedTickets"><wicket:message key="gb.closed"></wicket:message></a></li> + <li><a wicket:id="allTickets"><wicket:message key="gb.all"></wicket:message></a></li> <li class="divider"></li> <li wicket:id="statii"><span wicket:id="statusLink"></span></li> </ul> @@ -139,14 +139,51 @@ </div> <div class="tab-pane" id="milestones"> <div class="row"> - <div class="span9" wicket:id="milestoneList"> - <h3><span wicket:id="milestoneName"></span> <small><span wicket:id="milestoneState"></span></small></h3> - <span wicket:id="milestoneDue"></span> + <span class="span12" style="padding-bottom:10px;" wicket:id="newMilestone"></span> + </div> + + <div class="row"> + <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