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/TreePage.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java
index 082a72c..e24033e 100644
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/com/gitblit/wicket/pages/TreePage.java
@@ -4,6 +4,8 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -17,8 +19,6 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.PathModel;
import com.gitblit.wicket.panels.PathBreadcrumbsPanel;
-import com.gitblit.wicket.panels.TreeBlobLinksPanel;
-import com.gitblit.wicket.panels.TreeLinksPanel;
public class TreePage extends RepositoryPage {
@@ -29,19 +29,19 @@
final String basePath = params.getString("f", null);
Repository r = getRepository();
- RevCommit commit = JGitUtils.getCommit(r, commitId);
+ RevCommit commit = JGitUtils.getCommit(r, objectId);
List<PathModel> paths = JGitUtils.getFilesInPath(r, basePath, commit);
// tree page links
- add(new Label("historyLink", "history"));
+ add(new Label("historyLink", getString("gb.history")));
add(new Label("headLink", "HEAD"));
add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
// breadcrumbs
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, commitId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, objectId));
if (basePath != null && basePath.trim().length() > 0) {
- paths.add(0, PathModel.getParentPath(basePath, commitId));
+ paths.add(0, PathModel.getParentPath(basePath, objectId));
}
final ByteFormat byteFormat = new ByteFormat();
@@ -59,33 +59,40 @@
// parent .. path
item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));
- item.add(new Label("treeLinks", ""));
+ item.add(new Label("pathLinks", ""));
} else {
if (entry.isTree()) {
// folder/tree link
item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));
- item.add(new TreeLinksPanel("treeLinks", repositoryName, entry));
+
+ // links
+ Fragment links = new Fragment("pathLinks", "treeLinks", this);
+ links.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
+ links.add(new BookmarkablePageLink<Void>("history", TreePage.class).setEnabled(false));
+ item.add(links);
} else {
// blob link
item.add(new Label("pathSize", byteFormat.format(entry.size)));
item.add(new LinkPanel("pathName", "list", entry.name, BlobPage.class, newPathParameter(entry.path)));
- item.add(new TreeBlobLinksPanel("treeLinks", repositoryName, entry));
+
+ // links
+ Fragment links = new Fragment("pathLinks", "blobLinks", this);
+ links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
+ links.add(new BookmarkablePageLink<Void>("raw", BlobPage.class).setEnabled(false));
+ links.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));
+ item.add(links);
}
}
- String clazz = counter % 2 == 0 ? "dark" : "light";
- WicketUtils.setCssClass(item, clazz);
+ WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
};
add(pathsView);
-
- // footer
- addFooter();
}
@Override
protected String getPageName() {
- return "tree";
+ return getString("gb.tree");
}
}
--
Gitblit v1.9.1