From 9ab5cc754c62ac9f7aa58b1f64fda7532cdad05b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 15:53:19 -0400
Subject: [PATCH] Html and Css simplifications.
---
src/com/gitblit/wicket/pages/BlobPage.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index 979bb26..0c112d0 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -6,6 +6,8 @@
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -20,21 +22,22 @@
public class BlobPage extends RepositoryPage {
public BlobPage(PageParameters params) {
- super(params, "blob");
+ super(params);
- final String blobPath = params.getString("f", null);
+ final String blobPath = WicketUtils.getPath(params);
Repository r = getRepository();
- RevCommit commit = JGitUtils.getCommit(r, commitId);
+ RevCommit commit = JGitUtils.getCommit(r, objectId);
// blob page links
- add(new Label("historyLink", "history"));
- add(new Label("rawLink", "raw"));
- add(new Label("headLink", "HEAD"));
+ add(new Label("blameLink", getString("gb.blame")));
+ add(new Label("historyLink", getString("gb.history")));
+ add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
+ add(new BookmarkablePageLink<Void>("headLink", BlobPage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));
add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, commitId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));
String extension = null;
if (blobPath.lastIndexOf('.') > -1) {
extension = blobPath.substring(blobPath.lastIndexOf('.') + 1);
@@ -84,11 +87,10 @@
WicketUtils.setCssClass(blobLabel, "plainprint");
add(blobLabel);
}
-
- // close repository
- r.close();
-
- // footer
- addFooter();
+ }
+
+ @Override
+ protected String getPageName() {
+ return getString("gb.view");
}
}
--
Gitblit v1.9.1