From 2dfa21c4e10e33ef2b736353ae6c2b31fc0a4fd7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Jan 2012 13:02:01 -0500
Subject: [PATCH] Merge pull request #5 from plm/admin_default_head

---
 src/com/gitblit/wicket/panels/RepositoriesPanel.java |   57 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
index e514976..4007a97 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -47,12 +48,13 @@
 import com.gitblit.SyndicationServlet;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
-import com.gitblit.utils.ByteFormat;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.utils.TimeUtils;
 import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.pages.BasePage;
 import com.gitblit.wicket.pages.EditRepositoryPage;
+import com.gitblit.wicket.pages.EmptyRepositoryPage;
 import com.gitblit.wicket.pages.SummaryPage;
 
 public class RepositoriesPanel extends BasePanel {
@@ -60,28 +62,14 @@
 	private static final long serialVersionUID = 1L;
 
 	public RepositoriesPanel(String wicketId, final boolean showAdmin,
-			List<RepositoryModel> models,
+			List<RepositoryModel> models, boolean enableLinks,
 			final Map<AccessRestrictionType, String> accessRestrictionTranslations) {
 		super(wicketId);
 
-		final boolean linksActive;
+		final boolean linksActive = enableLinks;
 		final boolean showSize = GitBlit.getBoolean(Keys.web.showRepositorySizes, true);
 
 		final UserModel user = GitBlitWebSession.get().getUser();
-		if (models == null) {
-			linksActive = true;
-			models = GitBlit.self().getRepositoryModels(user);
-			final ByteFormat byteFormat = new ByteFormat();
-			if (showSize) {
-				for (RepositoryModel model : models) {
-					model.size = byteFormat.format(GitBlit.self().calculateSize(model));
-				}
-			}
-		} else {
-			// disable links if the repositories are already provided
-			// the repositories are most likely from a proposal
-			linksActive = false;
-		}
 
 		final IDataProvider<RepositoryModel> dp;
 
@@ -127,6 +115,7 @@
 		}
 
 		final String baseUrl = WicketUtils.getGitblitURL(getRequest());
+		final boolean showSwatch = GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);
 
 		DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("row", dp) {
 			private static final long serialVersionUID = 1L;
@@ -153,31 +142,41 @@
 				}
 				Fragment row = new Fragment("rowContent", "repositoryRow", this);
 				item.add(row);
-				
+
 				// try to strip group name for less cluttered list
-				String repoName = entry.name;
+				String repoName = entry.toString();
 				if (!StringUtils.isEmpty(currGroupName) && (repoName.indexOf('/') > -1)) {
 					repoName = repoName.substring(currGroupName.length() + 1);
 				}
 				
-				if (entry.hasCommits && linksActive) {
+				// repository swatch
+				Component swatch = new Label("repositorySwatch", "&nbsp;").setEscapeModelStrings(false);
+				WicketUtils.setCssBackground(swatch, entry.toString());
+				row.add(swatch);
+				swatch.setVisible(showSwatch);
+
+				if (linksActive) {
+					Class<? extends BasePage> linkPage;
+					if (entry.hasCommits) {
+						// repository has content
+						linkPage = SummaryPage.class;
+					} else {
+						// new/empty repository OR proposed repository
+						linkPage = EmptyRepositoryPage.class;
+					}
+
 					PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
-					row.add(new LinkPanel("repositoryName", "list", repoName, SummaryPage.class, pp));
+					row.add(new LinkPanel("repositoryName", "list", repoName, linkPage, pp));
 					row.add(new LinkPanel("repositoryDescription", "list", entry.description,
-							SummaryPage.class, pp));
+							linkPage, pp));
 				} else {
-					// new/empty repository OR proposed repository
+					// no links like on a federation page
 					row.add(new Label("repositoryName", repoName));
 					row.add(new Label("repositoryDescription", entry.description));
 				}
-
 				if (entry.hasCommits) {
 					// Existing repository
-					if (showSize) {
-						row.add(new Label("repositorySize", entry.size));
-					} else {
-						row.add(new Label("repositorySize").setVisible(false));
-					}
+					row.add(new Label("repositorySize", entry.size).setVisible(showSize));
 				} else {
 					// New repository
 					row.add(new Label("repositorySize", "<span class='empty'>(empty)</span>")

--
Gitblit v1.9.1