diff options
| author | BUISSON Christian <cbuisson@deltadore.com> | 2014-04-16 16:10:51 +0200 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-05-01 16:14:14 -0400 |
| commit | 556a5853fb7145adc20b2e718eca2e921f3d7399 (patch) | |
| tree | a56d211cc8a7e37598202c98213cba21be89aaf2 /src/main/java/com/gitblit/wicket/pages | |
| parent | 47bfbe3b1da6629655f49b32b917dccb21b83809 (diff) | |
| download | gitblit-556a5853fb7145adc20b2e718eca2e921f3d7399.tar.gz gitblit-556a5853fb7145adc20b2e718eca2e921f3d7399.zip | |
Ajout du nom du repository sur la page "MyTickets".
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 86 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java | 8 |
2 files changed, 55 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 bbb2b96b..5222c35c 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -6,45 +6,53 @@ <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"> + <div class="markdown" style="padding: 10px 0px 5px 0px;" wicket:id="myTicketsMessage">[my tickets message]</div> + + <table> + <span>Responsible Tickets</span> + <tbody> + <tr wicket:id="responsibleTickets"> + <td><span wicket:id="repositoryName"></span></td> + <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="repositoryName"></span></td> + <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="repositoryName"></span></td> + <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="repositoryName"></span></td> + <td><span wicket:id="ticketName"></span></td> + <td><span wicket:id="ticketDescription"></span></td> + </tr> + </tbody> + </table> + </div> </wicket:extend> </body> </html>
\ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 509b00ca..6e656ae4 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -3,6 +3,7 @@ package com.gitblit.wicket.pages; import java.util.ArrayList; import java.util.List; +import com.gitblit.Keys; import com.gitblit.models.UserModel; import com.gitblit.models.TicketModel; import com.gitblit.tickets.ITicketService; @@ -33,6 +34,9 @@ public class MyTicketsPage extends RootPage { } String username = currentUser.getName(); + String message = "Welcome on GitBlit"; + this.add(new Label("myTicketsMessage", message)); + ITicketService tickets = GitBlitWebApp.get().tickets(); List<TicketModel> returnedTickets = tickets.getTickets(null); @@ -73,6 +77,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } @@ -87,6 +92,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } @@ -101,6 +107,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } @@ -115,6 +122,7 @@ public class MyTicketsPage extends RootPage { { final TicketModel ticket = item.getModelObject(); String ticketUrl = app().tickets().getTicketUrl(ticket); + item.add(new Label("repositoryName", ticket.repository)); item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl)); item.add(new Label("ticketDescription", ticket.body)); } |