gb.owners = owners\r
gb.sessionEnded = Session has been closed\r
gb.closeBrowser = Please close the browser to properly end the session.\r
-gb.doesNotExistInTree = {0} does not exist in tree {1}
+gb.doesNotExistInTree = {0} does not exist in tree {1}\r
gb.enableIncrementalPushTags = enable incremental push tags\r
gb.useIncrementalPushTagsDescription = on push, automatically tag each branch tip with an incremental revision number\r
-gb.incrementalPushTagMessage = Auto-tagged [{0}] branch on push
\ No newline at end of file
+gb.incrementalPushTagMessage = Auto-tagged [{0}] branch on push\r
+gb.externalPermissions = {0} access permissions for {1} are externally maintained\r
+gb.viewAccess = You do not have Gitblit read or write access\r
+gb.yourProtocolPermissionIs = Your {0} access permission for {1} is {2}
\ No newline at end of file
import javax.servlet.http.HttpServletRequest;\r
\r
import org.apache.wicket.Application;\r
+import org.apache.wicket.Component;\r
import org.apache.wicket.MarkupContainer;\r
import org.apache.wicket.PageParameters;\r
import org.apache.wicket.RedirectToUrlException;\r
import org.apache.wicket.markup.html.panel.FeedbackPanel;\r
import org.apache.wicket.markup.html.panel.Fragment;\r
import org.apache.wicket.protocol.http.RequestUtils;\r
+import org.apache.wicket.protocol.http.WebRequest;\r
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
import com.gitblit.utils.TimeUtils;\r
import com.gitblit.wicket.GitBlitWebSession;\r
import com.gitblit.wicket.WicketUtils;\r
+import com.gitblit.wicket.panels.DetailedRepositoryUrlPanel;\r
import com.gitblit.wicket.panels.LinkPanel;\r
\r
public abstract class BasePage extends SessionPage {\r
return sb.toString();\r
}\r
\r
+ protected Component createGitDaemonUrlPanel(String wicketId, UserModel user, RepositoryModel repository) {\r
+ int gitDaemonPort = GitBlit.getInteger(Keys.git.daemonPort, 0);\r
+ if (gitDaemonPort > 0 && user.canClone(repository)) {\r
+ String servername = ((WebRequest) getRequest()).getHttpServletRequest().getServerName();\r
+ String gitDaemonUrl;\r
+ if (gitDaemonPort == 9418) {\r
+ // standard port\r
+ gitDaemonUrl = MessageFormat.format("git://{0}/{1}", servername, repository.name);\r
+ } else {\r
+ // non-standard port\r
+ gitDaemonUrl = MessageFormat.format("git://{0}:{1,number,0}/{2}", servername, gitDaemonPort, repository.name);\r
+ }\r
+ \r
+ AccessPermission gitDaemonPermission = user.getRepositoryPermission(repository).permission;;\r
+ if (gitDaemonPermission.atLeast(AccessPermission.CLONE)) {\r
+ if (repository.accessRestriction.atLeast(AccessRestrictionType.CLONE)) {\r
+ // can not authenticate clone via anonymous git protocol\r
+ gitDaemonPermission = AccessPermission.NONE;\r
+ } else if (repository.accessRestriction.atLeast(AccessRestrictionType.PUSH)) {\r
+ // can not authenticate push via anonymous git protocol\r
+ gitDaemonPermission = AccessPermission.CLONE;\r
+ } else {\r
+ // normal user permission\r
+ }\r
+ }\r
+ \r
+ if (AccessPermission.NONE.equals(gitDaemonPermission)) {\r
+ // repository prohibits all anonymous access\r
+ return new Label(wicketId).setVisible(false);\r
+ } else {\r
+ // repository allows some form of anonymous access\r
+ return new DetailedRepositoryUrlPanel(wicketId, getLocalizer(), this, repository.name, gitDaemonUrl, gitDaemonPermission);\r
+ }\r
+ } else {\r
+ // git daemon is not running\r
+ return new Label(wicketId).setVisible(false);\r
+ }\r
+ }\r
+ \r
protected List<ProjectModel> getProjectModels() {\r
final UserModel user = GitBlitWebSession.get().getUser();\r
List<ProjectModel> projects = GitBlit.self().getProjectModels(user, true);\r
import org.apache.wicket.PageParameters;\r
import org.apache.wicket.markup.html.basic.Label;\r
\r
+import com.gitblit.Constants.AccessPermission;\r
import com.gitblit.GitBlit;\r
import com.gitblit.Keys;\r
import com.gitblit.models.RepositoryModel;\r
import com.gitblit.wicket.GitBlitWebSession;\r
import com.gitblit.wicket.GitblitRedirectException;\r
import com.gitblit.wicket.WicketUtils;\r
-import com.gitblit.wicket.panels.RepositoryUrlPanel;\r
+import com.gitblit.wicket.panels.DetailedRepositoryUrlPanel;\r
\r
public class EmptyRepositoryPage extends RootPage {\r
\r
repositoryUrls.add(getRepositoryUrl(repository));\r
}\r
UserModel user = GitBlitWebSession.get().getUser();\r
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName, user == null ? "" : user.username));\r
+ if (user == null) {\r
+ user = UserModel.ANONYMOUS;\r
+ }\r
+ repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName, UserModel.ANONYMOUS.equals(user) ? "" : user.username));\r
\r
String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.get(0);\r
+ AccessPermission accessPermission = user.getRepositoryPermission(repository).permission;\r
+ \r
add(new Label("repository", repositoryName));\r
- add(new RepositoryUrlPanel("pushurl", primaryUrl));\r
+ add(new DetailedRepositoryUrlPanel("pushurl", getLocalizer(), this, repository.name, primaryUrl, accessPermission));\r
add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", repositoryUrls.get(0))));\r
add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", primaryUrl)));\r
}\r
</div>\r
</div>\r
<div class="row">\r
- <div class="span6" style="border-bottom:1px solid #eee;" wicket:id="repositoryList">\r
+ <div class="span6" wicket:id="repositoryList">\r
<span wicket:id="repository"></span>\r
</div>\r
</div> \r
<tr><th><wicket:message key="gb.owners">[owner]</wicket:message></th><td><span wicket:id="repositoryOwners"><span wicket:id="owner"></span><span wicket:id="comma"></span></span></td></tr>\r
<tr><th><wicket:message key="gb.lastChange">[last change]</wicket:message></th><td><span wicket:id="repositoryLastChange">[repository last change]</span></td></tr>\r
<tr><th><wicket:message key="gb.stats">[stats]</wicket:message></th><td><span wicket:id="branchStats">[branch stats]</span> <span class="link"><a wicket:id="metrics"><wicket:message key="gb.metrics">[metrics]</wicket:message></a></span></td></tr>\r
- <tr><th style="vertical-align:top;"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message> <img style="vertical-align: top;padding-left:3px;" wicket:id="accessRestrictionIcon" /></th><td><span wicket:id="repositoryCloneUrl">[repository clone url]</span><div wicket:id="otherUrls"></div></td></tr>\r
+ <tr><th style="vertical-align:top;padding-top:4px;"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message> <img style="vertical-align: top;padding-left:3px;" wicket:id="accessRestrictionIcon" /></th>\r
+ <td style="padding-top:4px;">\r
+ <div wicket:id="repositoryPrimaryUrl">[repository primary url]</div>\r
+ <div wicket:id="repositoryGitDaemonUrl">[repository git daemon url]</div>\r
+ <div wicket:id="otherUrls" >\r
+ <div wicket:id="otherUrl" style="padding-top:10px"></div>\r
+ </div>\r
+ </td>\r
+ </tr>\r
</table>\r
</div>\r
</div>\r
import org.wicketstuff.googlecharts.MarkerType;\r
import org.wicketstuff.googlecharts.ShapeMarker;\r
\r
+import com.gitblit.Constants.AccessPermission;\r
import com.gitblit.Constants.AccessRestrictionType;\r
import com.gitblit.GitBlit;\r
import com.gitblit.Keys;\r
import com.gitblit.wicket.GitBlitWebSession;\r
import com.gitblit.wicket.WicketUtils;\r
import com.gitblit.wicket.panels.BranchesPanel;\r
+import com.gitblit.wicket.panels.DetailedRepositoryUrlPanel;\r
import com.gitblit.wicket.panels.LinkPanel;\r
import com.gitblit.wicket.panels.LogPanel;\r
-import com.gitblit.wicket.panels.RepositoryUrlPanel;\r
import com.gitblit.wicket.panels.TagsPanel;\r
\r
public class SummaryPage extends RepositoryPage {\r
int numberRefs = GitBlit.getInteger(Keys.web.summaryRefsCount, 5);\r
\r
Repository r = getRepository();\r
- RepositoryModel model = getRepositoryModel();\r
+ final RepositoryModel model = getRepositoryModel();\r
UserModel user = GitBlitWebSession.get().getUser();\r
+ if (user == null) {\r
+ user = UserModel.ANONYMOUS;\r
+ }\r
\r
List<Metric> metrics = null;\r
Metric metricsTotal = null;\r
\r
List<String> repositoryUrls = new ArrayList<String>();\r
\r
- if (GitBlit.getBoolean(Keys.git.enableGitServlet, true)) {\r
+ AccessPermission accessPermission = null;\r
+ if (GitBlit.getBoolean(Keys.git.enableGitServlet, true)) { \r
+ accessPermission = user.getRepositoryPermission(model).permission;\r
AccessRestrictionType accessRestriction = getRepositoryModel().accessRestriction;\r
switch (accessRestriction) {\r
case NONE:\r
} else {\r
add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));\r
}\r
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName, user == null ? "" : user.username));\r
+ repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName, UserModel.ANONYMOUS.equals(user) ? "" : user.username));\r
\r
String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.remove(0);\r
- add(new RepositoryUrlPanel("repositoryCloneUrl", primaryUrl));\r
+ add(new DetailedRepositoryUrlPanel("repositoryPrimaryUrl", getLocalizer(), this, model.name, primaryUrl, accessPermission));\r
+\r
+ Component gitDaemonUrlPanel = createGitDaemonUrlPanel("repositoryGitDaemonUrl", user, model);\r
+ if (!StringUtils.isEmpty(primaryUrl) && gitDaemonUrlPanel instanceof DetailedRepositoryUrlPanel) {\r
+ WicketUtils.setCssStyle(gitDaemonUrlPanel, "padding-top: 10px");\r
+ }\r
+ add(gitDaemonUrlPanel);\r
+ \r
+ ListDataProvider<String> urls = new ListDataProvider<String>(repositoryUrls);\r
+ DataView<String> otherUrlsView = new DataView<String>("otherUrls", urls) {\r
+ private static final long serialVersionUID = 1L;\r
\r
- add(new Label("otherUrls", StringUtils.flattenStrings(repositoryUrls, "<br/>"))\r
- .setEscapeModelStrings(false));\r
+ public void populateItem(final Item<String> item) {\r
+ final String url = item.getModelObject();\r
+ item.add(new DetailedRepositoryUrlPanel("otherUrl", getLocalizer(), this, model.name, url));\r
+ }\r
+ };\r
+ add(otherUrlsView);\r
\r
add(new LogPanel("commitsPanel", repositoryName, getRepositoryModel().HEAD, r, numberCommits, 0, getRepositoryModel().showRemoteBranches));\r
add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs).hideIfEmpty());\r
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" \r
+ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" \r
+ xml:lang="en" \r
+ lang="en"> \r
+\r
+<wicket:panel>\r
+ <span wicket:id="urlPanel"></span>\r
+ \r
+ <!-- Repository url panel -->\r
+ <wicket:fragment wicket:id="repositoryUrlPanel">\r
+ <span class="repositoryUrlContainer">\r
+ <span wicket:id="repositoryProtocol" class="repositoryUrlEndCap">[protocol]</span>\r
+ <span class="repositoryUrl">\r
+ <span wicket:id="repositoryUrl">[repository url]</span>\r
+ <span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>\r
+ </span>\r
+ <span class="hidden-phone hidden-tablet repositoryUrlEndCap" wicket:id="repositoryUrlPermission">[repository url permission]</span>\r
+ </span>\r
+ </wicket:fragment>\r
+ \r
+ <!-- Plain JavaScript manual copy & paste -->\r
+ <wicket:fragment wicket:id="jsPanel">\r
+ <span style="vertical-align:baseline;">\r
+ <img wicket:id="copyIcon" wicket:message="title:gb.copyToClipboard"></img>\r
+ </span>\r
+ </wicket:fragment>\r
+ \r
+ <!-- flash-based button-press copy & paste -->\r
+ <wicket:fragment wicket:id="clippyPanel">\r
+ <object wicket:message="title:gb.copyToClipboard" style="vertical-align:middle;"\r
+ wicket:id="clippy"\r
+ width="14" \r
+ height="14"\r
+ bgcolor="#ffffff" \r
+ quality="high"\r
+ wmode="transparent"\r
+ scale="noscale"\r
+ allowScriptAccess="always"></object>\r
+ </wicket:fragment>\r
+</wicket:panel>\r
+</html>
\ No newline at end of file
--- /dev/null
+/*\r
+ * Copyright 2013 gitblit.com.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+package com.gitblit.wicket.panels;\r
+\r
+import java.text.MessageFormat;\r
+\r
+import org.apache.wicket.Component;\r
+import org.apache.wicket.Localizer;\r
+import org.apache.wicket.markup.html.basic.Label;\r
+import org.apache.wicket.markup.html.image.ContextImage;\r
+import org.apache.wicket.markup.html.panel.Fragment;\r
+\r
+import com.gitblit.Constants.AccessPermission;\r
+import com.gitblit.GitBlit;\r
+import com.gitblit.Keys;\r
+import com.gitblit.utils.StringUtils;\r
+import com.gitblit.wicket.WicketUtils;\r
+\r
+public class DetailedRepositoryUrlPanel extends BasePanel {\r
+\r
+ private static final long serialVersionUID = 1L;\r
+ public DetailedRepositoryUrlPanel(String wicketId, Localizer localizer, Component parent, String repository, String url) {\r
+ this(wicketId, localizer, parent, repository, url, null);\r
+ }\r
+ \r
+ public DetailedRepositoryUrlPanel(String wicketId, Localizer localizer, Component parent, String repository, String url, AccessPermission ap) {\r
+ super(wicketId);\r
+ \r
+ String protocol = url.substring(0, url.indexOf(':'));\r
+ String note;\r
+ String permission;\r
+ \r
+ if (ap == null) {\r
+ note = MessageFormat.format(localizer.getString("gb.externalPermissions", parent), protocol, repository);\r
+ permission = "";\r
+ } else {\r
+ note = null;\r
+ permission = ap.toString();\r
+ String key;\r
+ switch (ap) {\r
+ case OWNER:\r
+ case REWIND:\r
+ key = "gb.rewindPermission";\r
+ break;\r
+ case DELETE:\r
+ key = "gb.deletePermission";\r
+ break;\r
+ case CREATE:\r
+ key = "gb.createPermission";\r
+ break;\r
+ case PUSH:\r
+ key = "gb.pushPermission";\r
+ break;\r
+ case CLONE:\r
+ key = "gb.clonePermission";\r
+ break;\r
+ default:\r
+ key = null;\r
+ note = localizer.getString("gb.viewAccess", parent);\r
+ break;\r
+ }\r
+ \r
+ if (note == null) {\r
+ String pattern = localizer.getString(key, parent);\r
+ String description = MessageFormat.format(pattern, permission);\r
+ String permissionPattern = localizer.getString("gb.yourProtocolPermissionIs", parent);\r
+ note = MessageFormat.format(permissionPattern, protocol.toUpperCase(), repository, description);\r
+ }\r
+ }\r
+ \r
+ if (!StringUtils.isEmpty(url) && ((ap == null) || ap.atLeast(AccessPermission.CLONE))) {\r
+ // valid repository url\r
+ Fragment fragment = new Fragment("urlPanel", "repositoryUrlPanel", this);\r
+ add(fragment);\r
+ fragment.add(WicketUtils.setHtmlTooltip(new Label("repositoryProtocol", protocol + "://"), note));\r
+ fragment.add(new Label("repositoryUrl", url.substring(url.indexOf("://") + 3)));\r
+ fragment.add(WicketUtils.setHtmlTooltip(new Label("repositoryUrlPermission", permission), note));\r
+\r
+ if (StringUtils.isEmpty(url)) {\r
+ fragment.add(new Label("copyFunction").setVisible(false));\r
+ } else if (GitBlit.getBoolean(Keys.web.allowFlashCopyToClipboard, true)) {\r
+ // clippy: flash-based copy & paste\r
+ Fragment copyFragment = new Fragment("copyFunction", "clippyPanel", this);\r
+ String baseUrl = WicketUtils.getGitblitURL(getRequest());\r
+ ShockWaveComponent clippy = new ShockWaveComponent("clippy", baseUrl + "/clippy.swf");\r
+ clippy.setValue("flashVars", "text=" + StringUtils.encodeURL(url));\r
+ copyFragment.add(clippy);\r
+ fragment.add(copyFragment);\r
+ } else {\r
+ // javascript: manual copy & paste with modal browser prompt dialog\r
+ Fragment copyFragment = new Fragment("copyFunction", "jsPanel", this);\r
+ ContextImage img = WicketUtils.newImage("copyIcon", "clippy.png");\r
+ img.add(new JavascriptTextPrompt("onclick", "Copy to Clipboard (Ctrl+C, Enter)", url));\r
+ copyFragment.add(img);\r
+ fragment.add(copyFragment);\r
+ }\r
+ } else {\r
+ // no Git url, there may be a message\r
+ add(new Label("urlPanel", MessageFormat.format("<i>{0}</i>", note)).setEscapeModelStrings(false).setVisible(!StringUtils.isEmpty(note)));\r
+ }\r
+ }\r
+}\r
<span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span>\r
</div>\r
\r
- <div class="hidden-phone hidden-tablet" wicket:id="repositoryCloneUrl">[repository clone url]</div>\r
+ <div class="hidden-phone hidden-tablet" style="padding-top: 5px;" wicket:id="repositoryPrimaryUrl">[repository primary url]</div>\r
</div>\r
</div>\r
</div>\r
import org.apache.wicket.markup.html.link.Link;\r
import org.apache.wicket.markup.html.panel.Fragment;\r
\r
+import com.gitblit.Constants.AccessPermission;\r
import com.gitblit.Constants.AccessRestrictionType;\r
import com.gitblit.GitBlit;\r
import com.gitblit.Keys;\r
// add the Gitblit repository url\r
repositoryUrls.add(BasePage.getRepositoryUrl(entry));\r
}\r
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(entry.name, user == null ? "" : user.username));\r
+ repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(entry.name, UserModel.ANONYMOUS.equals(user) ? "" : user.username));\r
\r
+ AccessPermission ap = user.getRepositoryPermission(entry).permission;\r
String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.remove(0);\r
- add(new RepositoryUrlPanel("repositoryCloneUrl", primaryUrl));\r
+ add(new DetailedRepositoryUrlPanel("repositoryPrimaryUrl",localizer, parent, entry.name, primaryUrl, ap));\r
}\r
}\r
vertical-align: middle;\r
}\r
\r
+span.repositoryUrlContainer {\r
+ color: black;\r
+ background-color: #eee; \r
+ padding: 4px;\r
+ border: 1px solid #ccc;\r
+ border-radius: 3px \r
+}\r
+\r
+span.repositoryUrlEndCap { \r
+ padding: 4px;\r
+ font-weight: bold;\r
+ font-size: 0.85em;\r
+ font-family:menlo,consolas,monospace;\r
+}\r
+\r
+span.repositoryUrl {\r
+ font-size: 1em;\r
+ padding: 4px;\r
+ color: blue;\r
+ background-color: #fff;\r
+ border-left: 1px solid #ccc;\r
+ border-right: 1px solid #ccc;\r
+}\r
+\r
div.odd {\r
\r
}\r
projects / gitblit.git / commitdiff