From eecaad8b8e2c447429c31a01d49260ddd6b4ee03 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 16 Apr 2016 17:35:32 -0400
Subject: [PATCH] Proof of concept #1026
---
src/main/java/com/gitblit/wicket/pages/DocsPage.java | 154 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 107 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/DocsPage.java b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
index 58471ef..5244386 100644
--- a/src/main/java/com/gitblit/wicket/pages/DocsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
@@ -15,29 +15,35 @@
*/
package com.gitblit.wicket.pages;
-import java.util.Arrays;
import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.Fragment;
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.apache.wicket.model.StringResourceModel;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitblit.GitBlit;
-import com.gitblit.Keys;
import com.gitblit.models.PathModel;
+import com.gitblit.models.UserModel;
+import com.gitblit.servlet.RawServlet;
import com.gitblit.utils.ByteFormat;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.CacheControl;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.CacheControl.LastModified;
+import com.gitblit.wicket.MarkupProcessor;
+import com.gitblit.wicket.MarkupProcessor.MarkupDocument;
+import com.gitblit.wicket.MarkupProcessor.MarkupSyntax;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.LinkPanel;
@@ -47,50 +53,95 @@
public DocsPage(PageParameters params) {
super(params);
+ String objectId = WicketUtils.getObject(params);
+
+ MarkupProcessor processor = new MarkupProcessor(app().settings(), app().xssFilter());
+
Repository r = getRepository();
- RevCommit head = JGitUtils.getCommit(r, null);
- List<String> extensions = GitBlit.getStrings(Keys.web.markdownExtensions);
+ UserModel currentUser = (GitBlitWebSession.get().getUser() != null) ? GitBlitWebSession.get().getUser() : UserModel.ANONYMOUS;
+ final boolean userCanEdit = currentUser.canEdit(getRepositoryModel());
+
+ RevCommit head = JGitUtils.getCommit(r, objectId);
+ final String commitId = getBestCommitId(head);
+
+ List<String> extensions = processor.getAllExtensions();
List<PathModel> paths = JGitUtils.getDocuments(r, extensions);
- String doc = null;
- String markdown = null;
- String html = null;
-
- List<String> roots = Arrays.asList("home");
-
- // try to find a custom index/root page
- for (PathModel path : paths) {
- String name = path.name.toLowerCase();
- if (name.indexOf('.') > -1) {
- name = name.substring(0, name.lastIndexOf('.'));
- }
- if (roots.contains(name)) {
- doc = path.name;
- break;
- }
- }
-
- if (!StringUtils.isEmpty(doc)) {
- // load the document
- String [] encodings = GitBlit.getEncodings();
- markdown = JGitUtils.getStringContent(r, head.getTree(), doc, encodings);
- html = MarkdownUtils.transformMarkdown(markdown, getLinkRenderer());
- }
-
+ List<MarkupDocument> roots = processor.getRootDocs(r, repositoryName, commitId);
Fragment fragment = null;
- if (StringUtils.isEmpty(html)) {
- // no custom index/root, use the standard document list
+ if (roots.isEmpty()) {
+ // no identified root documents
fragment = new Fragment("docs", "noIndexFragment", this);
- fragment.add(new Label("header", getString("gb.docs")));
+ setResponsePage(NoDocsPage.class, params);
} else {
- // custom index/root, use tabbed ui of index/root and document list
- fragment = new Fragment("docs", "indexFragment", this);
- Component content = new Label("index", html).setEscapeModelStrings(false);
- fragment.add(content);
+ // root documents, use tabbed ui of index/root and document list
+ fragment = new Fragment("docs", "tabsFragment", this);
+ ListDataProvider<MarkupDocument> docDp = new ListDataProvider<MarkupDocument>(roots);
+
+ // tab titles
+ DataView<MarkupDocument> tabTitles = new DataView<MarkupDocument>("tabTitle", docDp) {
+ private static final long serialVersionUID = 1L;
+ int counter;
+
+ @Override
+ public void populateItem(final Item<MarkupDocument> item) {
+ MarkupDocument doc = item.getModelObject();
+ String file = StringUtils.getLastPathElement(doc.documentPath);
+ file = StringUtils.stripFileExtension(file);
+ String name = file.replace('_', ' ').replace('-', ' ');
+
+ ExternalLink link = new ExternalLink("link", "#" + file);
+ link.add(new Label("label", name.toUpperCase()).setRenderBodyOnly(true));
+ item.add(link);
+ if (counter == 0) {
+ counter++;
+ item.add(new SimpleAttributeModifier("class", "active"));
+ }
+ }
+ };
+ fragment.add(tabTitles);
+
+ // tab content
+ DataView<MarkupDocument> tabsView = new DataView<MarkupDocument>("tabContent", docDp) {
+ private static final long serialVersionUID = 1L;
+ int counter;
+
+ @Override
+ public void populateItem(final Item<MarkupDocument> item) {
+ MarkupDocument doc = item.getModelObject();
+
+ item.add(new BookmarkablePageLink<Void>("editLink", EditFilePage.class,
+ WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath))
+ .setEnabled(userCanEdit));
+
+ // document page links
+ item.add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
+ WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));
+ item.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
+ WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));
+ String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, commitId, doc.documentPath);
+ item.add(new ExternalLink("rawLink", rawUrl));
+
+ // document content
+ String file = StringUtils.getLastPathElement(doc.documentPath);
+ file = StringUtils.stripFileExtension(file);
+ Component content = new Label("content", doc.html)
+ .setEscapeModelStrings(false);
+ if (!MarkupSyntax.PLAIN.equals(doc.syntax)) {
+ content.add(new SimpleAttributeModifier("class", "markdown"));
+ }
+ item.add(content);
+ item.add(new SimpleAttributeModifier("id", file));
+ if (counter == 0) {
+ counter++;
+ item.add(new SimpleAttributeModifier("class", "tab-pane active"));
+ }
+ }
+ };
+ fragment.add(tabsView);
}
// document list
- final String id = getBestCommitId(head);
final ByteFormat byteFormat = new ByteFormat();
Fragment docs = new Fragment("documents", "documentsFragment", this);
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
@@ -103,18 +154,21 @@
PathModel entry = item.getModelObject();
item.add(WicketUtils.newImage("docIcon", "file_world_16x16.png"));
item.add(new Label("docSize", byteFormat.format(entry.size)));
- item.add(new LinkPanel("docName", "list", entry.name, MarkdownPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ item.add(new LinkPanel("docName", "list", StringUtils.stripFileExtension(entry.name),
+ DocPage.class, WicketUtils.newPathParameter(repositoryName, commitId, entry.path)));
// links
- item.add(new BookmarkablePageLink<Void>("view", MarkdownPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
- item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ item.add(new BookmarkablePageLink<Void>("view", DocPage.class, WicketUtils
+ .newPathParameter(repositoryName, commitId, entry.path)));
+ item.add(new BookmarkablePageLink<Void>("edit", EditFilePage.class, WicketUtils
+ .newPathParameter(repositoryName, commitId, entry.path))
+ .setEnabled(userCanEdit));
+ String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, commitId, entry.path);
+ item.add(new ExternalLink("raw", rawUrl));
item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ .newPathParameter(repositoryName, commitId, entry.path)));
item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ .newPathParameter(repositoryName, commitId, entry.path)));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
@@ -128,4 +182,10 @@
protected String getPageName() {
return getString("gb.docs");
}
+
+ @Override
+ protected boolean isCommitPage() {
+ return true;
+ }
+
}
--
Gitblit v1.9.1