From f9c78c0ccc709509cdf7f83c45c898883d329db2 Mon Sep 17 00:00:00 2001 From: Paul Martin <paul@paulsputer.com> Date: Mon, 20 Oct 2014 17:54:54 -0400 Subject: [PATCH] Tickets - Priority, Severity options --- src/main/java/com/gitblit/wicket/TicketsUI.java | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/TicketsUI.java b/src/main/java/com/gitblit/wicket/TicketsUI.java index 347ac44..2367c98 100644 --- a/src/main/java/com/gitblit/wicket/TicketsUI.java +++ b/src/main/java/com/gitblit/wicket/TicketsUI.java @@ -21,6 +21,8 @@ import org.apache.wicket.markup.html.basic.Label; import com.gitblit.models.TicketModel; +import com.gitblit.models.TicketModel.Priority; +import com.gitblit.models.TicketModel.Severity; import com.gitblit.models.TicketModel.Status; import com.gitblit.models.TicketModel.Type; import com.gitblit.utils.StringUtils; @@ -36,7 +38,7 @@ public static final String [] openStatii = new String [] { Status.New.name().toLowerCase(), Status.Open.name().toLowerCase() }; public static final String [] closedStatii = new String [] { "!" + Status.New.name().toLowerCase(), "!" + Status.Open.name().toLowerCase() }; - + public static Label getStateIcon(String wicketId, TicketModel ticket) { return getStateIcon(wicketId, ticket.type, ticket.status); } @@ -48,28 +50,59 @@ } switch (type) { case Proposal: - WicketUtils.setCssClass(label, "fa fa-code-fork"); + WicketUtils.setCssClass(label, "fa fa-code-fork fa-fw"); break; case Bug: - WicketUtils.setCssClass(label, "fa fa-bug"); + WicketUtils.setCssClass(label, "fa fa-bug fa-fw"); break; case Enhancement: - WicketUtils.setCssClass(label, "fa fa-magic"); + WicketUtils.setCssClass(label, "fa fa-magic fa-fw"); break; case Question: - WicketUtils.setCssClass(label, "fa fa-question"); + WicketUtils.setCssClass(label, "fa fa-question fa-fw"); break; case Maintenance: - WicketUtils.setCssClass(label, "fa fa-cogs"); + WicketUtils.setCssClass(label, "fa fa-cogs fa-fw"); break; default: // standard ticket - WicketUtils.setCssClass(label, "fa fa-ticket"); + WicketUtils.setCssClass(label, "fa fa-ticket fa-fw"); } WicketUtils.setHtmlTooltip(label, getTypeState(type, state)); + return label; } + + public static Label getPriorityIcon(String wicketId, Priority priority) { + Label label = new Label(wicketId); + if (priority == null) { + priority = Priority.defaultPriority; + } + switch (priority) { + case Urgent: + WicketUtils.setCssClass(label, "fa fa-step-forward fa-rotate-270"); + break; + case High: + WicketUtils.setCssClass(label, "fa fa-caret-up fa-lg"); + break; + case Low: + WicketUtils.setCssClass(label, "fa fa-caret-down fa-lg"); + break; + default: + } + WicketUtils.setHtmlTooltip(label, priority.toString()); + + return label; + } + + public static String getPriorityClass(Priority priority) { + return String.format("priority-%s", priority); + } + public static String getSeverityClass(Severity severity) { + return String.format("severity-%s", severity); + } + public static String getTypeState(Type type, Status state) { return state.toString() + " " + type.toString(); } -- Gitblit v1.9.1