From 3e087ada55f8b0e83b146578b695552db9dc8d97 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 27 Apr 2011 20:55:38 -0400
Subject: [PATCH] Integrated pagelinks into RepositoryPage. Fixed string encoding.
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 123 ++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 21 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 3a43b0d..a7ec963 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -1,10 +1,16 @@
package com.gitblit.wicket.pages;
+import java.io.File;
+import java.io.FileReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+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;
@@ -16,39 +22,86 @@
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.resource.ContextRelativeResource;
+import org.tautua.markdownpapers.Markdown;
import com.gitblit.GitBlit;
-import com.gitblit.StoredSettings;
-import com.gitblit.utils.Utils;
+import com.gitblit.Keys;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.BasePage;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.RepositoryModel;
-
public class RepositoriesPage extends BasePage {
public RepositoriesPage() {
super();
setupPage("", "");
-
- boolean showAdmin = false;
- if (StoredSettings.getBoolean("authenticateWebUI", true)) {
- boolean allowAdmin = StoredSettings.getBoolean("allowAdministration", false);
- showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
- } else {
- showAdmin = StoredSettings.getBoolean("allowAdministration", false);
- }
-
- Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
- adminLinks.add(new BookmarkablePageLink<Void>("newRepository", RepositoriesPage.class));
- adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));
- add(adminLinks.setVisible(showAdmin));
-
- add(new Label("repositoriesMessage", StoredSettings.getString("repositoriesMessage", "")).setEscapeModelStrings(false));
- List<RepositoryModel> rows = GitBlit.self().getRepositories(getRequest());
+ final boolean showAdmin;
+ if (GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
+ boolean allowAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
+ showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
+ } else {
+ showAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
+ }
+
+ Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
+ adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));
+ add(adminLinks.setVisible(showAdmin));
+
+ // Load the markdown welcome message
+ String messageSource = GitBlit.self().settings().getString(Keys.web.repositoriesMessage, "gitblit");
+ String message = "";
+ if (messageSource.equalsIgnoreCase("gitblit")) {
+ // Read default welcome message
+ try {
+ ContextRelativeResource res = WicketUtils.getResource("welcome.mkd");
+ InputStream is = res.getResourceStream().getInputStream();
+ InputStreamReader reader = new InputStreamReader(is);
+ StringWriter writer = new StringWriter();
+ Markdown markdown = new Markdown();
+ markdown.transform(reader, writer);
+ message = writer.toString().trim();
+ reader.close();
+ writer.close();
+ } catch (Throwable t) {
+ message = "Failed to read default welcome message!";
+ error(message, t);
+ }
+ } else {
+ // Read user-supplied welcome message
+ if (!StringUtils.isEmpty(messageSource)) {
+ File file = new File(messageSource);
+ if (file.exists()) {
+ try {
+ FileReader reader = new FileReader(file);
+ StringWriter writer = new StringWriter();
+ Markdown markdown = new Markdown();
+ markdown.transform(reader, writer);
+ message = writer.toString().trim();
+ reader.close();
+ writer.close();
+ } catch (Throwable t) {
+ message = "Failed to read " + file;
+ error(message, t);
+ }
+ } else {
+ message = messageSource + " is not a valid file.";
+ }
+ }
+ }
+ Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false);
+ if (!showAdmin) {
+ WicketUtils.setCssStyle(repositoriesMessage, "padding-top:10px");
+ }
+ add(repositoriesMessage);
+
+ List<RepositoryModel> rows = GitBlit.self().getRepositories();
DataProvider dp = new DataProvider(rows);
DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("repository", dp) {
private static final long serialVersionUID = 1L;
@@ -59,13 +112,41 @@
PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
item.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class, pp));
item.add(new LinkPanel("repositoryDescription", "list", entry.description, SummaryPage.class, pp));
+
+ if (entry.useTickets) {
+ item.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png", getString("gb.tickets")));
+ } else {
+ item.add(WicketUtils.newClearPixel("ticketsIcon"));
+ }
+
+ if (entry.useDocs) {
+ item.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs")));
+ } else {
+ item.add(WicketUtils.newClearPixel("docsIcon"));
+ }
+
+ if (entry.useRestrictedAccess) {
+ item.add(WicketUtils.newImage("restrictedAccessIcon", "lock_16x16.png", getString("gb.restrictedAccess")));
+ } else {
+ item.add(WicketUtils.newClearPixel("restrictedAccessIcon"));
+ }
+
item.add(new Label("repositoryOwner", entry.owner));
- String lastChange = Utils.timeAgo(entry.lastChange);
+ String lastChange = TimeUtils.timeAgo(entry.lastChange);
Label lastChangeLabel = new Label("repositoryLastChange", lastChange);
item.add(lastChangeLabel);
- WicketUtils.setCssClass(lastChangeLabel, Utils.timeAgoCss(entry.lastChange));
+ WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));
+ if (showAdmin) {
+ Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryAdminLinks", this);
+ repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)));
+ repositoryLinks.add(new BookmarkablePageLink<Void>("renameRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
+ repositoryLinks.add(new BookmarkablePageLink<Void>("deleteRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
+ item.add(repositoryLinks);
+ } else {
+ item.add(new Label("repositoryLinks"));
+ }
WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
--
Gitblit v1.9.1