From 27ae9095639bb228a1b7ff86a3ebe4264abf05be Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Thu, 29 Nov 2012 12:33:09 -0500
Subject: [PATCH] feature: when using LdapUserService one can configure Gitblit to fetch all users from ldap that can possibly login. This allows to see newly generated LDAP users instantly in Gitblit. By now an LDAP user had to log in once to appear in GitBlit.
---
src/com/gitblit/client/IndicatorsRenderer.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/client/IndicatorsRenderer.java b/src/com/gitblit/client/IndicatorsRenderer.java
index 8c13122..59ce6dd 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,11 @@
private final ImageIcon frozenIcon;
private final ImageIcon federatedIcon;
+
+ private final ImageIcon forkIcon;
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 +66,7 @@
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"));
}
@Override
@@ -77,33 +80,30 @@
if (value instanceof RepositoryModel) {
StringBuilder tooltip = new StringBuilder();
RepositoryModel model = (RepositoryModel) value;
+ 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 +119,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