From 8a71a13f23e6352e8a50e500401959ca90eaf8dc 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] Improve doc page formatting
---
src/main/java/com/gitblit/wicket/pages/DocPage.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/DocPage.java b/src/main/java/com/gitblit/wicket/pages/DocPage.java
index a0bdb99..ab0c462 100644
--- a/src/main/java/com/gitblit/wicket/pages/DocPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocPage.java
@@ -20,6 +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.apache.wicket.markup.html.panel.Fragment;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -30,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)
@@ -65,16 +67,24 @@
}
}
+ Fragment fragment;
+ MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);
+ if (MarkupSyntax.PLAIN.equals(markupDoc.syntax)) {
+ fragment = new Fragment("doc", "plainContent", this);
+ } else {
+ fragment = new Fragment("doc", "markupContent", this);
+ }
+
// document page links
- add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
+ fragment.add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));
- add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
+ fragment.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));
- add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(
+ fragment.add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(
repositoryName, objectId, documentPath)));
- MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);
- add(new Label("content", markupDoc.html).setEscapeModelStrings(false));
+ fragment.add(new Label("content", markupDoc.html).setEscapeModelStrings(false));
+ add(fragment);
}
@Override
--
Gitblit v1.9.1