From 4cec4b102164390540e904685db244ae63f83254 Mon Sep 17 00:00:00 2001 From: kxyfyh Date: Mon, 18 Nov 2013 21:41:04 +0800 Subject: 修改中文显示问题及raw默认属性 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 2 ++ src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java | 1 + src/main/java/com/gitblit/wicket/pages/CommitPage.java | 3 +++ 3 files changed, 6 insertions(+) (limited to 'src/main/java/com/gitblit/wicket') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index 9adbb943..70aa1a6a 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -137,6 +137,8 @@ public class GitBlitWebApp extends WebApplication { mount("/user", UserPage.class, "user"); mount("/forks", ForksPage.class, "r"); mount("/fork", ForkPage.class, "r"); + + getMarkupSettings().setDefaultMarkupEncoding("UTF-8"); } private void mount(String location, Class clazz, String... parameters) { diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java index 0856547f..468fb667 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java @@ -153,6 +153,7 @@ public class CommitDiffPage extends RepositoryPage { // quick links if (entry.isSubmodule()) { + item.add(new ExternalLink("raw", "").setEnabled(false)); // submodule item.add(new ExternalLink("patch", "").setEnabled(false)); item.add(new BookmarkablePageLink("view", CommitPage.class, WicketUtils diff --git a/src/main/java/com/gitblit/wicket/pages/CommitPage.java b/src/main/java/com/gitblit/wicket/pages/CommitPage.java index 8dacdc5a..1772f3af 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitPage.java +++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.java @@ -199,8 +199,11 @@ public class CommitPage extends RepositoryPage { .newPathParameter(repositoryName, entry.commitId, path))); } + // quick links if (entry.isSubmodule()) { + item.add(new ExternalLink("raw", "").setEnabled(false)); + // submodule item.add(new BookmarkablePageLink("diff", BlobDiffPage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) -- cgit v1.2.3