From 608ecec9dff2ea4ce8e2a1ea6fc8909a64492a68 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 09:43:56 -0400
Subject: [PATCH] Patch formatter. Ensure html escaping. css tweaks.
---
src/com/gitblit/wicket/panels/PageLinksPanel.java | 84 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.java b/src/com/gitblit/wicket/panels/PageLinksPanel.java
index d203426..e2f9401 100644
--- a/src/com/gitblit/wicket/panels/PageLinksPanel.java
+++ b/src/com/gitblit/wicket/panels/PageLinksPanel.java
@@ -1,20 +1,26 @@
package com.gitblit.wicket.panels;
+import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.eclipse.jgit.lib.Repository;
+import com.gitblit.StoredSettings;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.LinkPanel;
+import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.BranchesPage;
-import com.gitblit.wicket.pages.ShortLogPage;
+import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TagsPage;
import com.gitblit.wicket.pages.TicGitPage;
@@ -24,47 +30,37 @@
private static final long serialVersionUID = 1L;
+ private final Map<String, String> knownPages = new HashMap<String, String>() {
+
+ 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("ticgit", "gb.ticgit");
+ }
+ };
+
public PageLinksPanel(String id, Repository r, final String repositoryName, String pageName) {
super(id);
// summary
- if (pageName.equals("summary")) {
- add(new Label("summary", pageName));
- } else {
- add(new LinkPanel("summary", null, "summary", SummaryPage.class, new PageParameters("p=" + repositoryName)));
- }
+ 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)));
- // shortlog
- if (pageName.equals("shortlog")) {
- add(new Label("shortlog", pageName));
- } else {
- add(new LinkPanel("shortlog", null, "shortlog", ShortLogPage.class, new PageParameters("p=" + repositoryName)));
- }
-
- // branches
- if (pageName.equals("branches")) {
- add(new Label("branches", pageName));
- } else {
- add(new LinkPanel("branches", null, "branches", BranchesPage.class, new PageParameters("p=" + repositoryName)));
- }
-
- // tags
- if (pageName.equals("tags")) {
- add(new Label("tags", pageName));
- } else {
- add(new LinkPanel("tags", null, "tags", TagsPage.class, new PageParameters("p=" + repositoryName)));
- }
-
- // tree
- if (pageName.equals("tree")) {
- add(new Label("tree", pageName));
- } else {
- add(new LinkPanel("tree", null, "tree", TreePage.class, new PageParameters("p=" + repositoryName + ",h=HEAD")));
- }
-
+ // Get the repository ticgit setting
+ boolean checkTicgit = StoredSettings.getBoolean("ticgit.global", false);
+ checkTicgit |= StoredSettings.getBoolean(MessageFormat.format("ticgit.{0}", repositoryName), false);
+
// Add dynamic repository extras
List<String> extras = new ArrayList<String>();
- if (JGitUtils.getTicGitBranch(r) != null) {
+ if (checkTicgit && JGitUtils.getTicGitBranch(r) != null) {
extras.add("ticgit");
}
@@ -76,10 +72,24 @@
String extra = item.getModelObject();
if (extra.equals("ticgit")) {
item.add(new Label("extraSeparator", " | "));
- item.add(new LinkPanel("extraLink", null, "ticgit", TicGitPage.class, new PageParameters("p=" + repositoryName)));
+ item.add(new LinkPanel("extraLink", null, "ticgit", TicGitPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
}
}
};
add(extrasView);
}
+
+ public void disablePageLink(String pageName) {
+ for (String wicketId : knownPages.keySet()) {
+ String key = knownPages.get(wicketId);
+ String linkName = getString(key);
+ if (linkName.equals(pageName)) {
+ Component c = get(wicketId);
+ if (c != null) {
+ c.setEnabled(false);
+ }
+ break;
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1