修改中文显示问题及raw默认属性

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
index 9adbb94342a16b0195ddaddd161d0fcf74487985..70aa1a6a7174ccd5a893e9d64159d7f1409279a7 100644 (file)
--- 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");\r
                mount("/forks", ForksPage.class, "r");\r
                mount("/fork", ForkPage.class, "r");\r
+               \r
+               getMarkupSettings().setDefaultMarkupEncoding("UTF-8");\r
        }\r
 \r
        private void mount(String location, Class<? extends WebPage> clazz, String... parameters) {\r

diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
index 0856547ff34d0a4921a2e4d08b70160544538859..468fb667dcd01b7f5d028b5318aae018d5296e10 100644 (file)
--- 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 8dacdc5a83611c5077d0c5baaebb636c25b68074..1772f3af6a0cd82540de1614d3943c638314b7af 100644 (file)
--- 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)));\r
                                }\r
 \r
+                               \r
                                // quick links\r
                                if (entry.isSubmodule()) {\r
+                                       item.add(new ExternalLink("raw", "").setEnabled(false));\r
+                                       \r
                                        // submodule\r
                                        item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils\r
                                                        .newPathParameter(repositoryName, entry.commitId, entry.path))\r