From dd7961bc443c732d0bbdd6bda47d6c2cfda5b290 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 17 May 2011 22:06:07 -0400
Subject: [PATCH] Building site content and documentation from Markdown.
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 28 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 4aba988..53e3c2f 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -4,11 +4,11 @@
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 java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
@@ -23,10 +23,11 @@
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.Constants.AccessRestrictionType;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.BasePage;
@@ -34,6 +35,7 @@
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.RepositoryModel;
+import com.gitblit.wicket.models.UserModel;
public class RepositoriesPage extends BasePage {
@@ -48,11 +50,19 @@
} 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));
+ adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("editUsers", RepositoriesPage.class));
add(adminLinks.setVisible(showAdmin));
+
+ // display an error message cached from a redirect
+ String cachedMessage = GitBlitWebSession.get().clearErrorMessage();
+ if (!StringUtils.isEmpty(cachedMessage)) {
+ error(cachedMessage);
+ System.out.println("displayed message");
+ }
// Load the markdown welcome message
String messageSource = GitBlit.self().settings().getString(Keys.web.repositoriesMessage, "gitblit");
@@ -60,18 +70,13 @@
if (messageSource.equalsIgnoreCase("gitblit")) {
// Read default welcome message
try {
- ContextRelativeResource res = new ContextRelativeResource("/com/gitblit/wicket/resources/welcome.mkd");
+ 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();
+ message = MarkdownUtils.transformMarkdown(reader);
} catch (Throwable t) {
message = "Failed to read default welcome message!";
- error(message, t);
+ error(message, t, false);
}
} else {
// Read user-supplied welcome message
@@ -80,15 +85,10 @@
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();
+ message = MarkdownUtils.transformMarkdown(reader);
} catch (Throwable t) {
message = "Failed to read " + file;
- error(message, t);
+ error(message, t, false);
}
} else {
message = messageSource + " is not a valid file.";
@@ -96,12 +96,11 @@
}
}
Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false);
- if (!showAdmin) {
- WicketUtils.setCssStyle(repositoriesMessage, "padding-top:10px");
- }
add(repositoriesMessage);
- List<RepositoryModel> rows = GitBlit.self().getRepositories();
+ final Map<AccessRestrictionType, String> accessRestrictionTranslations = getAccessRestrictions();
+ UserModel user = GitBlitWebSession.get().getUser();
+ List<RepositoryModel> rows = GitBlit.self().getRepositoryModels(user);
DataProvider dp = new DataProvider(rows);
DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("repository", dp) {
private static final long serialVersionUID = 1L;
@@ -109,9 +108,46 @@
public void populateItem(final Item<RepositoryModel> item) {
final RepositoryModel entry = item.getModelObject();
- 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.hasCommits) {
+ // Existing repository
+ 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));
+ } else {
+ // New repository
+ item.add(new Label("repositoryName", entry.name + "<span class='empty'>(empty)</span>").setEscapeModelStrings(false));
+ item.add(new Label("repositoryDescription", entry.description));
+ }
+
+ if (entry.useTickets) {
+ item.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png", getString("gb.tickets")));
+ } else {
+ item.add(WicketUtils.newBlankImage("ticketsIcon"));
+ }
+
+ if (entry.useDocs) {
+ item.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs")));
+ } else {
+ item.add(WicketUtils.newBlankImage("docsIcon"));
+ }
+
+ switch (entry.accessRestriction) {
+ case NONE:
+ item.add(WicketUtils.newBlankImage("accessRestrictionIcon"));
+ break;
+ case PUSH:
+ item.add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
+ break;
+ case CLONE:
+ item.add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
+ break;
+ case VIEW:
+ item.add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
+ break;
+ default:
+ item.add(WicketUtils.newBlankImage("accessRestrictionIcon"));
+ }
+
item.add(new Label("repositoryOwner", entry.owner));
String lastChange = TimeUtils.timeAgo(entry.lastChange);
@@ -119,8 +155,15 @@
item.add(lastChangeLabel);
WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));
- item.add(new BookmarkablePageLink<Void>("repositoryLinks", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setVisible(showAdmin));
-
+ 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