From 134a895dbf6db6b9784f165a3a577d6059949169 Mon Sep 17 00:00:00 2001
From: Mohamed MOUNIROU <mmounirou@MacBook-Pro-de-Mohamed.local>
Date: Tue, 04 Oct 2011 16:35:09 -0400
Subject: [PATCH] add tools to install giblet as service on linux based os

---
 src/com/gitblit/wicket/pages/RepositoryPage.java |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index 00ed755..1b6ae08 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -15,6 +15,7 @@
  */
 package com.gitblit.wicket.pages;
 
+import java.io.Serializable;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,6 +69,7 @@
 		private static final long serialVersionUID = 1L;
 
 		{
+			put("repositories", new PageRegistration("gb.repositories", RepositoriesPage.class, false));
 			put("summary", new PageRegistration("gb.summary", SummaryPage.class));
 			put("log", new PageRegistration("gb.log", LogPage.class));
 			put("branches", new PageRegistration("gb.branches", BranchesPage.class));
@@ -92,6 +94,7 @@
 		RepositoryModel model = getRepositoryModel();
 
 		// standard page links
+		addRegisteredPageLink("repositories");
 		addRegisteredPageLink("summary");
 		addRegisteredPageLink("log");
 		addRegisteredPageLink("branches");
@@ -132,10 +135,8 @@
 			public void populateItem(final Item<String> item) {
 				String extra = item.getModelObject();
 				PageRegistration pageReg = registeredPages.get(extra);
-				item.add(new Label("extraSeparator", " | "));
 				item.add(new LinkPanel("extraLink", null, getString(pageReg.translationKey),
-						pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName))
-						.setEnabled(!extra.equals(pageWicketId)));
+						pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName)));
 			}
 		};
 		add(extrasView);
@@ -154,6 +155,15 @@
 		// set stateless page preference
 		setStatelessHint(true);
 	}
+	
+	@Override
+	protected void setupPage(String repositoryName, String pageName) {
+		add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class,
+				WicketUtils.newRepositoryParameter(repositoryName)));
+		add(new Label("pageName", pageName));
+
+		super.setupPage(repositoryName, pageName);
+	}
 
 	public String getLinkWicketId(String pageName) {
 		for (String wicketId : registeredPages.keySet()) {
@@ -171,15 +181,20 @@
 		if (!StringUtils.isEmpty(wicketId)) {
 			Component c = get(wicketId);
 			if (c != null) {
-				c.setEnabled(false);
+//				c.setEnabled(false);
+//				WicketUtils.setCssClass(c, "selected");
 			}
 		}
 	}
 
 	private void addRegisteredPageLink(String key) {
 		PageRegistration pageReg = registeredPages.get(key);
-		add(new BookmarkablePageLink<Void>(key, pageReg.pageClass,
-				WicketUtils.newRepositoryParameter(repositoryName)));
+		if (pageReg.repositoryLink) {
+			add(new BookmarkablePageLink<Void>(key, pageReg.pageClass,
+					WicketUtils.newRepositoryParameter(repositoryName)));
+		} else {
+			add(new BookmarkablePageLink<Void>(key, pageReg.pageClass));
+		}
 	}
 
 	protected void addSyndicationDiscoveryLink() {
@@ -205,7 +220,7 @@
 			RepositoryModel model = GitBlit.self().getRepositoryModel(
 					GitBlitWebSession.get().getUser(), repositoryName);
 			if (model == null) {
-				error("Unauthorized access for repository " + repositoryName, true);
+				authenticationError("Unauthorized access for repository " + repositoryName);
 				return null;
 			}
 			m = model;
@@ -329,21 +344,25 @@
 		return WicketUtils.newObjectParameter(repositoryName, commitId);
 	}
 
-	protected PageParameters newPathParameter(String path) {
-		return WicketUtils.newPathParameter(repositoryName, objectId, path);
-	}
+	private static class PageRegistration implements Serializable {
+		private static final long serialVersionUID = 1L;
 
-	private static class PageRegistration {
 		final String translationKey;
 		final Class<? extends BasePage> pageClass;
+		final boolean repositoryLink;
 
 		PageRegistration(String translationKey, Class<? extends BasePage> pageClass) {
+			this(translationKey, pageClass, true);
+		}
+		
+		PageRegistration(String translationKey, Class<? extends BasePage> pageClass, boolean repositoryLink) {
 			this.translationKey = translationKey;
 			this.pageClass = pageClass;
+			this.repositoryLink = repositoryLink;
 		}
 	}
 
-	private static class SearchForm extends StatelessForm<Void> {
+	private static class SearchForm extends StatelessForm<Void> implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private final String repositoryName;
@@ -365,7 +384,7 @@
 
 		void setTranslatedAttributes() {
 			WicketUtils.setHtmlTooltip(get("searchType"), getString("gb.searchTypeTooltip"));
-			WicketUtils.setHtmlTooltip(get("searchBox"), getString("gb.searchTooltip"));
+			WicketUtils.setHtmlTooltip(get("searchBox"), MessageFormat.format(getString("gb.searchTooltip"), repositoryName));
 			WicketUtils.setInputPlaceholder(get("searchBox"), getString("gb.search"));
 		}
 
@@ -373,6 +392,10 @@
 		public void onSubmit() {
 			SearchType searchType = searchTypeModel.getObject();
 			String searchString = searchBoxModel.getObject();
+			if (searchString == null) {
+				// FIXME IE intermittently has no searchString. Wicket bug?
+				return;
+			}
 			for (SearchType type : SearchType.values()) {
 				if (searchString.toLowerCase().startsWith(type.name().toLowerCase() + ":")) {
 					searchType = type;

--
Gitblit v1.9.1