Remove S# text, set severity in tooltip

James Moger

2014-10-21 ad80a949ae334a18d5757df729198801299011dc

Remove S# text, set severity in tooltip

 src/main/java/com/gitblit/wicket/TicketsUI.java

@@ -38,12 +38,12 @@
    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 @@
            // 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 @@
        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) {

 src/main/java/com/gitblit/wicket/panels/TicketListPanel.java

@@ -53,7 +53,7 @@
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 @@
                    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 @@
                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());

 src/main/resources/gitblit.css

@@ -2089,7 +2089,7 @@
}

.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 @@
}

.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 @@
}

.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 @@
}

.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 @@
}

.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;