From 4640f1b689684b805f08a5a937e91dfc65ae977f Mon Sep 17 00:00:00 2001 From: Hybris95 <hybris_95@hotmail.com> Date: Thu, 01 May 2014 16:14:14 -0400 Subject: [PATCH] Now only shows the "my tickets" button in the navbar if you are connected. Redirects to the main page if you try going on "/mytickets" when not connected (or if you disconnect while being on "/mytickets"). --- src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 70 +++++++++++++++------------------- 1 files changed, 31 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index bbb2b96..063e751 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -6,45 +6,37 @@ <body> <wicket:extend> - <table> - <span>Responsible Tickets</span> - <tbody> - <tr wicket:id="responsibleTickets"> - <td><span wicket:id="ticketName"></span></td> - <td><span wicket:id="ticketDescription"></span></td> - </tr> - </tbody> - </table> - - <table> - <span>Author Tickets</span> - <tbody> - <tr wicket:id="authorTickets"> - <td><span wicket:id="ticketName"></span></td> - <td><span wicket:id="ticketDescription"></span></td> - </tr> - </tbody> - </table> - - <table> - <span>Voted Tickets</span> - <tbody> - <tr wicket:id="votedTickets"> - <td><span wicket:id="ticketName"></span></td> - <td><span wicket:id="ticketDescription"></span></td> - </tr> - </tbody> - </table> - - <table> - <span>Watched Tickets</span> - <tbody> - <tr wicket:id="watchedTickets"> - <td><span wicket:id="ticketName"></span></td> - <td><span wicket:id="ticketDescription"></span></td> - </tr> - </tbody> - </table> + <div class="container"> + <table class="tickets"> + <thead> + <tr> + <th class="left"> + <img style="vertical-align: middle;" src="git-black-16x16.png"/> + <wicket:message key="gb.repository">Repository</wicket:message> + </th> + <th class="hidden-phone" colspan='2'><span><wicket:message key="gb.ticket">Ticket</wicket:message></span></th> + <th class="hidden-tablet hidden-phone"><span><wicket:message key="gb.status">Status</wicket:message></span></th> + <th class="hidden-tablet hidden-phone right"><span><wicket:message key="gb.responsible">Responsible</wicket:message></span></th> + </tr> + </thead> + <tbody> + <tr wicket:id="row"> + <td class="left" style="padding-left:3px;"> + <b><span class="repositorySwatch" wicket:id="repositorySwatch"></span></b> + <span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span> + </td> + <td class="hidden-phone"> + <span wicket:id="ticketIcon">[ticket icon]</span> + <span class="list" wicket:id="ticketTitle">[ticket title]</span> + <span style="color:#888;"> (#<span wicket:id="ticketNumber">[ticket number]</span>)</span> + </td> + <td><span class="badge badge-info" wicket:id="ticketVotes"></span></td> + <td><span wicket:id="ticketStatus"></span></td> + <td class="hidden-tablet hidden-phone author right"><span wicket:id="ticketResponsibleImg"></span><span wicket:id="ticketResponsible">[ticket responsible]</span></td> + </tr> + </tbody> + </table> + </div> </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1