From 718ae7b9f7970ea4475027c8ef91875c0bea5861 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 16:07:04 -0500
Subject: [PATCH] Automatically disable the Git daemon on Express
---
src/main/java/com/gitblit/wicket/pages/DocPage.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/DocPage.java b/src/main/java/com/gitblit/wicket/pages/DocPage.java
index 2c1308a..ab0c462 100644
--- a/src/main/java/com/gitblit/wicket/pages/DocPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocPage.java
@@ -20,7 +20,7 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.eclipse.jgit.lib.Constants;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -31,6 +31,7 @@
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;
@CacheControl(LastModified.BOOT)
@@ -54,7 +55,7 @@
if (StringUtils.isEmpty(markupText)) {
String name = StringUtils.stripFileExtension(path);
- List<String> docExtensions = processor.getMarkupExtensions();
+ List<String> docExtensions = processor.getAllExtensions();
for (String ext : docExtensions) {
String checkName = name + "." + ext;
markupText = JGitUtils.getStringContent(r, commit.getTree(), checkName, encodings);
@@ -66,18 +67,24 @@
}
}
- // document page links
- add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
- WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));
- add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
- WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));
- add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(
- repositoryName, objectId, documentPath)));
- add(new BookmarkablePageLink<Void>("headLink", DocPage.class,
- WicketUtils.newPathParameter(repositoryName, Constants.HEAD, documentPath)));
-
+ Fragment fragment;
MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);
- add(new Label("content", markupDoc.html).setEscapeModelStrings(false));
+ if (MarkupSyntax.PLAIN.equals(markupDoc.syntax)) {
+ fragment = new Fragment("doc", "plainContent", this);
+ } else {
+ fragment = new Fragment("doc", "markupContent", this);
+ }
+
+ // document page links
+ fragment.add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));
+ fragment.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));
+ fragment.add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(
+ repositoryName, objectId, documentPath)));
+
+ fragment.add(new Label("content", markupDoc.html).setEscapeModelStrings(false));
+ add(fragment);
}
@Override
--
Gitblit v1.9.1