Skip to content

The Unified and Autonomous Development Platform

Show SSH push url in push instructions page

Robin Shen6c3525d7ca39
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 fe5a839107..1abe059ecb 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
@@ -8,10 +8,10 @@
<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="url1"></span></div>
+ <div>git remote add origin <span wicket:id="httpUrl"></span></div>
<div>git push -u origin master</div>
</div>
- <div class="help-block"><i class="fa fa-info-circle"></i> In case remote <em>origin</em> already exists, use another name other than <em>origin</em>, or run command <em>git remote set-url origin <span wicket:id="url2"></span></em> instead</div>
+ <div class="note"><i class="fa fa-info-circle"></i> Use url <b wicket:id="sshUrl"></b> if you want to push via SSH</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 cf0e3d1b1d..c17c69d3a4 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
@@ -13,6 +13,8 @@ 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 io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.floating.FloatingPanel;
@@ -128,8 +130,9 @@ public class NoCommitsPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
Fragment fragment = new Fragment(id, "pushInstructionsFrag", NoCommitsPanel.this);
- fragment.add(new Label("url1", context.getProject().getUrl()));
- fragment.add(new Label("url2", context.getProject().getUrl()));
+ UrlManager urlManager = OneDev.getInstance(UrlManager.class);
+ fragment.add(new Label("httpUrl", urlManager.httpCloneUrlFor(context.getProject())));
+ fragment.add(new Label("sshUrl", urlManager.sshCloneUrlFor(context.getProject())));
return fragment;
}
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 a4d433891a..a416a545b8 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
@@ -12,13 +12,19 @@
}
.push-instructions .title {
font-weight: bold;
+ font-size: 16px;
margin-bottom: 12px;
}
.push-instructions .content {
+ border: 1px dashed #BBB;
+ background: #F5F5F5;
+ border-radius: 4px;
+ padding: 8px;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 13px;
margin-bottom: 8px;
}
-.push-instructions .help-block {
- margin-bottom: 0;
+.push-instructions .note {
+ font-size: 12px;
+ color: #666;
}
\ No newline at end of file