From fd6ac68c0b1136182b5d713ec88ea94e26c4a76d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 29 Sep 2011 23:47:13 -0400 Subject: [PATCH] Adjusted Metric chart widths. Diff hunk header css tweak. --- src/com/gitblit/wicket/pages/CommitDiffPage.java | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.java b/src/com/gitblit/wicket/pages/CommitDiffPage.java index 1f492ac..c6c9fd7 100644 --- a/src/com/gitblit/wicket/pages/CommitDiffPage.java +++ b/src/com/gitblit/wicket/pages/CommitDiffPage.java @@ -24,6 +24,7 @@ import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; +import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -31,8 +32,8 @@ import com.gitblit.Keys; import com.gitblit.models.PathModel.PathChangeModel; import com.gitblit.utils.DiffUtils; +import com.gitblit.utils.DiffUtils.DiffOutputType; import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.JGitUtils.DiffOutputType; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.CommitHeaderPanel; import com.gitblit.wicket.panels.CommitLegendPanel; @@ -87,19 +88,23 @@ if (entry.isTree()) { item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, - newPathParameter(entry.path))); + WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); } else { item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, - newPathParameter(entry.path))); + WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); } - item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, - newPathParameter(entry.path))); - item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, - newPathParameter(entry.path))); - item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false)); - item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, - newPathParameter(entry.path))); + item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.ADD))); WicketUtils.setAlternatingBackground(item, counter); counter++; -- Gitblit v1.9.1