Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Nov 19, 2013
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/gitblit/wicket/GitBlitWebApp.java
View file
Open in desktop
Expand Up @@ -137,6 +137,8 @@ public void init() {
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) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
View file
Open in desktop
Expand Up @@ -153,6 +153,7 @@ public void populateItem(final Item<PathChangeModel> item) {

// 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
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/gitblit/wicket/pages/CommitPage.java
View file
Open in desktop
Expand Up @@ -199,8 +199,11 @@ public void populateItem(final Item<PathChangeModel> item) {
.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))
Expand Down