From 44f2dad1f1d3a9ee2b22f213e806d5ef415769b0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Oct 2011 22:22:40 -0400
Subject: [PATCH] Polish GitblitPanel. Exclude the manager from GO and WAR builds.
---
src/com/gitblit/client/GitblitPanel.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index 3e2cb7a..5525e41 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -19,6 +19,7 @@
import java.awt.Color;
import java.awt.Component;
import java.awt.Desktop;
+import java.awt.FlowLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -215,15 +216,22 @@
repositoryTablePanel.add(repositoryFilterPanel, BorderLayout.NORTH);
repositoryTablePanel.add(new JScrollPane(repositoriesTable), BorderLayout.CENTER);
- JPanel repositoryControls = new JPanel();
+ JPanel repositoryControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
repositoryControls.add(refreshRepositories);
repositoryControls.add(browseRepository);
repositoryControls.add(createRepository);
repositoryControls.add(editRepository);
repositoryControls.add(delRepository);
- JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin));
- repositoriesPanel.add(newHeaderLabel(Translation.get("gb.repositories")),
+ JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin)) {
+
+ private static final long serialVersionUID = 1L;
+
+ public Insets getInsets() {
+ return insets;
+ }
+ };
+ repositoriesPanel.add(new HeaderPanel(Translation.get("gb.repositories")),
BorderLayout.NORTH);
repositoriesPanel.add(repositoryTablePanel, BorderLayout.CENTER);
repositoriesPanel.add(repositoryControls, BorderLayout.SOUTH);
@@ -300,14 +308,21 @@
userTablePanel.add(userFilterPanel, BorderLayout.NORTH);
userTablePanel.add(new JScrollPane(usersTable), BorderLayout.CENTER);
- JPanel userControls = new JPanel();
+ JPanel userControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
userControls.add(refreshUsers);
userControls.add(createUser);
userControls.add(editUser);
userControls.add(delUser);
- JPanel usersPanel = new JPanel(new BorderLayout(margin, margin));
- usersPanel.add(newHeaderLabel(Translation.get("gb.users")), BorderLayout.NORTH);
+ JPanel usersPanel = new JPanel(new BorderLayout(margin, margin)) {
+
+ private static final long serialVersionUID = 1L;
+
+ public Insets getInsets() {
+ return insets;
+ }
+ };
+ usersPanel.add(new HeaderPanel(Translation.get("gb.users")), BorderLayout.NORTH);
usersPanel.add(userTablePanel, BorderLayout.CENTER);
usersPanel.add(userControls, BorderLayout.SOUTH);
@@ -318,15 +333,6 @@
setLayout(new BorderLayout());
add(tabs, BorderLayout.CENTER);
- }
-
- private JLabel newHeaderLabel(String text) {
- JLabel label = new JLabel(text);
- label.setOpaque(true);
- label.setForeground(Color.white);
- label.setBackground(Color.gray);
- label.setFont(label.getFont().deriveFont(14f));
- return label;
}
private void setRepositoryRenderer(RepositoriesModel.Columns col, TableCellRenderer renderer) {
--
Gitblit v1.9.1