Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -83,7 +83,10 @@
               item.add(new Label("ticketsLink").setVisible(false));
            }

            item.add(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) {
@@ -153,7 +156,7 @@
               if (responsible == null) {
                  responsible = new UserModel(ticket.responsible);
               }
               GravatarImage avatar = new GravatarImage("responsible", responsible.getDisplayName(),
               AvatarImage avatar = new AvatarImage("responsible", responsible.getDisplayName(),
                     responsible.emailAddress, null, 16, true);
               avatar.setTooltip(getString("gb.responsible") + ": " + responsible.getDisplayName());
               item.add(avatar);
@@ -167,6 +170,11 @@
            // watching indicator
            item.add(new Label("watching").setVisible(ticket.isWatching(GitBlitWebSession.get().getUsername())));

            // priority indicator
            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());