From 0e287b2e5c29e7674e54d80ed90e79f5b5432968 Mon Sep 17 00:00:00 2001 From: Jan Šmucr <jan.smucr@aimtec.cz> Date: Thu, 27 Nov 2014 08:00:48 -0500 Subject: [PATCH] Added a new property: web.displayUserPanel --- src/main/java/com/gitblit/wicket/pages/TicketsPage.html | 107 +++++++++++++++++++++++++---------------------------- 1 files changed, 50 insertions(+), 57 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..c686d1f 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html @@ -11,7 +11,7 @@ <div class="hidden-phone pull-right"> <form class="form-search" style="margin: 0px;" wicket:id="ticketSearchForm"> <div class="input-append"> - <input type="text" class="search-query" style="width: 170px;border-radius: 14px 0 0 14px; padding-left: 14px;" id="ticketSearchBox" wicket:id="ticketSearchBox" value=""/> + <input type="text" class="input-medium search-query" style="border-radius: 14px 0 0 14px; padding-left: 14px;" id="ticketSearchBox" wicket:id="ticketSearchBox" value=""/> <button class="btn" style="border-radius: 0 14px 14px 0px;margin-left:-5px;" type="submit"><i class="icon-search"></i></button> </div> </form> @@ -23,7 +23,7 @@ </ul> <div class="tab-content"> <div class="tab-pane active" id="tickets"> - <div class="row" style="min-height:400px;" > + <div class="row" style="min-height:500px;" > <!-- query controls --> <div class="span3"> @@ -31,17 +31,18 @@ <div class="hidden-phone"> <ul class="nav nav-list"> <li class="nav-header"><wicket:message key="gb.queries"></wicket:message></li> - <li><a wicket:id="changesQuery"><i class="fa fa-code-fork"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li> - <li><a wicket:id="bugsQuery"><i class="fa fa-bug"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li> - <li><a wicket:id="enhancementsQuery"><i class="fa fa-magic"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li> - <li><a wicket:id="tasksQuery"><i class="fa fa-ticket"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li> - <li><a wicket:id="questionsQuery"><i class="fa fa-question"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li> + <li><a wicket:id="changesQuery"><i class="fa fa-code-fork fa-fw"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li> + <li><a wicket:id="bugsQuery"><i class="fa fa-bug fa-fw"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li> + <li><a wicket:id="enhancementsQuery"><i class="fa fa-magic fa-fw"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li> + <li><a wicket:id="tasksQuery"><i class="fa fa-ticket fa-fw"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li> + <li><a wicket:id="questionsQuery"><i class="fa fa-question fa-fw"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li> + <li><a wicket:id="maintenanceQuery"><i class="fa fa-cogs fa-fw"></i> <wicket:message key="gb.maintenanceTickets"></wicket:message></a></li> <li wicket:id="userDivider" class="divider"></li> - <li><a wicket:id="createdQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li> - <li><a wicket:id="watchedQuery"><i class="fa fa-eye"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li> - <li><a wicket:id="mentionsQuery"><i class="fa fa-comment"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li> + <li><a wicket:id="createdQuery"><i class="fa fa-user fa-fw"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li> + <li><a wicket:id="watchedQuery"><i class="fa fa-eye fa-fw"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li> + <li><a wicket:id="mentionsQuery"><i class="fa fa-comment fa-fw"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li> <li class="divider"></li> - <li><a wicket:id="resetQuery"><i class="fa fa-bolt"></i> <wicket:message key="gb.reset"></wicket:message></a></li> + <li><a wicket:id="resetQuery"><i class="fa fa-bolt fa-fw"></i> <wicket:message key="gb.reset"></wicket:message></a></li> </ul> </div> <div wicket:id="dynamicQueries" class="hidden-phone"></div> @@ -88,42 +89,7 @@ </div> </div> - - <table class="table tickets"> - <tbody> - <tr wicket:id="ticket"> - <td class="ticket-list-icon"> - <i wicket:id="state"></i> - </td> - <td> - <span wicket:id="title">[title]</span> <span wicket:id="labels" style="font-weight: normal;color:white;"><span class="label" wicket:id="label"></span></span> - <div class="ticket-list-details"> - <span style="padding-right: 10px;" class="hidden-phone"> - <wicket:message key="gb.createdBy"></wicket:message> - <span style="padding: 0px 2px" wicket:id="createdBy">[createdBy]</span> <span class="date" wicket:id="createDate">[create date]</span> - </span> - <span wicket:id="indicators" style="white-space:nowrap;"><i wicket:id="icon"></i> <span style="padding-right:10px;" wicket:id="count"></span></span> - </div> - <div class="hidden-phone" wicket:id="updated"></div> - </td> - <td class="ticket-list-state"> - <span class="badge badge-info" wicket:id="votes"></span> - </td> - <td class="hidden-phone ticket-list-state"> - <i wicket:message="title:gb.watching" style="color:#888;" class="fa fa-eye" wicket:id="watching"></i> - </td> - <td class="ticket-list-state"> - <div wicket:id="status"></div> - </td> - <td class="indicators"> - <div> - <b>#<span wicket:id="id">[id]</span></b> - </div> - <div wicket:id="responsible"></div> - </td> - </tr> - </tbody> - </table> + <div wicket:id="ticketList"></div> <div class="btn-group pull-right"> <div class="pagination pagination-right pagination-small"> @@ -141,14 +107,48 @@ <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="span3" 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;"> @@ -204,13 +204,6 @@ <li class="nav-header"><wicket:message key="gb.topicsAndLabels"></wicket:message></li> <li class="dynamicQuery" wicket:id="dynamicQuery"><span><span wicket:id="swatch"></span> <span wicket:id="link"></span></span><span class="pull-right"><i style="font-size: 18px;" wicket:id="checked"></i></span></li> </ul> -</wicket:fragment> - -<wicket:fragment wicket:id="updatedFragment"> - <div class="ticket-list-details"> - <wicket:message key="gb.updatedBy"></wicket:message> - <span style="padding: 0px 2px" wicket:id="updatedBy">[updatedBy]</span> <span class="date" wicket:id="updateDate">[update date]</span> - </div> </wicket:fragment> </wicket:extend> -- Gitblit v1.9.1