Remove S# text, set severity in tooltip

3 files changed, 24 insertions, 21 deletions

diff --git a/src/main/java/com/gitblit/wicket/TicketsUI.java b/src/main/java/com/gitblit/wicket/TicketsUI.java
index 2367c984..8d599523 100644
--- a/src/main/java/com/gitblit/wicket/TicketsUI.java
+++ b/src/main/java/com/gitblit/wicket/TicketsUI.java
@@ -38,12 +38,12 @@ public class TicketsUI {
 	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);
+		return getStateIcon(wicketId, ticket.type, ticket.status, ticket.severity);
 	}
 
-	public static Label getStateIcon(String wicketId, Type type, Status state) {
+	public static Label getStateIcon(String wicketId, Type type, Status state, Severity severity) {
 		Label label = new Label(wicketId);
 		if (type == null) {
 			type = Type.defaultType;
@@ -68,11 +68,11 @@ public class TicketsUI {
 			// standard ticket
 			WicketUtils.setCssClass(label, "fa fa-ticket fa-fw");
 		}
-		WicketUtils.setHtmlTooltip(label, getTypeState(type, state));
-		
+		WicketUtils.setHtmlTooltip(label, getTypeState(type, state, severity));
+
 		return label;
 	}
-	
+
 	public static Label getPriorityIcon(String wicketId, Priority priority) {
 		Label label = new Label(wicketId);
 		if (priority == null) {
@@ -91,20 +91,23 @@ public class TicketsUI {
 		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);	
+		return String.format("severity-%s", severity);
 	}
-	
-	public static String getTypeState(Type type, Status state) {
-		return state.toString() + " " + type.toString();
+
+	public static String getTypeState(Type type, Status state, Severity severity) {
+		if (Severity.Unrated == severity) {
+			return state.toString() + " " + type.toString();
+		}
+		return state.toString() + " " + type.toString() + ", " + severity.toString();
 	}
 
 	public static String getLozengeClass(Status status, boolean subtle) {
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index b4c43cb8..2ac33d53 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -53,7 +53,7 @@ import com.gitblit.wicket.pages.UserPage;
 public class TicketListPanel extends BasePanel {
 
 	private static final long serialVersionUID = 1L;
-	
+
 	public TicketListPanel(String wicketId, List<QueryResult> list, final boolean showSwatch, final boolean showRepository) {
 		super(wicketId);
 
@@ -83,10 +83,10 @@ public class TicketListPanel extends BasePanel {
 					item.add(new Label("ticketsLink").setVisible(false));
 				}
 
-				Label icon = TicketsUI.getStateIcon("state", ticket.type, ticket.status);
+				Label icon = TicketsUI.getStateIcon("state", ticket.type, ticket.status, ticket.severity);
 				WicketUtils.addCssClass(icon, TicketsUI.getSeverityClass(ticket.severity));
 				item.add(icon);
-				
+
 				item.add(new Label("id", "" + ticket.number));
 				UserModel creator = app().users().getUserModel(ticket.createdBy);
 				if (creator != null) {
@@ -174,7 +174,7 @@ public class TicketListPanel extends BasePanel {
 				Label priorityIcon = TicketsUI.getPriorityIcon("priority", ticket.priority);
 				WicketUtils.addCssClass(priorityIcon, TicketsUI.getPriorityClass(ticket.priority));
 				item.add(priorityIcon.setVisible(true));
-				
+
 				// status indicator
 				String css = TicketsUI.getLozengeClass(ticket.status, true);
 				Label l = new Label("status", ticket.status.toString());
diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index e517cfa9..4cc9ab6b 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -2089,7 +2089,7 @@ div.markdown table.text th, div.markdown table.text td {
 }

 .severity-catastrophic:after {

 	font-family: Helvetica,arial,freesans,clean,sans-serif ;

-	content: "S5\a●●●●●";

+	content: "●●●●●";

 	font-weight:900;

 	font-size:.45em;	

 	font-variant:small-caps;

@@ -2101,7 +2101,7 @@ div.markdown table.text th, div.markdown table.text td {
 }

 .severity-critical:after {

 	font-family: Helvetica,arial,freesans,clean,sans-serif ;

-	content: "S4\a●●●●";

+	content: "●●●●";

 	font-weight:900;

 	font-size:.45em;	

 	font-variant:small-caps;

@@ -2113,7 +2113,7 @@ div.markdown table.text th, div.markdown table.text td {
 }

 .severity-serious:after {

 	font-family: Helvetica,arial,freesans,clean,sans-serif ;

-	content: "  S3\a   ●●●";

+	content: "  ●●●";

 	font-weight:900;

 	font-size:.45em;	

 	font-variant:small-caps;

@@ -2125,7 +2125,7 @@ div.markdown table.text th, div.markdown table.text td {
 }

 .severity-minor:after {

 	font-family: Helvetica,arial,freesans,clean,sans-serif ;

-	content: "   S2\a    ●●";

+	content: "   ●●";

 	font-weight:900;

 	font-size:.45em;	

 	font-variant:small-caps;

@@ -2137,7 +2137,7 @@ div.markdown table.text th, div.markdown table.text td {
 }

 .severity-negligible:after {

 	font-family: Helvetica,arial,freesans,clean,sans-serif ;

-	content: "   S1\a    ●";

+	content: "    ●";

 	font-weight:900;

 	font-size:.45em;	

 	font-variant:small-caps;