]> source.dussan.org Git - gitblit.git/commitdiff
projects / gitblit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 47bfbe3)
Ajout du nom du repository sur la page "MyTickets".
authorBUISSON Christian <cbuisson@deltadore.com>
Wed, 16 Apr 2014 14:10:51 +0000 (16:10 +0200)
committerJames Moger <james.moger@gitblit.com>
Thu, 1 May 2014 20:14:14 +0000 (16:14 -0400)
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html patch | blob | history
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java patch | blob | history

diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
index bbb2b96b938b2b3a4fe53b80df0210bf631b3393..5222c35ce603d926cb54ba252aebbe9819a59388 100644 (file)
--- 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 509b00ca3b1cc93239693e2b93962088bf548965..6e656ae4c9e986ca7d65a8134344ae8cfb2ae35d 100644 (file)
--- 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));
                        }
Pure java git solution: https://github.com/gitblit-org/gitblit