From 50984c55466228ccff0630e49acb4c5e271d446b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 11 Apr 2011 09:59:03 -0400
Subject: [PATCH] Moved paging count to setting. Fixed css layouts. Removed log pager.
---
src/com/gitblit/wicket/pages/DiffPage.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/DiffPage.java b/src/com/gitblit/wicket/pages/DiffPage.java
index 05500f8..1e6065b 100644
--- a/src/com/gitblit/wicket/pages/DiffPage.java
+++ b/src/com/gitblit/wicket/pages/DiffPage.java
@@ -13,12 +13,12 @@
public class DiffPage extends RepositoryPage {
public DiffPage(PageParameters params) {
- super(params, "diff");
+ super(params);
final String blobPath = params.getString("f", null);
Repository r = getRepository();
- RevCommit commit = JGitUtils.getCommit(r, commitId);
+ RevCommit commit = JGitUtils.getCommit(r, objectId);
String diff;
if (blobPath != null && blobPath.length() > 0) {
// blob diff
@@ -27,20 +27,21 @@
// commit diff
diff = JGitUtils.getCommitDiff(r, commit, true);
}
- r.close();
// diff page links
- add(new Label("historyLink", "history"));
- add(new Label("rawLink", "raw"));
+ add(new Label("historyLink", getString("gb.history")));
+ add(new Label("rawLink", getString("gb.raw")));
add(new Label("headLink", "HEAD"));
add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, commitId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));
add(new Label("diffText", diff).setEscapeModelStrings(false));
-
- // footer
- addFooter();
+ }
+
+ @Override
+ protected String getPageName() {
+ return getString("gb.diff");
}
}
--
Gitblit v1.9.1