Skip to content

The Unified and Autonomous Development Platform

Enable git protocol switch for all places showing git url

Robin Shen897f79a49bf8
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index a605677dca..1e0f39a6f0 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -111,8 +111,8 @@ public class OneDev extends AbstractPlugin implements Serializable {
List<ManualConfig> manualConfigs = dataManager.init();
if (!manualConfigs.isEmpty()) {
- logger.warn("Please set up the server at "
- + guessServerUrl(false).toString(StringMode.FULL));
+ String serverUrl = StringUtils.stripEnd(guessServerUrl(false).toString(StringMode.FULL), "/");
+ logger.warn("Please set up the server at " + serverUrl);
initStage = new InitStage("Server Setup", manualConfigs);
initStage.waitForFinish();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
index a99916b767..6ee15a8ed4 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
@@ -1,7 +1,9 @@
package io.onedev.server.entitymanager;
import javax.annotation.Nullable;
+
import org.eclipse.jgit.lib.ObjectId;
+
import io.onedev.server.model.Build;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
@@ -37,8 +39,6 @@ public interface UrlManager {
String urlFor(CodeCommentReply reply, @Nullable PullRequest request);
- String sshCloneUrlFor(Project project);
-
- String httpCloneUrlFor(Project project);
+ String cloneUrlFor(Project project, boolean ssh);
}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 37e79ee3d5..e63f97e020 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -139,7 +139,7 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null || setting.getValue() == null) {
systemSetting = new SystemSetting();
- systemSetting.setServerUrl(webServerUrl.toString(StringMode.FULL));
+ systemSetting.setServerUrl(StringUtils.stripEnd(webServerUrl.toString(StringMode.FULL), "/"));
} else if (!validator.validate(setting.getValue()).isEmpty()) {
systemSetting = (SystemSetting) setting.getValue();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
index b4cfe06c10..ce26070362 100644
--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
@@ -44,13 +44,11 @@ public class DefaultUrlManager implements UrlManager {
}
@Override
- public String sshCloneUrlFor(Project project) {
- return settingManager.getSshSetting().getServerUrl() + "/" + project.getName();
- }
-
- @Override
- public String httpCloneUrlFor(Project project) {
- return settingManager.getSystemSetting().getServerUrl() + "/" + project.getName();
+ public String cloneUrlFor(Project project, boolean ssh) {
+ if (ssh)
+ return settingManager.getSshSetting().getServerUrl() + "/" + project.getName();
+ else
+ return settingManager.getSystemSetting().getServerUrl() + "/" + project.getName();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.js b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.js
index 9b05142cd1..7c3852415b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.js
@@ -8,6 +8,5 @@ onedev.server.copyToClipboard = {
});
$button.attr("title", "Copy to clipboard");
$button.addClass("copy-to-clipboard");
- console.log("shit");
}
};
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolCssResourceReference.java
new file mode 100644
index 0000000000..71d3618387
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.project.gitprotocol;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class GitProtocolCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public GitProtocolCssResourceReference() {
+ super(GitProtocolCssResourceReference.class, "git-protocol.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
new file mode 100644
index 0000000000..b33e6441e5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
@@ -0,0 +1,13 @@
+<wicket:panel>
+ <div class="git-protocol">
+ <div class="protocol clearfix">
+ <div wicket:id="current" class="pull-left"></div>
+ <a wicket:id="switch" class="switch pull-right"><span wicket:id="label"></span></a>
+ </div>
+ <div wicket:id="noSshKeysWarning" class="no-ssh-keys alert alert-warning">
+ No SSH keys configured in your account. You may <a wicket:id="sshKeys">add a key</a> or switch to <a wicket:id="useHttp">HTTP(S)</a> url
+ </div>
+ <div wicket:id="content" class="content"></div>
+ <div wicket:id="fingerPrint" class="finger-print"></div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java
new file mode 100644
index 0000000000..046b190b9f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java
@@ -0,0 +1,149 @@
+package io.onedev.server.web.component.project.gitprotocol;
+
+import javax.servlet.http.Cookie;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UrlManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.administration.SshSetting;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
+
+@SuppressWarnings("serial")
+public abstract class GitProtocolPanel extends Panel {
+
+ private static final String COOKIE_USE_SSH = "git.useSsh";
+
+ private boolean useSsh;
+
+ public GitProtocolPanel(String id) {
+ super(id);
+
+ if (SecurityUtils.getUser() != null) {
+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();
+ Cookie cookie = request.getCookie(COOKIE_USE_SSH);
+ useSsh = cookie!=null && String.valueOf(true).equals(cookie.getValue());
+ } else {
+ useSsh = false;
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new Label("current", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (useSsh)
+ return "Showing SSH url";
+ else
+ return "Showing HTTP(S) url";
+ }
+
+ }));
+
+ AjaxLink<Void> switchLink = new AjaxLink<Void>("switch") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ switchProtocol(target, !useSsh);
+ }
+
+ };
+ switchLink.add(new Label("label", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (useSsh)
+ return "Switch to HTTP(S)";
+ else
+ return "Switch to SSH";
+ }
+
+ }));
+ add(switchLink.setVisible(SecurityUtils.getUser() != null));
+
+ WebMarkupContainer noSshKeysWarning = new WebMarkupContainer("noSshKeysWarning") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(useSsh && SecurityUtils.getUser().getSshKeys().isEmpty());
+ }
+
+ };
+ noSshKeysWarning.add(new BookmarkablePageLink<Void>("sshKeys", MySshKeysPage.class));
+ noSshKeysWarning.add(new AjaxLink<Void>("useHttp") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ switchProtocol(target, false);
+ }
+
+ });
+ add(noSshKeysWarning);
+
+ add(newContent("content"));
+
+ SshSetting sshSetting = OneDev.getInstance(SettingManager.class).getSshSetting();
+ add(new Label("fingerPrint", "Server fingerprint: " + sshSetting.getFingerPrint()) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(useSsh);
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new GitProtocolCssResourceReference()));
+ }
+
+ private void switchProtocol(AjaxRequestTarget target, boolean useSsh) {
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+
+ this.useSsh = useSsh;
+
+ Cookie cookie;
+ cookie = new Cookie(COOKIE_USE_SSH, String.valueOf(useSsh));
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ cookie.setPath("/");
+
+ response.addCookie(cookie);
+
+ target.add(this);
+ }
+
+ protected abstract Project getProject();
+
+ protected abstract Component newContent(String componentId);
+
+ public String getProtocolUrl() {
+ UrlManager urlManager = OneDev.getInstance(UrlManager.class);
+ return urlManager.cloneUrlFor(getProject(), useSsh);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/git-protocol.css b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/git-protocol.css
new file mode 100644
index 0000000000..6aabcbfd16
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/git-protocol.css
@@ -0,0 +1,23 @@
+.git-protocol>div {
+ margin-bottom: 12px;
+}
+.git-protocol>div:last-child {
+ margin-bottom: 0;
+}
+.git-protocol>.protocol {
+ font-weight: bold;
+ font-size: 13px;
+ color: #666;
+ border-bottom: 1px solid #DDD;
+ padding-bottom: 8px;
+}
+.git-protocol>.no-ssh-keys {
+ font-size: 13px;
+ padding: 8px;
+ margin-bottom: 16px;
+}
+.git-protocol .finger-print {
+ font-size: 13px;
+ word-break: break-all;
+ color: #666;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index e537c046ae..00c8fa4bc0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -670,4 +670,5 @@ td.ellipsis {
}
.vertical-middle {
vertical-align: middle !important;
-}
\ No newline at end of file
+}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html
index 2b4abf43a9..dbfeb1e241 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html
@@ -1,27 +1,6 @@
<wicket:panel>
<div class="clone-or-download">
- <div class="clone">
- <div class="protocol clearfix">
- <div wicket:id="currentCloneProtocol" class="pull-left"></div>
- <a wicket:id="switchCloneProtocol" class="switch pull-right"><span wicket:id="label"></span></a>
- </div>
- <div wicket:id="noSshKeysWarning" class="no-ssh-keys alert alert-warning">
- No SSH keys specified in your account. You may <a wicket:id="sshKeys">add a key</a> or
- clone the project via <a wicket:id="useHttp">HTTP(S)</a>
- </div>
- <div class="url">
- <div class="input-group">
- <input wicket:id="cloneUrl" readonly="readonly" class="form-control">
- <a wicket:id="copyCloneUrl" class="input-group-addon"><i class="fa fa-clipboard"></i></a>
- </div>
- </div>
- <wicket:enclosure>
- <div class="finger-print">
- <div class="name">Server Fingerprint</div>
- <div wicket:id="fingerPrint" class="value"></div>
- </div>
- </wicket:enclosure>
- </div>
+ <div wicket:id="clone" class="clone"></div>
<div class="download">
<div>
<a wicket:id="downloadAsZip" class="btn btn-block btn-primary">Download zip</a>
@@ -31,4 +10,13 @@
</div>
</div>
</div>
+ <wicket:fragment wicket:id="urlFrag">
+ <div class="url input-group">
+ <div class="input-group-addon">
+ <b>Clone</b>
+ </div>
+ <input wicket:id="value" readonly="readonly" class="form-control">
+ <a wicket:id="copy" class="input-group-addon"><i class="fa fa-clipboard"></i></a>
+ </div>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java
index 02c2f487b4..853f72ccf8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java
@@ -1,136 +1,59 @@
package io.onedev.server.web.page.project.blob;
-import javax.servlet.http.Cookie;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ResourceLink;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.http.WebResponse;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Project;
-import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.component.project.gitprotocol.GitProtocolPanel;
import io.onedev.server.web.download.ArchiveDownloadResource;
import io.onedev.server.web.download.ArchiveDownloadResourceReference;
-import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
@SuppressWarnings("serial")
public abstract class CloneOrDownloadPanel extends Panel {
- private static final String COOKIE_CLONE_VIA_SSH = "cloneViaSSH";
-
private final DropdownLink dropdown;
- private boolean cloneViaSSH;
-
public CloneOrDownloadPanel(String id, DropdownLink dropdown) {
super(id);
-
this.dropdown = dropdown;
-
- if (SecurityUtils.getUser() != null) {
- WebRequest request = (WebRequest) RequestCycle.get().getRequest();
- Cookie cookie = request.getCookie(COOKIE_CLONE_VIA_SSH);
- cloneViaSSH = cookie!=null && String.valueOf(true).equals(cookie.getValue());
- } else {
- cloneViaSSH = false;
- }
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("currentCloneProtocol", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (cloneViaSSH)
- return "Clone via SSH";
- else
- return "Clone via HTTP(S)";
- }
-
- }));
-
- AjaxLink<Void> switchLink = new AjaxLink<Void>("switchCloneProtocol") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- switchCloneProtocol(target, !cloneViaSSH);
- }
+ add(new GitProtocolPanel("clone") {
- };
- switchLink.add(new Label("label", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (cloneViaSSH)
- return "Use HTTP(S)";
- else
- return "Use SSH";
- }
-
- }));
- add(switchLink.setVisible(SecurityUtils.getUser() != null));
-
- WebMarkupContainer noSshKeysWarning = new WebMarkupContainer("noSshKeysWarning") {
-
@Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(cloneViaSSH && SecurityUtils.getUser().getSshKeys().isEmpty());
+ protected Component newContent(String componentId) {
+ Fragment fragment = new Fragment(componentId, "urlFrag", CloneOrDownloadPanel.this);
+ IModel<String> urlModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return getProtocolUrl();
+ }
+
+ };
+ fragment.add(new TextField<String>("value", urlModel));
+ fragment.add(new CopyToClipboardLink("copy", urlModel));
+ return fragment;
}
- };
- noSshKeysWarning.add(new BookmarkablePageLink<Void>("sshKeys", MySshKeysPage.class));
- noSshKeysWarning.add(new AjaxLink<Void>("useHttp") {
-
@Override
- public void onClick(AjaxRequestTarget target) {
- switchCloneProtocol(target, false);
+ protected Project getProject() {
+ return CloneOrDownloadPanel.this.getProject();
}
});
- add(noSshKeysWarning);
- IModel<String> cloneUrlModel = new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- UrlManager urlManager = OneDev.getInstance(UrlManager.class);
- if (cloneViaSSH)
- return urlManager.sshCloneUrlFor(getProject());
- else
- return urlManager.httpCloneUrlFor(getProject());
- }
-
- };
- add(new TextField<String>("cloneUrl", cloneUrlModel));
- add(new CopyToClipboardLink("copyCloneUrl", cloneUrlModel));
-
- add(new Label("fingerPrint", OneDev.getInstance(SettingManager.class).getSshSetting().getFingerPrint()) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(cloneViaSSH);
- }
-
- });
add(new ResourceLink<Void>("downloadAsZip", new ArchiveDownloadResourceReference(),
ArchiveDownloadResource.paramsOf(getProject(), getRevision(), ArchiveDownloadResource.FORMAT_ZIP)) {
@@ -154,21 +77,6 @@ public abstract class CloneOrDownloadPanel extends Panel {
}
- private void switchCloneProtocol(AjaxRequestTarget target, boolean cloneViaSSH) {
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
-
- this.cloneViaSSH = cloneViaSSH;
-
- Cookie cookie;
- cookie = new Cookie(COOKIE_CLONE_VIA_SSH, String.valueOf(cloneViaSSH));
- cookie.setMaxAge(Integer.MAX_VALUE);
- cookie.setPath("/");
-
- response.addCookie(cookie);
-
- target.add(this);
- }
-
protected abstract Project getProject();
protected abstract String getRevision();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
index fb5f1f826e..12e37562dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
@@ -5,7 +5,7 @@
<div wicket:id="buildStatus" class="build-status pull-left"></div>
<div wicket:id="blobNavigator" class="blob-navigator pull-left"></div>
<div wicket:id="blobOperations" class="operations pull-right">
- <a wicket:id="cloneOrDownload" title="Clone or download project" class="clone-or-download">Clone or Download <i class="fa fa-caret-down"></i></a>
+ <a wicket:id="cloneOrDownload" title="Clone or download project" class="clone-or-download"><b>Clone or Download <i class="fa fa-caret-down"></i></b></a>
<a wicket:id="history" title="Commit history of current path">History</a>
<a wicket:id="add" title="Add files to current directory">Add <i class="fa fa-caret-down"></i></a>
<a wicket:id="search" title="Search files, symbols and texts">Search <i class="fa fa-caret-down"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
index 5141e3bd3f..fcf174e9c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
@@ -151,20 +151,9 @@ body.ProjectBlobPage.additionalWidth3 {
margin-left: 4px;
}
.clone-or-download {
- width: 400px;
+ max-width: 480px;
padding: 12px;
}
-.clone-or-download>.clone>div {
- margin-bottom: 12px;
-}
-.clone-or-download>.clone>.protocol {
- font-weight: bold;
-}
-.clone-or-download>.clone>.no-ssh-keys {
- font-size: 13px;
- padding: 8px;
- margin-bottom: 16px;
-}
.clone-or-download>.clone input {
background: white;
}
@@ -183,12 +172,3 @@ body.ProjectBlobPage.additionalWidth3 {
.clone-or-download>.download>:last-child {
padding-left: 10px;
}
-.clone-or-download .finger-print {
- font-size: 13px;
-}
-.clone-or-download .finger-print .name {
- font-weight: bold;
-}
-.clone-or-download .finger-print .value {
- word-break: break-all;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
index e95bc38c9f..64f3b8bb81 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
@@ -5,16 +5,10 @@
or <a wicket:id="pushInstructions">pushing an existing repository</a></div>
</div>
<wicket:fragment wicket:id="pushInstructionsFrag">
- <div class="push-instructions">
- <div class="title">Run below commands from within your git repository:</div>
- <div class="content">
- <div>git remote add origin <span wicket:id="httpUrl"></span></div>
- <div>git push -u origin master</div>
- </div>
- <div class="note">
- <div>Use url <code wicket:id="sshUrl"></code> if you want to push via SSH</div>
- <div class="finger-print">(server fingerprint: <span wicket:id="fingerPrint"></span>)</div>
- </div>
+ <div class="title">Run below commands from within your git repository:</div>
+ <div class="code">
+ <div>git remote add origin <span wicket:id="url"></span></div>
+ <div>git push -u origin master</div>
</div>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
index d6a51eb520..8728fd11ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
@@ -5,6 +5,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -12,11 +13,10 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.RefUpdated;
+import io.onedev.server.model.Project;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
@@ -25,6 +25,7 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.project.gitprotocol.GitProtocolPanel;
import io.onedev.server.web.page.project.blob.BlobUploadPanel;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
@@ -128,15 +129,36 @@ public class NoCommitsPanel extends Panel {
add(new DropdownLink("pushInstructions") {
+ @Override
+ protected void onInitialize(FloatingPanel dropdown) {
+ super.onInitialize(dropdown);
+ dropdown.add(AttributeAppender.append("class", "push-instructions"));
+ }
+
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
- Fragment fragment = new Fragment(id, "pushInstructionsFrag", NoCommitsPanel.this);
- UrlManager urlManager = OneDev.getInstance(UrlManager.class);
- fragment.add(new Label("httpUrl", urlManager.httpCloneUrlFor(context.getProject())));
- fragment.add(new Label("sshUrl", urlManager.sshCloneUrlFor(context.getProject())));
- SettingManager settingManager = OneDev.getInstance(SettingManager.class);
- fragment.add(new Label("fingerPrint", settingManager.getSshSetting().getFingerPrint()));
- return fragment;
+ return new GitProtocolPanel(id) {
+
+ @Override
+ protected Component newContent(String componentId) {
+ Fragment fragment = new Fragment(id, "pushInstructionsFrag", NoCommitsPanel.this);
+ fragment.add(new Label("url", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return getProtocolUrl();
+ }
+
+ }));
+ return fragment;
+ }
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+
+ };
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
index 798d6abe52..89833b45e5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
@@ -7,15 +7,14 @@
margin-bottom: 20px;
}
.push-instructions {
- padding: 20px;
- width: 600px;
+ padding: 12px;
}
.push-instructions .title {
font-weight: bold;
font-size: 16px;
margin-bottom: 12px;
}
-.push-instructions .content {
+.push-instructions .code {
border: 1px dashed #BBB;
background: #F5F5F5;
border-radius: 4px;
@@ -24,11 +23,3 @@
font-size: 13px;
margin-bottom: 8px;
}
-.push-instructions .note {
-}
-.push-instructions .finger-print {
- word-break: break-all;
- font-size: 12px;
- margin-top: 4px;
- color: #666;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html
index 52970b4b6e..7b3ff18e2e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html
@@ -1,8 +1,9 @@
<wicket:panel>
- <wicket:container wicket:id="content"></wicket:container>
+ <div class="title">Conflict Resolve Instruction</div>
+ <div wicket:id="body" class="body"></div>
<wicket:fragment wicket:id="mergeFrag">
- <ul class="conflict-resolve instruction">
+ <ul>
<li>
<div class="text">From working directory of project <em wicket:id="srcRepoName"></em>,
check out source branch and merge with target branch</div>
@@ -25,9 +26,8 @@
</li>
</ul>
</wicket:fragment>
-
<wicket:fragment wicket:id="rebaseFrag">
- <ul class="conflict-resolve instruction">
+ <ul>
<li>
<div class="text">From working directory of project <em wicket:id="srcRepoName"></em>,
check out source branch and rebase to destination branch</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.java
index 76b22d263f..2b77eed845 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.java
@@ -7,9 +7,11 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.web.component.project.gitprotocol.GitProtocolPanel;
@SuppressWarnings("serial")
abstract class ConflictResolveInstructionPanel extends Panel {
@@ -27,9 +29,10 @@ abstract class ConflictResolveInstructionPanel extends Panel {
PullRequest request = getPullRequest();
Fragment fragment;
MergeStrategy strategy = request.getMergeStrategy();
- boolean sameRepo = request.getTarget().getProject().equals(request.getSource().getProject());
+ boolean sameRepo = request.getTarget().getProject().equals(request.getSource().getProject());
+
if (strategy == REBASE_SOURCE_BRANCH_COMMITS) {
- fragment = new Fragment("content", "rebaseFrag", this);
+ fragment = new Fragment("body", "rebaseFrag", this);
fragment.add(new Label("srcRepoName", request.getSource().getProject()));
fragment.add(new Label("srcBranchNameForCheckout", request.getSourceBranch()));
fragment.add(new Label("srcBranchNameForPush", request.getSourceBranch()));
@@ -38,12 +41,19 @@ abstract class ConflictResolveInstructionPanel extends Panel {
sameRepoContainer.setVisible(sameRepo);
fragment.add(sameRepoContainer);
WebMarkupContainer differentRepoContainer = new WebMarkupContainer("differentRepo");
- differentRepoContainer.add(new Label("destRepoUrl", request.getTarget().getProject().getUrl()));
+ differentRepoContainer.add(new Label("destRepoUrl", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return findParent(GitProtocolPanel.class).getProtocolUrl();
+ }
+
+ }));
differentRepoContainer.add(new Label("destBranchName", request.getTargetBranch()));
differentRepoContainer.setVisible(!sameRepo);
fragment.add(differentRepoContainer);
} else {
- fragment = new Fragment("content", "mergeFrag", this);
+ fragment = new Fragment("body", "mergeFrag", this);
fragment.add(new Label("srcRepoName", request.getSource().getProject()));
fragment.add(new Label("srcBranchNameForCheckout", request.getSourceBranch()));
fragment.add(new Label("srcBranchNameForPush", request.getSourceBranch()));
@@ -54,7 +64,14 @@ abstract class ConflictResolveInstructionPanel extends Panel {
fragment.add(sameRepoContainer);
WebMarkupContainer differentRepoContainer = new WebMarkupContainer("differentRepo");
differentRepoContainer.add(new Label("ffOption", strategy==CREATE_MERGE_COMMIT?"--no-ff":""));
- differentRepoContainer.add(new Label("destRepoUrl", request.getTarget().getProject().getUrl()));
+ differentRepoContainer.add(new Label("destRepoUrl", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return findParent(GitProtocolPanel.class).getProtocolUrl();
+ }
+
+ }));
differentRepoContainer.add(new Label("destBranchName", request.getTargetBranch()));
differentRepoContainer.setVisible(!sameRepo);
fragment.add(differentRepoContainer);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index a0271a320a..76f5134fe1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -118,6 +118,7 @@ import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
+import io.onedev.server.web.component.project.gitprotocol.GitProtocolPanel;
import io.onedev.server.web.component.review.ReviewListPanel;
import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
@@ -869,6 +870,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
add(new DropdownLink("resolveInstructions") {
+ @Override
+ protected void onInitialize(FloatingPanel dropdown) {
+ dropdown.add(AttributeAppender.append("class", "conflict-resolve-instruction"));
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
@@ -877,14 +883,37 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
- return new ConflictResolveInstructionPanel(id) {
+ if (getPullRequest().getTargetProject().equals(getPullRequest().getSourceProject())) {
+ return new ConflictResolveInstructionPanel(id) {
- @Override
- protected PullRequest getPullRequest() {
- return PullRequestDetailPage.this.getPullRequest();
- }
-
- };
+ @Override
+ protected PullRequest getPullRequest() {
+ return PullRequestDetailPage.this.getPullRequest();
+ }
+
+ };
+ } else {
+ return new GitProtocolPanel(id) {
+
+ @Override
+ protected Component newContent(String componentId) {
+ return new ConflictResolveInstructionPanel(componentId) {
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return PullRequestDetailPage.this.getPullRequest();
+ }
+
+ };
+ }
+
+ @Override
+ protected Project getProject() {
+ return getPullRequest().getTargetProject();
+ }
+
+ };
+ }
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 444585820a..9a302098a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -182,22 +182,30 @@ ul>li>a.code-comments.new .fa-circle {
font-size: 16px;
}
-.floating>.content>.instruction {
- padding: 20px 20px 20px 32px;
- width: 500px;
+.conflict-resolve-instruction {
+ padding: 12px;
+}
+.conflict-resolve-instruction .title {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: center;
+ margin-bottom: 8px;
+}
+.conflict-resolve-instruction .body>ul {
+ padding-left: 20px;
margin-bottom: 0;
}
-.floating>.content>.instruction>li {
+.conflict-resolve-instruction .body>ul>li {
list-style: decimal;
margin-bottom: 12px;
}
-.floating>.content>.instruction>li:last-child {
+.conflict-resolve-instruction .body>ul>li:last-child {
margin-bottom: 0;
}
-.floating>.content>.instruction>li>.code {
+.conflict-resolve-instruction .body>ul>li>.code {
margin-top: 8px;
- font-family: monospace;
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 13px;
background: #F5F5F5;
border: 1px dashed #BBB;