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 | 69 ++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index c834604..53e3c2f 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -8,6 +8,7 @@ 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,8 +24,10 @@ import org.apache.wicket.model.Model; import org.apache.wicket.resource.ContextRelativeResource; +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; @@ -32,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 { @@ -49,8 +53,16 @@ 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"); @@ -61,10 +73,10 @@ ContextRelativeResource res = WicketUtils.getResource("welcome.mkd"); InputStream is = res.getResourceStream().getInputStream(); InputStreamReader reader = new InputStreamReader(is); - message = StringUtils.transformMarkdown(reader); + 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 @@ -73,10 +85,10 @@ if (file.exists()) { try { FileReader reader = new FileReader(file); - message = StringUtils.transformMarkdown(reader); + 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."; @@ -84,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; @@ -97,28 +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.newClearPixel("ticketsIcon")); + item.add(WicketUtils.newBlankImage("ticketsIcon")); } - + if (entry.useDocs) { item.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs"))); } else { - item.add(WicketUtils.newClearPixel("docsIcon")); + item.add(WicketUtils.newBlankImage("docsIcon")); } - if (entry.useRestrictedAccess) { - item.add(WicketUtils.newImage("restrictedAccessIcon", "lock_16x16.png", getString("gb.restrictedAccess"))); - } else { - item.add(WicketUtils.newClearPixel("restrictedAccessIcon")); + 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); -- Gitblit v1.9.1