From a31cf95ac0787eb559cb78f48c52bc6b79e970d8 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 11 Jul 2012 17:10:42 -0400 Subject: [PATCH] Forgot to commit UserModel with cookie field --- src/com/gitblit/wicket/pages/MarkdownPage.java | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.java b/src/com/gitblit/wicket/pages/MarkdownPage.java index 64d3ce3..5764235 100644 --- a/src/com/gitblit/wicket/pages/MarkdownPage.java +++ b/src/com/gitblit/wicket/pages/MarkdownPage.java @@ -1,3 +1,18 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gitblit.wicket.pages; import java.text.ParseException; @@ -9,13 +24,13 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.GitBlit; import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.StringUtils; -import com.gitblit.wicket.RepositoryPage; +import com.gitblit.utils.MarkdownUtils; import com.gitblit.wicket.WicketUtils; public class MarkdownPage extends RepositoryPage { - + public MarkdownPage(PageParameters params) { super(params); @@ -23,23 +38,28 @@ Repository r = getRepository(); RevCommit commit = JGitUtils.getCommit(r, objectId); - + String [] encodings = GitBlit.getEncodings(); + // markdown page links - add(new Label("blameLink", getString("gb.blame"))); - add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, markdownPath))); - add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, markdownPath))); - add(new BookmarkablePageLink<Void>("headLink", MarkdownPage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, markdownPath))); + add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class, + WicketUtils.newPathParameter(repositoryName, objectId, markdownPath))); + add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, + WicketUtils.newPathParameter(repositoryName, objectId, markdownPath))); + add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter( + repositoryName, objectId, markdownPath))); + add(new BookmarkablePageLink<Void>("headLink", MarkdownPage.class, + WicketUtils.newPathParameter(repositoryName, Constants.HEAD, markdownPath))); - // Read raw markdown content and transform it to html - String markdownText = JGitUtils.getRawContentAsString(r, commit, markdownPath); + // Read raw markdown content and transform it to html + String markdownText = JGitUtils.getStringContent(r, commit.getTree(), markdownPath, encodings); String htmlText; try { - htmlText = StringUtils.transformMarkdown(markdownText); + htmlText = MarkdownUtils.transformMarkdown(markdownText); } catch (ParseException p) { error(p.getMessage()); htmlText = markdownText; } - + // Add the html to the page add(new Label("markdownText", htmlText).setEscapeModelStrings(false)); } -- Gitblit v1.9.1