From 6c5511020457c39961d069071ac60f7140ec724f Mon Sep 17 00:00:00 2001 From: Lukasz Jader <ljaderdev@gmail.com> Date: Wed, 19 Sep 2012 16:24:10 -0400 Subject: [PATCH] Update polish translation of EmptyRepositoryPage --- src/com/gitblit/wicket/pages/TreePage.java | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java index 8695621..973634b 100644 --- a/src/com/gitblit/wicket/pages/TreePage.java +++ b/src/com/gitblit/wicket/pages/TreePage.java @@ -34,6 +34,7 @@ import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.PathModel; +import com.gitblit.models.SubmoduleModel; import com.gitblit.utils.ByteFormat; import com.gitblit.utils.JGitUtils; import com.gitblit.wicket.WicketUtils; @@ -71,12 +72,14 @@ if (path.lastIndexOf('/') > -1) { parentPath = path.substring(0, path.lastIndexOf('/')); } - PathModel model = new PathModel("..", parentPath, 0, FileMode.TREE.getBits(), objectId); + PathModel model = new PathModel("..", parentPath, 0, FileMode.TREE.getBits(), null, objectId); model.isParentPath = true; paths.add(0, model); } final ByteFormat byteFormat = new ByteFormat(); + + final String baseUrl = WicketUtils.getGitblitURL(getRequest()); // changed paths list ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths); @@ -112,11 +115,38 @@ links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path))); - links.add(new ExternalLink("zip", DownloadZipServlet.asLink(getRequest() - .getRelativePathPrefixToContextRoot(), repositoryName, objectId, - entry.path)).setVisible(GitBlit.getBoolean( - Keys.web.allowZipDownloads, true))); + links.add(new ExternalLink("zip", DownloadZipServlet.asLink(baseUrl, + repositoryName, objectId, entry.path)).setVisible(GitBlit + .getBoolean(Keys.web.allowZipDownloads, true))); item.add(links); + } else if (entry.isSubmodule()) { + // submodule + String submoduleId = entry.objectId; + String submodulePath; + boolean hasSubmodule = false; + SubmoduleModel submodule = getSubmodule(entry.path); + submodulePath = submodule.gitblitPath; + hasSubmodule = submodule.hasSubmodule; + + item.add(WicketUtils.newImage("pathIcon", "git-orange-16x16.png")); + item.add(new Label("pathSize", "")); + item.add(new LinkPanel("pathName", "list", entry.name + " @ " + + getShortObjectId(submoduleId), TreePage.class, + WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule)); + + Fragment links = new Fragment("pathLinks", "submoduleLinks", this); + links.add(new BookmarkablePageLink<Void>("view", SummaryPage.class, + WicketUtils.newRepositoryParameter(submodulePath)).setEnabled(hasSubmodule)); + links.add(new BookmarkablePageLink<Void>("tree", TreePage.class, + WicketUtils.newPathParameter(submodulePath, submoduleId, + "")).setEnabled(hasSubmodule)); + links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, + WicketUtils.newPathParameter(submodulePath, submoduleId, + "")).setEnabled(hasSubmodule)); + links.add(new ExternalLink("zip", DownloadZipServlet.asLink(baseUrl, + submodulePath, submoduleId, "")).setVisible(GitBlit + .getBoolean(Keys.web.allowZipDownloads, true)).setEnabled(hasSubmodule)); + item.add(links); } else { // blob link item.add(WicketUtils.getFileImage("pathIcon", entry.name)); -- Gitblit v1.9.1