From 10177fb0a59cc9fc61fb78c724f7b0816b69b798 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 01 Oct 2011 15:50:22 -0400
Subject: [PATCH] CSS fixes for palette buttons
---
src/com/gitblit/wicket/pages/RepositoryPage.java | 135 +++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 54 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index cf14ee1..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;
@@ -40,8 +41,6 @@
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
@@ -65,20 +64,20 @@
private RepositoryModel m;
- private final Logger logger = LoggerFactory.getLogger(RepositoryPage.class);
-
- private final Map<String, String> knownPages = new HashMap<String, String>() {
+ private final Map<String, PageRegistration> registeredPages = new HashMap<String, PageRegistration>() {
private static final long serialVersionUID = 1L;
{
- put("summary", "gb.summary");
- put("log", "gb.log");
- put("branches", "gb.branches");
- put("tags", "gb.tags");
- put("tree", "gb.tree");
- put("tickets", "gb.tickets");
- put("edit", "gb.edit");
+ 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));
+ put("tags", new PageRegistration("gb.tags", TagsPage.class));
+ put("tree", new PageRegistration("gb.tree", TreePage.class));
+ put("tickets", new PageRegistration("gb.tickets", TicketsPage.class));
+ put("edit", new PageRegistration("gb.edit", EditRepositoryPage.class));
+ put("docs", new PageRegistration("gb.docs", DocsPage.class));
}
};
@@ -95,26 +94,18 @@
RepositoryModel model = getRepositoryModel();
// standard page links
- add(new BookmarkablePageLink<Void>("summary", SummaryPage.class,
- WicketUtils.newRepositoryParameter(repositoryName)));
- add(new BookmarkablePageLink<Void>("log", LogPage.class,
- WicketUtils.newRepositoryParameter(repositoryName)));
- add(new BookmarkablePageLink<Void>("branches", BranchesPage.class,
- WicketUtils.newRepositoryParameter(repositoryName)));
- add(new BookmarkablePageLink<Void>("tags", TagsPage.class,
- WicketUtils.newRepositoryParameter(repositoryName)));
- add(new BookmarkablePageLink<Void>("tree", TreePage.class,
- WicketUtils.newRepositoryParameter(repositoryName)));
+ addRegisteredPageLink("repositories");
+ addRegisteredPageLink("summary");
+ addRegisteredPageLink("log");
+ addRegisteredPageLink("branches");
+ addRegisteredPageLink("tags");
+ addRegisteredPageLink("tree");
// per-repository extra page links
List<String> extraPageLinks = new ArrayList<String>();
-
- // Conditionally add tickets link
if (model.useTickets && TicgitUtils.getTicketsBranch(r) != null) {
extraPageLinks.add("tickets");
}
-
- // Conditionally add docs link
if (model.useDocs) {
extraPageLinks.add("docs");
}
@@ -135,26 +126,17 @@
extraPageLinks.add("edit");
}
+ final String pageName = getPageName();
+ final String pageWicketId = getLinkWicketId(pageName);
ListDataProvider<String> extrasDp = new ListDataProvider<String>(extraPageLinks);
DataView<String> extrasView = new DataView<String>("extra", extrasDp) {
private static final long serialVersionUID = 1L;
public void populateItem(final Item<String> item) {
String extra = item.getModelObject();
- if (extra.equals("tickets")) {
- item.add(new Label("extraSeparator", " | "));
- item.add(new LinkPanel("extraLink", null, getString("gb.tickets"),
- TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
- } else if (extra.equals("docs")) {
- item.add(new Label("extraSeparator", " | "));
- item.add(new LinkPanel("extraLink", null, getString("gb.docs"), DocsPage.class,
- WicketUtils.newRepositoryParameter(repositoryName)));
- } else if (extra.equals("edit")) {
- item.add(new Label("extraSeparator", " | "));
- item.add(new LinkPanel("extraLink", null, getString("gb.edit"),
- EditRepositoryPage.class, WicketUtils
- .newRepositoryParameter(repositoryName)));
- }
+ PageRegistration pageReg = registeredPages.get(extra);
+ item.add(new LinkPanel("extraLink", null, getString(pageReg.translationKey),
+ pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName)));
}
};
add(extrasView);
@@ -163,7 +145,7 @@
.getRelativePathPrefixToContextRoot(), repositoryName, null, 0)));
// disable current page
- disablePageLink(getPageName());
+ disableRegisteredPageLink(pageName);
// add floating search form
SearchForm searchForm = new SearchForm("searchForm", repositoryName);
@@ -173,18 +155,45 @@
// 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));
- public void disablePageLink(String pageName) {
- for (String wicketId : knownPages.keySet()) {
- String key = knownPages.get(wicketId);
+ super.setupPage(repositoryName, pageName);
+ }
+
+ public String getLinkWicketId(String pageName) {
+ for (String wicketId : registeredPages.keySet()) {
+ String key = registeredPages.get(wicketId).translationKey;
String linkName = getString(key);
if (linkName.equals(pageName)) {
- Component c = get(wicketId);
- if (c != null) {
- c.setEnabled(false);
- }
- break;
+ return wicketId;
}
+ }
+ return null;
+ }
+
+ public void disableRegisteredPageLink(String pageName) {
+ String wicketId = getLinkWicketId(pageName);
+ if (!StringUtils.isEmpty(wicketId)) {
+ Component c = get(wicketId);
+ if (c != null) {
+// c.setEnabled(false);
+// WicketUtils.setCssClass(c, "selected");
+ }
+ }
+ }
+
+ private void addRegisteredPageLink(String key) {
+ PageRegistration pageReg = registeredPages.get(key);
+ if (pageReg.repositoryLink) {
+ add(new BookmarkablePageLink<Void>(key, pageReg.pageClass,
+ WicketUtils.newRepositoryParameter(repositoryName)));
+ } else {
+ add(new BookmarkablePageLink<Void>(key, pageReg.pageClass));
}
}
@@ -211,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;
@@ -335,11 +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;
+
+ 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;
@@ -361,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"));
}
@@ -369,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