From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001
From: Thomas Pummer <dev@nullpointer.at>
Date: Fri, 22 Feb 2013 11:10:11 -0500
Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit
---
src/com/gitblit/client/IndicatorsRenderer.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/client/IndicatorsRenderer.java b/src/com/gitblit/client/IndicatorsRenderer.java
index 8c13122..44b39d0 100644
--- a/src/com/gitblit/client/IndicatorsRenderer.java
+++ b/src/com/gitblit/client/IndicatorsRenderer.java
@@ -16,7 +16,7 @@
package com.gitblit.client;
import java.awt.Component;
-import java.awt.GridLayout;
+import java.awt.FlowLayout;
import java.io.Serializable;
import javax.swing.ImageIcon;
@@ -53,9 +53,13 @@
private final ImageIcon frozenIcon;
private final ImageIcon federatedIcon;
+
+ private final ImageIcon forkIcon;
+
+ private final ImageIcon sparkleshareIcon;
public IndicatorsRenderer() {
- super(new GridLayout(1, 0, 1, 0));
+ super(new FlowLayout(FlowLayout.RIGHT, 1, 0));
blankIcon = new ImageIcon(getClass().getResource("/blank.png"));
pushIcon = new ImageIcon(getClass().getResource("/lock_go_16x16.png"));
pullIcon = new ImageIcon(getClass().getResource("/lock_pull_16x16.png"));
@@ -64,6 +68,8 @@
doxIcon = new ImageIcon(getClass().getResource("/book_16x16.png"));
frozenIcon = new ImageIcon(getClass().getResource("/cold_16x16.png"));
federatedIcon = new ImageIcon(getClass().getResource("/federated_16x16.png"));
+ forkIcon = new ImageIcon(getClass().getResource("/commit_divide_16x16.png"));
+ sparkleshareIcon = new ImageIcon(getClass().getResource("/star_16x16.png"));
}
@Override
@@ -77,33 +83,35 @@
if (value instanceof RepositoryModel) {
StringBuilder tooltip = new StringBuilder();
RepositoryModel model = (RepositoryModel) value;
+ if (model.isSparkleshared()) {
+ JLabel icon = new JLabel(sparkleshareIcon);
+ tooltip.append(Translation.get("gb.isSparkleshared")).append("<br/>");
+ add(icon);
+ }
+ if (model.isFork()) {
+ JLabel icon = new JLabel(forkIcon);
+ tooltip.append(Translation.get("gb.isFork")).append("<br/>");
+ add(icon);
+ }
if (model.useTickets) {
JLabel icon = new JLabel(tixIcon);
tooltip.append(Translation.get("gb.tickets")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
if (model.useDocs) {
JLabel icon = new JLabel(doxIcon);
tooltip.append(Translation.get("gb.docs")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
if (model.isFrozen) {
JLabel icon = new JLabel(frozenIcon);
tooltip.append(Translation.get("gb.isFrozen")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
if (model.isFederated) {
JLabel icon = new JLabel(federatedIcon);
tooltip.append(Translation.get("gb.isFederated")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
switch (model.accessRestriction) {
@@ -119,7 +127,7 @@
}
case CLONE: {
JLabel icon = new JLabel(pullIcon);
- tooltip.append(Translation.get("gb.pullRestricted")).append("<br/>");
+ tooltip.append(Translation.get("gb.cloneRestricted")).append("<br/>");
add(icon);
break;
}
--
Gitblit v1.9.1