New Ticket Type - Maintenance

+ Indended for identifiying and loggin maintenance of development tools
and systems to provide an integrated means to satisfy ISO requirements

+ Improved alignment of query icons via fixed width attribute

diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index a4880ead3eaba07b749299fcfac367cee001b283..9bdb260654643ffe9c019b876d4026f393f5c50b 100644 (file)
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
@@ -1187,12 +1187,12 @@ public class TicketModel implements Serializable, Comparable<TicketModel> {
        }
 
        public static enum Type {
-               Enhancement, Task, Bug, Proposal, Question;
+               Enhancement, Task, Bug, Proposal, Question, Maintenance;
 
                public static Type defaultType = Task;
 
                public static Type [] choices() {
-                       return new Type [] { Enhancement, Task, Bug, Question };
+                       return new Type [] { Enhancement, Task, Bug, Question, Maintenance };
                }
 
                @Override

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index eb92e2d29e197ab8061e3756cb54e235f465062f..2760f85f0678abecf674cc2cc31f0c13a84aa141 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -561,6 +561,7 @@ gb.bugTickets = bugs
 gb.enhancementTickets = enhancements
 gb.taskTickets = tasks
 gb.questionTickets = questions
+gb.maintenanceTickets = maintenance
 gb.requestTickets = enhancements & tasks
 gb.yourCreatedTickets = created by you
 gb.yourWatchedTickets = watched by you

diff --git a/src/main/java/com/gitblit/wicket/TicketsUI.java b/src/main/java/com/gitblit/wicket/TicketsUI.java
index 0eff4cff8f3939b14e512f457b250fa3c9edd982..347ac44d1dd27e7e958e6ee75fcc438ca5932c28 100644 (file)
--- a/src/main/java/com/gitblit/wicket/TicketsUI.java
+++ b/src/main/java/com/gitblit/wicket/TicketsUI.java
@@ -59,6 +59,9 @@ public class TicketsUI {
                case Question:
                        WicketUtils.setCssClass(label, "fa fa-question");
                        break;
+               case Maintenance:
+                       WicketUtils.setCssClass(label, "fa fa-cogs");
+                       break;
                default:
                        // standard ticket
                        WicketUtils.setCssClass(label, "fa fa-ticket");

diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
index b0bc19493e98e7c1538b2cb37ae6520ead4325fd..cf94f3ca3ea4ac46009b59c0e9fb5d5ee0401353 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
@@ -25,18 +25,19 @@
                                                        <!--  query list -->                                            
                                                        <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="responsibleQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourAssignedTickets"></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="responsibleQuery"><i class="fa fa-user fa-fw"></i> <wicket:message key="gb.yourAssignedTickets"></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>

diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
index c207d561a2a299738b870faeedbcf0154009d020..1396a5e50f793f08a820a91de405a3f3b6c68018 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
@@ -132,6 +132,16 @@ public class MyTicketsPage extends RootPage {
                                                sortBy,
                                                desc,
                                                1)));
+               
+               add(new BookmarkablePageLink<Void>("maintenanceQuery", MyTicketsPage.class,
+                               queryParameters(
+                                               Lucene.type.matches(TicketModel.Type.Maintenance.name()),
+                                               milestoneParam,
+                                               statiiParam,
+                                               assignedToParam,
+                                               sortBy,
+                                               desc,
+                                               1)));
 
                add(new BookmarkablePageLink<Void>("resetQuery", MyTicketsPage.class,
                                queryParameters(

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
index 3a3d977a4d12edaf7a181ef0cb1eb0b15df17e77..c686d1ff404674f97913fc3c64200c802eafd5a4 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
@@ -31,17 +31,18 @@
                        <div class="hidden-phone">\r
                                <ul class="nav nav-list">\r
                                        <li class="nav-header"><wicket:message key="gb.queries"></wicket:message></li>\r
-                                       <li><a wicket:id="changesQuery"><i class="fa fa-code-fork"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li>\r
-                                       <li><a wicket:id="bugsQuery"><i class="fa fa-bug"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li>\r
-                                       <li><a wicket:id="enhancementsQuery"><i class="fa fa-magic"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li>\r
-                                       <li><a wicket:id="tasksQuery"><i class="fa fa-ticket"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li>\r
-                                       <li><a wicket:id="questionsQuery"><i class="fa fa-question"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="changesQuery"><i class="fa fa-code-fork fa-fw"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="bugsQuery"><i class="fa fa-bug fa-fw"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="enhancementsQuery"><i class="fa fa-magic fa-fw"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="tasksQuery"><i class="fa fa-ticket fa-fw"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="questionsQuery"><i class="fa fa-question fa-fw"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="maintenanceQuery"><i class="fa fa-cogs fa-fw"></i> <wicket:message key="gb.maintenanceTickets"></wicket:message></a></li>\r
                                        <li wicket:id="userDivider" class="divider"></li>\r
-                                       <li><a wicket:id="createdQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li>\r
-                                       <li><a wicket:id="watchedQuery"><i class="fa fa-eye"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li>\r
-                                       <li><a wicket:id="mentionsQuery"><i class="fa fa-comment"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="createdQuery"><i class="fa fa-user fa-fw"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="watchedQuery"><i class="fa fa-eye fa-fw"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li>\r
+                                       <li><a wicket:id="mentionsQuery"><i class="fa fa-comment fa-fw"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li>\r
                                        <li class="divider"></li>\r
-                                       <li><a wicket:id="resetQuery"><i class="fa fa-bolt"></i> <wicket:message key="gb.reset"></wicket:message></a></li>\r
+                                       <li><a wicket:id="resetQuery"><i class="fa fa-bolt fa-fw"></i> <wicket:message key="gb.reset"></wicket:message></a></li>\r
                                </ul>\r
                        </div>                  \r
                        <div wicket:id="dynamicQueries" class="hidden-phone"></div>\r

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
index 658cddec819d7c2ede3582ad8457a5a76d801864..745cabf4839e8f656636e167cd741b3490096960 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
@@ -272,6 +272,16 @@ public class TicketsPage extends RepositoryPage {
                                                sortBy,\r
                                                desc,\r
                                                1)));\r
+               \r
+               add(new BookmarkablePageLink<Void>("maintenanceQuery", TicketsPage.class,\r
+                               queryParameters(\r
+                                               Lucene.type.matches(TicketModel.Type.Maintenance.name()),\r
+                                               milestoneParam,\r
+                                               statiiParam,\r
+                                               assignedToParam,\r
+                                               sortBy,\r
+                                               desc,\r
+                                               1)));\r
 \r
                add(new BookmarkablePageLink<Void>("resetQuery", TicketsPage.class,\r
                                queryParameters(\r