From ffbf03175ba1154ba5984d7c473cf1ac4130c043 Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 7 May 2013 00:49:37 -0400 Subject: [PATCH] Uber-cool repository panel overhaul --- build.xml | 6 + src/main/distrib/data/clientapps.json | 42 +++ src/main/java/.gitignore | 1 + src/main/java/com/gitblit/GitBlit.java | 49 +++ src/main/java/com/gitblit/GitFilter.java | 2 +- src/main/java/com/gitblit/PagesFilter.java | 2 +- .../gitblit/models/GitClientApplication.java | 58 ++++ .../gitblit/wicket/GitBlitWebApp.properties | 3 +- .../com/gitblit/wicket/pages/SummaryPage.html | 5 +- .../com/gitblit/wicket/pages/SummaryPage.java | 13 - .../com/gitblit/wicket/panels/BasePanel.java | 14 - .../wicket/panels/RepositoryUrlPanel.html | 56 +++- .../wicket/panels/RepositoryUrlPanel.java | 289 ++++++++++++------ src/main/resources/gitblit.css | 15 +- 14 files changed, 422 insertions(+), 133 deletions(-) create mode 100644 src/main/distrib/data/clientapps.json create mode 100644 src/main/java/.gitignore create mode 100644 src/main/java/com/gitblit/models/GitClientApplication.java diff --git a/build.xml b/build.xml index 485e9813..34f5fe6c 100644 --- a/build.xml +++ b/build.xml @@ -101,6 +101,11 @@ this file is only used for parsing setting descriptions. --> + + + -
+
@@ -22,9 +22,6 @@
[description][repository description]
[owner]
[URL] 
[repository url panel]
-
-
-
diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java index 7588a933..54445f8e 100644 --- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java @@ -55,7 +55,6 @@ import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.BranchesPanel; -import com.gitblit.wicket.panels.DetailedRepositoryUrlPanel; import com.gitblit.wicket.panels.LinkPanel; import com.gitblit.wicket.panels.LogPanel; import com.gitblit.wicket.panels.RepositoryUrlPanel; @@ -152,18 +151,6 @@ public class SummaryPage extends RepositoryPage { add(new RepositoryUrlPanel("repositoryUrlPanel", false, user, model, getLocalizer(), this)); - List otherUrls = GitBlit.self().getOtherCloneUrls(repositoryName, UserModel.ANONYMOUS.equals(user) ? "" : user.username); - ListDataProvider urls = new ListDataProvider(otherUrls); - DataView otherUrlsView = new DataView("otherUrls", urls) { - private static final long serialVersionUID = 1L; - - public void populateItem(final Item item) { - final String url = item.getModelObject(); - item.add(new DetailedRepositoryUrlPanel("otherUrl", getLocalizer(), this, model.name, url)); - } - }; - add(otherUrlsView); - add(new LogPanel("commitsPanel", repositoryName, getRepositoryModel().HEAD, r, numberCommits, 0, getRepositoryModel().showRemoteBranches)); add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs).hideIfEmpty()); add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs, false).hideIfEmpty()); diff --git a/src/main/java/com/gitblit/wicket/panels/BasePanel.java b/src/main/java/com/gitblit/wicket/panels/BasePanel.java index e241a436..9c7cc85f 100644 --- a/src/main/java/com/gitblit/wicket/panels/BasePanel.java +++ b/src/main/java/com/gitblit/wicket/panels/BasePanel.java @@ -22,7 +22,6 @@ import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; -import org.apache.wicket.protocol.http.request.WebClientInfo; import com.gitblit.Constants; import com.gitblit.GitBlit; @@ -59,19 +58,6 @@ public abstract class BasePanel extends Panel { return timeUtils; } - protected boolean isWindows() { - return isPlatform("windows"); - } - - protected boolean isMac() { - return isPlatform("macintosh"); - } - - protected boolean isPlatform(String platform) { - String ua = ((WebClientInfo) GitBlitWebSession.get().getClientInfo()).getUserAgent(); - return ua.toLowerCase().contains(platform); - } - protected void setPersonSearchTooltip(Component component, String value, Constants.SearchType searchType) { if (searchType.equals(Constants.SearchType.AUTHOR)) { WicketUtils.setHtmlTooltip(component, getString("gb.searchForAuthor") + " " + value); diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html index c32d9d88..675ebb58 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html @@ -6,13 +6,53 @@
[repository primary url]
-
- - - - - -
-
[repository git daemon url]
+
+
+ + + + + +
    +
    • +
  • + +
  • + +
    • + +
    • +
+
+
+ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java index e3ab36d1..9640ab00 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java @@ -24,10 +24,13 @@ import org.apache.wicket.Component; import org.apache.wicket.Localizer; import org.apache.wicket.RequestCycle; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.image.ContextImage; +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; import org.apache.wicket.protocol.http.WebRequest; +import org.apache.wicket.protocol.http.request.WebClientInfo; import com.gitblit.Constants; import com.gitblit.Constants.AccessPermission; @@ -35,6 +38,7 @@ import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.SparkleShareInviteServlet; +import com.gitblit.models.GitClientApplication; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.utils.StringUtils; @@ -52,99 +56,174 @@ public class RepositoryUrlPanel extends BasePanel { private static final long serialVersionUID = 1L; - private final String primaryUrl; + private final RepoUrl primaryUrl; public RepositoryUrlPanel(String wicketId, boolean onlyPrimary, UserModel user, - RepositoryModel repository, Localizer localizer, Component owner) { + final RepositoryModel repository, Localizer localizer, Component owner) { super(wicketId); if (user == null) { user = UserModel.ANONYMOUS; } - List repositoryUrls = new ArrayList(); + List repositoryUrls = new ArrayList(); - AccessPermission accessPermission = null; + // http/https url if (GitBlit.getBoolean(Keys.git.enableGitServlet, true)) { - accessPermission = user.getRepositoryPermission(repository).permission; - repositoryUrls.add(getRepositoryUrl(repository)); + AccessPermission permission = user.getRepositoryPermission(repository).permission; + if (permission.exceeds(AccessPermission.NONE)) { + repositoryUrls.add(new RepoUrl(getRepositoryUrl(repository), permission)); + } } - repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repository.name, UserModel.ANONYMOUS.equals(user) ? "" : user.username)); - - primaryUrl = repositoryUrls.size() == 0 ? "" : repositoryUrls.remove(0); - - add(new DetailedRepositoryUrlPanel("repositoryPrimaryUrl", localizer, owner, repository.name, primaryUrl, accessPermission)); - if (!onlyPrimary) { - Component gitDaemonUrlPanel = createGitDaemonUrlPanel("repositoryGitDaemonUrl", user, repository); - if (!StringUtils.isEmpty(primaryUrl) && gitDaemonUrlPanel instanceof DetailedRepositoryUrlPanel) { - WicketUtils.setCssStyle(gitDaemonUrlPanel, "padding-top: 10px"); + // git daemon url + String gitDaemonUrl = getGitDaemonUrl(user, repository); + if (!StringUtils.isEmpty(gitDaemonUrl)) { + AccessPermission permission = getGitDaemonAccessPermission(user, repository); + if (permission.exceeds(AccessPermission.NONE)) { + repositoryUrls.add(new RepoUrl(gitDaemonUrl, permission)); } - add(gitDaemonUrlPanel); - } else { - add(new Label("repositoryGitDaemonUrl").setVisible(false)); } - String cloneWith = localizer.getString("gb.cloneWithApp", owner); - final List cloneLinks = new ArrayList(); - if (user.canClone(repository) && GitBlit.getBoolean(Keys.web.allowAppCloneLinks, true)) { - // universal app clone urls -// cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SmartGit\u2122"), -// MessageFormat.format("smartgit://cloneRepo/{0}", primaryUrl), -// "Syntevo SmartGit\u2122")); + // add all other urls + for (String url : GitBlit.self().getOtherCloneUrls(repository.name, UserModel.ANONYMOUS.equals(user) ? "" : user.username)) { + repositoryUrls.add(new RepoUrl(url, null)); + } + + // grab primary url from the top of the list + primaryUrl = repositoryUrls.size() == 0 ? null : repositoryUrls.get(0); - if (isWindows()) { - // Windows client app clone urls - cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SourceTree\u2122"), - MessageFormat.format("sourcetree://cloneRepo/{0}", primaryUrl), - "Atlassian SourceTree\u2122")); -// cloneLinks.add(new AppCloneLink( -// MessageFormat.format(cloneWith, "GitHub\u2122 for Windows"), -// MessageFormat.format("github-windows://openRepo/{0}", primaryUrl), -// "GitHub\u2122 for Windows")); - } else if (isMac()) { - // Mac client app clone urls - cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SourceTree\u2122"), - MessageFormat.format("sourcetree://cloneRepo/{0}", primaryUrl), - "Atlassian SourceTree\u2122")); - cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "Tower\u2122"), - MessageFormat.format("gittower://openRepo/{0}", primaryUrl), - "fournova Tower\u2122")); -// cloneLinks.add(new AppCloneLink( -// MessageFormat.format(cloneWith, "GitHub\u2122 for Mac"), -// MessageFormat.format("github-mac://openRepo/{0}", primaryUrl), -// "GitHub\u2122 for Mac")); + add(new DetailedRepositoryUrlPanel("repositoryPrimaryUrl", localizer, owner, + repository.name, primaryUrl == null ? "" : primaryUrl.url, + primaryUrl == null ? null : primaryUrl.permission)); + + if (onlyPrimary) { + // only displaying the primary url + add(new Label("urlMenus").setVisible(false)); + return; + } + + final String clonePattern = localizer.getString("gb.cloneUrl", owner); + final String visitSitePattern = localizer.getString("gb.visitSite", owner); + + GitClientApplication URLS = new GitClientApplication(); + URLS.name = "URLs"; + URLS.command = "{0}"; + URLS.attribution = "Repository URLs"; + URLS.isApplication = false; + URLS.isActive = true; + + GitClientApplication GIT = new GitClientApplication(); + GIT.name = "Git"; + GIT.command = "git clone {0}"; + GIT.productUrl = "http://git-scm.org"; + GIT.attribution = "Git Syntax"; + GIT.isApplication = false; + GIT.isActive = true; + + final List clientApps = new ArrayList(); + clientApps.add(URLS); + clientApps.add(GIT); + + final String userAgent = ((WebClientInfo) GitBlitWebSession.get().getClientInfo()).getUserAgent(); + boolean allowAppLinks = GitBlit.getBoolean(Keys.web.allowAppCloneLinks, true); + if (user.canClone(repository)) { + for (GitClientApplication app : GitBlit.self().getClientApplications()) { + if (app.isActive && app.allowsPlatform(userAgent) && (!app.isApplication || (app.isApplication && allowAppLinks))) { + clientApps.add(app); + } } // sparkleshare invite url String sparkleshareUrl = getSparkleShareInviteUrl(user, repository); - if (!StringUtils.isEmpty(sparkleshareUrl)) { - cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SparkleShare\u2122"), - sparkleshareUrl, "SparkleShare\u2122", "icon-star")); + if (!StringUtils.isEmpty(sparkleshareUrl) && allowAppLinks) { + GitClientApplication link = new GitClientApplication(); + link.name = "SparkleShare"; + link.cloneUrl = sparkleshareUrl; + link.attribution = "SparkleShare\u2122"; + link.platforms = new String [] { "windows", "macintosh", "linux" }; + link.productUrl = "http://sparkleshare.org"; + link.isApplication = true; + link.isActive = true; + clientApps.add(link); } } + + final ListDataProvider repoUrls = new ListDataProvider(repositoryUrls); // app clone links - ListDataProvider appLinks = new ListDataProvider(cloneLinks); - DataView appCloneLinks = new DataView("appCloneLink", appLinks) { + ListDataProvider appLinks = new ListDataProvider(clientApps); + DataView urlMenus = new DataView("urlMenus", appLinks) { private static final long serialVersionUID = 1L; - int count; - public void populateItem(final Item item) { - final AppCloneLink appLink = item.getModelObject(); - item.add(new Label("icon", MessageFormat.format("", appLink.icon)).setEscapeModelStrings(false)); - LinkPanel linkPanel = new LinkPanel("link", null, appLink.name, appLink.url); - if (!StringUtils.isEmpty(appLink.tooltip)) { - WicketUtils.setHtmlTooltip(linkPanel, appLink.tooltip); + public void populateItem(final Item item) { + final GitClientApplication cloneLink = item.getModelObject(); + item.add(new Label("productName", cloneLink.name)); + + // a nested repeater for all repo links + DataView repoLinks = new DataView("repoLinks", repoUrls) { + private static final long serialVersionUID = 1L; + + public void populateItem(final Item repoLinkItem) { + RepoUrl repoUrl = repoLinkItem.getModelObject(); + if (!StringUtils.isEmpty(cloneLink.cloneUrl)) { + // custom registered url + Fragment fragment = new Fragment("repoLink", "linkFragment", this); + String name; + if (repoUrl.permission != null) { + name = MessageFormat.format("{0} ({1})", repoUrl.url, repoUrl.permission); + } else { + name = repoUrl.url; + } + String url = MessageFormat.format(cloneLink.cloneUrl, repoUrl); + fragment.add(new LinkPanel("content", null, MessageFormat.format(clonePattern, name), url)); + repoLinkItem.add(fragment); + String tooltip = getProtocolPermissionDescription(repository, repoUrl); + WicketUtils.setHtmlTooltip(fragment, tooltip); + } else if (!StringUtils.isEmpty(cloneLink.command)) { + // command-line + Fragment fragment = new Fragment("repoLink", "commandFragment", this); + WicketUtils.setCssClass(fragment, "repositoryUrlMenuItem"); + String command = MessageFormat.format(cloneLink.command, repoUrl); + fragment.add(new Label("content", command)); + repoLinkItem.add(fragment); + String tooltip = getProtocolPermissionDescription(repository, repoUrl); + WicketUtils.setHtmlTooltip(fragment, tooltip); + + // copy function for command + if (GitBlit.getBoolean(Keys.web.allowFlashCopyToClipboard, true)) { + // clippy: flash-based copy & paste + Fragment copyFragment = new Fragment("copyFunction", "clippyPanel", this); + String baseUrl = WicketUtils.getGitblitURL(getRequest()); + ShockWaveComponent clippy = new ShockWaveComponent("clippy", baseUrl + "/clippy.swf"); + clippy.setValue("flashVars", "text=" + StringUtils.encodeURL(command)); + copyFragment.add(clippy); + fragment.add(copyFragment); + } else { + // javascript: manual copy & paste with modal browser prompt dialog + Fragment copyFragment = new Fragment("copyFunction", "jsPanel", this); + ContextImage img = WicketUtils.newImage("copyIcon", "clippy.png"); + img.add(new JavascriptTextPrompt("onclick", "Copy to Clipboard (Ctrl+C, Enter)", command)); + copyFragment.add(img); + fragment.add(copyFragment); + } + } + }}; + item.add(repoLinks); + + item.add(new Label("productAttribution", cloneLink.attribution)); + if (!StringUtils.isEmpty(cloneLink.productUrl)) { + LinkPanel productlinkPanel = new LinkPanel("productLink", null, + MessageFormat.format(visitSitePattern, cloneLink.name), cloneLink.productUrl, true); + item.add(productlinkPanel); + } else { + item.add(new Label("productLink").setVisible(false)); } - item.add(linkPanel); - item.add(new Label("separator", "|").setVisible(count < (cloneLinks.size() - 1))); - count++; } }; - add(appCloneLinks); + add(urlMenus); } public String getPrimaryUrl() { - return primaryUrl; + return primaryUrl == null ? "" : primaryUrl.url; } protected String getRepositoryUrl(RepositoryModel repository) { @@ -162,7 +241,7 @@ public class RepositoryUrlPanel extends BasePanel { return sb.toString(); } - protected Component createGitDaemonUrlPanel(String wicketId, UserModel user, RepositoryModel repository) { + protected String getGitDaemonUrl(UserModel user, RepositoryModel repository) { int gitDaemonPort = GitBlit.getInteger(Keys.git.daemonPort, 0); if (gitDaemonPort > 0 && user.canClone(repository)) { String servername = ((WebRequest) getRequest()).getHttpServletRequest().getServerName(); @@ -174,7 +253,14 @@ public class RepositoryUrlPanel extends BasePanel { // non-standard port gitDaemonUrl = MessageFormat.format("git://{0}:{1,number,0}/{2}", servername, gitDaemonPort, repository.name); } - + return gitDaemonUrl; + } + return null; + } + + protected AccessPermission getGitDaemonAccessPermission(UserModel user, RepositoryModel repository) { + int gitDaemonPort = GitBlit.getInteger(Keys.git.daemonPort, 0); + if (gitDaemonPort > 0 && user.canClone(repository)) { AccessPermission gitDaemonPermission = user.getRepositoryPermission(repository).permission;; if (gitDaemonPermission.atLeast(AccessPermission.CLONE)) { if (repository.accessRestriction.atLeast(AccessRestrictionType.CLONE)) { @@ -187,18 +273,9 @@ public class RepositoryUrlPanel extends BasePanel { // normal user permission } } - - if (AccessPermission.NONE.equals(gitDaemonPermission)) { - // repository prohibits all anonymous access - return new Label(wicketId).setVisible(false); - } else { - // repository allows some form of anonymous access - return new DetailedRepositoryUrlPanel(wicketId, getLocalizer(), this, repository.name, gitDaemonUrl, gitDaemonPermission); - } - } else { - // git daemon is not running - return new Label(wicketId).setVisible(false); + return gitDaemonPermission; } + return AccessPermission.NONE; } protected String getSparkleShareInviteUrl(UserModel user, RepositoryModel repository) { @@ -223,24 +300,62 @@ public class RepositoryUrlPanel extends BasePanel { return null; } - static class AppCloneLink implements Serializable { + protected String getProtocolPermissionDescription(RepositoryModel repository, RepoUrl repoUrl) { + String protocol = repoUrl.url.substring(0, repoUrl.url.indexOf("://")); + String note; + if (repoUrl.permission == null) { + note = MessageFormat.format(getString("gb.externalPermissions"), protocol, repository.name); + } else { + note = null; + String key; + switch (repoUrl.permission) { + case OWNER: + case REWIND: + key = "gb.rewindPermission"; + break; + case DELETE: + key = "gb.deletePermission"; + break; + case CREATE: + key = "gb.createPermission"; + break; + case PUSH: + key = "gb.pushPermission"; + break; + case CLONE: + key = "gb.clonePermission"; + break; + default: + key = null; + note = getString("gb.viewAccess"); + break; + } + + if (note == null) { + String pattern = getString(key); + String description = MessageFormat.format(pattern, repoUrl.permission.toString()); + String permissionPattern = getString("gb.yourProtocolPermissionIs"); + note = MessageFormat.format(permissionPattern, protocol.toUpperCase(), repository, description); + } + } + return note; + } + + private class RepoUrl implements Serializable { private static final long serialVersionUID = 1L; - final String name; final String url; - final String tooltip; - final String icon; + final AccessPermission permission; - public AppCloneLink(String name, String url, String tooltip) { - this(name, url, tooltip, "icon-download"); + RepoUrl(String url, AccessPermission permission) { + this.url = url; + this.permission = permission; } - public AppCloneLink(String name, String url, String tooltip, String icon) { - this.name = name; - this.url = url; - this.tooltip = tooltip; - this.icon = icon; + @Override + public String toString() { + return url; } } } diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index c93f6a69..c22793d7 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -181,9 +181,9 @@ navbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.navbar d span.repositoryUrlContainer { color: black; - background-color: #eee; + background-color: whiteSmoke; padding: 4px; - border: 1px solid #ccc; + border: 1px solid #ddd; border-radius: 3px } @@ -199,8 +199,15 @@ span.repositoryUrl { padding: 4px; color: blue; background-color: #fff; - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; +} + +span.repositoryUrlMenuItem { + line-height: 24px; + padding: 3px 15px; + font-size: 0.85em; + font-family: menlo,consolas,monospace; } div.odd { -- 2.39.5