diff options
| author | kxyfyh <kxyfyh@vip.qq.com> | 2013-11-18 21:41:04 +0800 |
|---|---|---|
| committer | kxyfyh <kxyfyh@vip.qq.com> | 2013-11-18 21:41:04 +0800 |
| commit | 4cec4b102164390540e904685db244ae63f83254 (patch) | |
| tree | 0b8720858274efdc4af53222c31b91db387ddeb8 /src/main/java | |
| parent | a5c69b6b7070c7cac977f2e837e81a17a208b3d5 (diff) | |
| download | gitblit-4cec4b102164390540e904685db244ae63f83254.tar.gz gitblit-4cec4b102164390540e904685db244ae63f83254.zip | |
修改中文显示问题及raw默认属性
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/CommitPage.java | 3 |
3 files changed, 6 insertions, 0 deletions
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<? extends WebPage> 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<Void>("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<Void>("diff", BlobDiffPage.class, WicketUtils
.newPathParameter(repositoryName, entry.commitId, entry.path))
|