Skip to content

The Unified and Autonomous Development Platform

Move clone url displaying into "clone and download" link to be more obvious

Robin Shen6f9d7c7e9da4
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 6a323fbb3e..7108079916 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
@@ -170,23 +170,19 @@ public class DefaultDataManager implements DataManager, Serializable {
}
setting = settingManager.getSetting(Key.SSH);
- if (serverConfig.getSshPort() != 0) {
- if (setting == null || setting.getValue() == null) {
- SshSetting sshSetting = new SshSetting();
- String sshUrl = serverUrl.getHost();
- int sshPort = serverConfig.getSshPort();
-
- if (sshPort != 22)
- sshUrl += ":" + sshPort;
-
- sshSetting.setServerUrl("ssh://" + sshUrl);
- sshSetting.setPrivateKey(SshKeyUtils.generatePEMPrivateKey());
-
- settingManager.saveSshSetting(sshSetting);
- }
- } else if (setting == null || setting.getValue() != null) {
- settingManager.saveSshSetting(null);
- }
+ if (setting == null || setting.getValue() == null) {
+ SshSetting sshSetting = new SshSetting();
+ String sshUrl = serverUrl.getHost();
+ int sshPort = serverConfig.getSshPort();
+
+ if (sshPort != 22)
+ sshUrl += ":" + sshPort;
+
+ sshSetting.setServerUrl("ssh://" + sshUrl);
+ sshSetting.setPrivateKey(SshKeyUtils.generatePEMPrivateKey());
+
+ settingManager.saveSshSetting(sshSetting);
+ }
setting = settingManager.getSetting(Key.SECURITY);
if (setting == null) {
diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.java
index 3eb3beea77..ab257576d4 100644
--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java
+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java
@@ -48,7 +48,7 @@ public class SshKey extends AbstractEntity implements Validatable {
@JoinColumn(nullable=false)
private User owner;
- @Editable(name = "Key", description="Provide a OpenSSH public key. Normally begins with 'ssh-rsa'")
+ @Editable(name = "OpenSSH Public Key", description="Provide a OpenSSH public key. Normally begins with 'ssh-rsa'")
@NotEmpty
@Multiline
@OmitName
@@ -103,7 +103,7 @@ public class SshKey extends AbstractEntity implements Validatable {
return true;
} catch (Exception exception) {
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate("A valid OpenSSH public key is expected")
+ context.buildConstraintViolationWithTemplate("Invalid OpenSSH public key")
.addPropertyNode("content").addConstraintViolation();
return false;
}
diff --git a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java
index 88ab681dc8..a5f845044b 100644
--- a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java
+++ b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java
@@ -41,31 +41,29 @@ public class SshServerLauncher {
@Listen
public void on(SystemStarted event) {
- if (serverConfig.getSshPort() != 0) {
- server = SshServer.setUpDefaultServer();
+ server = SshServer.setUpDefaultServer();
- server.setPort(serverConfig.getSshPort());
- server.setKeyPairProvider(keyPairProvider);
- server.setShellFactory(new DisableShellAccess());
-
- server.setPublickeyAuthenticator(new CachingPublicKeyAuthenticator(authenticator));
- server.setKeyboardInteractiveAuthenticator(null);
-
- server.setCommandFactory(command -> {
- for (SshCommandCreator creator: commandCreators) {
- Command sshCommand = creator.createCommand(command);
- if (sshCommand != null)
- return sshCommand;
- }
- return new UnknownCommand(command);
- });
+ server.setPort(serverConfig.getSshPort());
+ server.setKeyPairProvider(keyPairProvider);
+ server.setShellFactory(new DisableShellAccess());
+
+ server.setPublickeyAuthenticator(new CachingPublicKeyAuthenticator(authenticator));
+ server.setKeyboardInteractiveAuthenticator(null);
+
+ server.setCommandFactory(command -> {
+ for (SshCommandCreator creator: commandCreators) {
+ Command sshCommand = creator.createCommand(command);
+ if (sshCommand != null)
+ return sshCommand;
+ }
+ return new UnknownCommand(command);
+ });
- try {
- server.start();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
+ try {
+ server.start();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
@Listen
diff --git a/server-core/src/main/java/io/onedev/server/util/ServerConfig.java b/server-core/src/main/java/io/onedev/server/util/ServerConfig.java
index ed6667cf5f..642cfe921f 100644
--- a/server-core/src/main/java/io/onedev/server/util/ServerConfig.java
+++ b/server-core/src/main/java/io/onedev/server/util/ServerConfig.java
@@ -41,7 +41,7 @@ public interface ServerConfig {
* Get ssh port configured for the server.
* <p>
* @return
- * ssh port of the server, or <i>0</i> if ssh service is disabled
+ * ssh port of the server
*/
int getSshPort();
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java
deleted file mode 100644
index a4db2ce71b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.onedev.server.web.behavior.clipboard;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.model.IModel;
-import org.unbescape.javascript.JavaScriptEscape;
-
-public class CopyClipboardBehavior extends Behavior {
-
- private static final long serialVersionUID = 1L;
-
- private final IModel<String> textModel;
-
- public CopyClipboardBehavior(IModel<String> textModel) {
- this.textModel = textModel;
- }
-
- @Override
- public void detach(Component component) {
- textModel.detach();
- super.detach(component);
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- response.render(JavaScriptHeaderItem.forReference(new CopyClipboardResourceReference()));
- String script = String.format("onedev.server.copyClipboard.onDomReady('%s', '%s');",
- component.getMarkupId(true), JavaScriptEscape.escapeJavaScript(textModel.getObject()));
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.css b/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.css
deleted file mode 100644
index 64e60f1ed7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.copy-clipboard:not(.btn):not(.input-group-addon) {
- color: #666;
- position: relative;
-}
-.copy-clipboard:hover:not(.btn):not(.input-group-addon),
-.copy-clipboard:active:not(.btn):not(.input-group-addon) {
- color: black;
-}
-.copy-clipboard:active:not(.btn):not(.input-group-addon) {
- left: 1px;
- top: 1px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index a2bc2b121e..f4c5e938ce 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -69,7 +69,6 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.BuildQueryBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.build.ParamValuesLabel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.datatable.DefaultDataTable;
@@ -77,6 +76,7 @@ import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
@@ -499,7 +499,7 @@ public abstract class BuildListPanel extends Panel {
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
fragment.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(build.getCommitHash())));
- fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(build.getCommitHash()))));
+ fragment.add(new CopyToClipboardLink("copyHash", Model.of(build.getCommitHash())));
cellItem.add(fragment);
} else {
cellItem.add(new Label(componentId, GitUtils.abbreviateSHA(build.getCommitHash())));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 5ac12ef795..a7b1c32618 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -69,11 +69,11 @@ import io.onedev.server.util.ProjectAndRevision;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.CommitQueryBehavior;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
@@ -583,7 +583,7 @@ public abstract class CommitListPanel extends Panel {
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
item.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
- item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
+ item.add(new CopyToClipboardLink("copyHash", Model.of(commit.name())));
getCommitIdsToQueryStatus().add(commit.copy());
CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy()) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
index 9002f2212c..92a69aa6a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
@@ -5,7 +5,6 @@ import java.util.List;
import org.apache.wicket.behavior.AttributeAppender;
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.Link;
import org.apache.wicket.markup.html.list.ListItem;
@@ -23,11 +22,11 @@ import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
@@ -98,7 +97,7 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
item.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
- item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
+ item.add(new CopyToClipboardLink("copyHash", Model.of(commit.name())));
BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);
ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 9b81a98718..349dd1d8fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -41,8 +41,8 @@ import io.onedev.server.util.Input;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.SecretInput;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.editable.EditableUtils;
@@ -132,12 +132,12 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
fragment.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(value)));
- fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(value))));
+ fragment.add(new CopyToClipboardLink("copyHash", Model.of(value)));
item.add(fragment);
} else {
Fragment fragment = new Fragment("value", "notAccessibleCommitFrag", FieldValuesPanel.this);
fragment.add(new Label("hash", GitUtils.abbreviateSHA(value)));
- fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(value))));
+ fragment.add(new CopyToClipboardLink("copyHash", Model.of(value)));
item.add(fragment);
}
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 8aef18eced..1483c8c07f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -66,7 +66,6 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.IssueQueryBehavior;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
@@ -75,6 +74,7 @@ import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.project.selector.ProjectSelector;
@@ -612,8 +612,7 @@ public abstract class IssueListPanel extends Panel {
}.setEscapeModelStrings(false).setOutputMarkupId(true));
- fragment.add(new WebMarkupContainer("copy").add(
- new CopyClipboardBehavior(Model.of("#" + issue.getNumber() + ": " + issue.getTitle()))));
+ fragment.add(new CopyToClipboardLink("copy", Model.of("#" + issue.getNumber() + ": " + issue.getTitle())));
fragment.add(new Label("votes", issue.getVoteCount()));
fragment.add(new Label("comments", issue.getCommentCount()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index 1e6589a933..d6e015575a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -41,7 +41,7 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.util.ReferenceTransformer;
@@ -144,7 +144,7 @@ public abstract class IssueTitlePanel extends Panel {
});
String copyContent = "#" + getIssue().getNumber() + ": " + getIssue().getTitle();
- titleViewer.add(new WebMarkupContainer("copy").add(new CopyClipboardBehavior(Model.of(copyContent))));
+ titleViewer.add(new CopyToClipboardLink("copy", Model.of(copyContent)));
if (withIssueCreation) {
titleViewer.add(new BookmarkablePageLink<Void>("create", NewIssuePage.class) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/CopyToClipboardLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/CopyToClipboardLink.java
new file mode 100644
index 0000000000..cff70a9560
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/CopyToClipboardLink.java
@@ -0,0 +1,36 @@
+package io.onedev.server.web.component.link.copytoclipboard;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.model.IModel;
+import org.unbescape.javascript.JavaScriptEscape;
+
+public class CopyToClipboardLink extends WebMarkupContainer {
+
+ private static final long serialVersionUID = 1L;
+
+ private final IModel<String> textModel;
+
+ public CopyToClipboardLink(String id, IModel<String> textModel) {
+ super(id);
+ this.textModel = textModel;
+ }
+
+ @Override
+ protected void onDetach() {
+ textModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new CopyToClipboardResourceReference()));
+ String script = String.format("onedev.server.copyToClipboard.onDomReady('%s', '%s');",
+ getMarkupId(true), JavaScriptEscape.escapeJavaScript(textModel.getObject()));
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/CopyToClipboardResourceReference.java
similarity index 69%
rename from server-core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/CopyToClipboardResourceReference.java
index 9f40602992..a5d253c0b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/CopyToClipboardResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.behavior.clipboard;
+package io.onedev.server.web.component.link.copytoclipboard;
import java.util.List;
@@ -10,12 +10,12 @@ import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
-public class CopyClipboardResourceReference extends BaseDependentResourceReference {
+public class CopyToClipboardResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
- public CopyClipboardResourceReference() {
- super(CopyClipboardResourceReference.class, "copy-clipboard.js");
+ public CopyToClipboardResourceReference() {
+ super(CopyToClipboardResourceReference.class, "copy-to-clipboard.js");
}
@Override
@@ -23,7 +23,7 @@ public class CopyClipboardResourceReference extends BaseDependentResourceReferen
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- CopyClipboardResourceReference.class, "copy-clipboard.css")));
+ CopyToClipboardResourceReference.class, "copy-to-clipboard.css")));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.css b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.css
new file mode 100644
index 0000000000..0d52a85e6e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.css
@@ -0,0 +1,19 @@
+.copy-to-clipboard:not(.btn):not(.input-group-addon) {
+ color: #666;
+ position: relative;
+}
+.copy-to-clipboard:hover:not(.btn):not(.input-group-addon),
+.copy-to-clipboard:active:not(.btn):not(.input-group-addon) {
+ color: black;
+}
+.copy-to-clipboard:active:not(.btn):not(.input-group-addon) {
+ left: 1px;
+ top: 1px;
+}
+.copy-to-clipboard.input-group-addon>*, .copy-to-clipboard.btn>* {
+ position: relative;
+}
+.copy-to-clipboard.input-group-addon:active>*, .copy-to-clipboard.btn:active>* {
+ left: 1px;
+ top: 1px;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.js
similarity index 55%
rename from server-core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js
rename to server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.js
index 015df33c04..9b05142cd1 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/copytoclipboard/copy-to-clipboard.js
@@ -1,4 +1,4 @@
-onedev.server.copyClipboard = {
+onedev.server.copyToClipboard = {
onDomReady: function(buttonId, text) {
var $button = $("#" + buttonId);
var clipboard = new Clipboard("#"+buttonId, {
@@ -6,7 +6,8 @@ onedev.server.copyClipboard = {
return text;
}
});
- $button.attr("title", "Copy");
- $button.addClass("copy-clipboard");
+ $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/user/sshkey/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java
index 7a7afd1730..844be1dfd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java
@@ -73,7 +73,6 @@ public abstract class InsertSshKeyPanel extends Panel {
sshKey.setOwner(getUser());
sshKey.setDate(new Date());
sshKeyManager.save(sshKey);
- getUser().getSshKeys().add(sshKey);
onSave(target);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
index 67e8e34900..710141c202 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
@@ -9,7 +9,6 @@ import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import io.onedev.server.OneDev;
-import io.onedev.server.OneException;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.SshSetting;
import io.onedev.server.ssh.SshKeyUtils;
@@ -21,11 +20,6 @@ public class SshSettingPage extends AdministrationPage {
public SshSettingPage(PageParameters params) {
super(params);
-
- if (!isSshEnabled()) {
- throw new OneException("This page requires SSH support to be enabled. "
- + " You need to specify ssh_port parameter in server.properties");
- }
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
index be4b808c20..6ca0a3ffca 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
@@ -96,10 +96,7 @@ public abstract class UserPage extends AdministrationPage {
tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));
tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));
tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));
-
- if (isSshEnabled()) {
- tabs.add(new UserTab("SSH Keys", "fa fa-fw fa-shield", UserSshKeysPage.class));
- }
+ tabs.add(new UserTab("SSH Keys", "fa fa-fw fa-shield", UserSshKeysPage.class));
return tabs;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
index 3bfb2ccec3..f6ac961e8f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
@@ -10,7 +10,6 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.OneException;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
@@ -27,11 +26,6 @@ public class UserSshKeysPage extends UserPage {
public UserSshKeysPage(PageParameters params) {
super(params);
-
- if (!isSshEnabled()) {
- throw new OneException("This page requires Ssh support to be enabled. "
- + " You need to specify ssh_port parameter in server.properties");
- }
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index a20fe2b433..a45bf900be 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -47,7 +47,6 @@ import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.model.User;
import io.onedev.server.util.SecurityUtils;
-import io.onedev.server.util.ServerConfig;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.page.init.ServerInitPage;
@@ -266,10 +265,6 @@ public abstract class BasePage extends WebPage {
return SecurityUtils.getUser();
}
- public boolean isSshEnabled() {
- return OneDev.getInstance(ServerConfig.class).getSshPort() != 0;
- }
-
public void unauthorized() {
if (getLoginUser() != null)
throw new UnauthorizedException("You are not allowed to perform this operation");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 1ed937765d..c23625d77a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -116,7 +116,6 @@ public abstract class LayoutPage extends BasePage {
item.add(new ViewStateAwarePageLink<Void>("link", SshSettingPage.class));
if (getPage() instanceof SshSettingPage)
item.add(AttributeAppender.append("class", "active"));
- item.setVisible(isSshEnabled());
administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));
item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorsPage.class));
@@ -212,7 +211,6 @@ public abstract class LayoutPage extends BasePage {
item.add(new ViewStateAwarePageLink<Void>("link", MySshKeysPage.class));
if (getPage() instanceof MySshKeysPage)
item.add(AttributeAppender.append("class", "active"));
- item.setVisible(isSshEnabled());
PrincipalCollection prevPrincipals = SecurityUtils.getSubject().getPreviousPrincipals();
if (prevPrincipals != null && !prevPrincipals.getPrimaryPrincipal().equals(0L)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
index 6a900a8e81..d155f63225 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
@@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneException;
import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
import io.onedev.server.web.component.modal.ModalLink;
@@ -23,11 +22,6 @@ public class MySshKeysPage extends MyPage {
public MySshKeysPage(PageParameters params) {
super(params);
-
- if (!isSshEnabled()) {
- throw new OneException("This page requires SSH support to be enabled. "
- + " You need to specify ssh_port parameter in server.properties");
- }
}
@Override
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
new file mode 100644
index 0000000000..0a7f4a88d3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html
@@ -0,0 +1,28 @@
+<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>
+ </div>
+ <div class="download">
+ <div>
+ <a wicket:id="downloadAsZip" class="btn btn-block btn-primary">Download zip</a>
+ </div>
+ <div>
+ <a wicket:id="downloadAsTgz" class="btn btn-block btn-primary">Download tar.gz</a>
+ </div>
+ </div>
+ </div>
+</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
new file mode 100644
index 0000000000..1a000d15c5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java
@@ -0,0 +1,165 @@
+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.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.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.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.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);
+ }
+
+ };
+ 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());
+ }
+
+ };
+ noSshKeysWarning.add(new BookmarkablePageLink<Void>("sshKeys", MySshKeysPage.class));
+ noSshKeysWarning.add(new AjaxLink<Void>("useHttp") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ switchCloneProtocol(target, false);
+ }
+
+ });
+ 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 ResourceLink<Void>("downloadAsZip", new ArchiveDownloadResourceReference(),
+ ArchiveDownloadResource.paramsOf(getProject(), getRevision(), ArchiveDownloadResource.FORMAT_ZIP)) {
+
+ @Override
+ protected CharSequence getOnClickScript(CharSequence url) {
+ return dropdown.closeBeforeClick(super.getOnClickScript(url));
+ }
+
+ });
+
+ add(new ResourceLink<Void>("downloadAsTgz", new ArchiveDownloadResourceReference(),
+ ArchiveDownloadResource.paramsOf(getProject(), getRevision(), ArchiveDownloadResource.FORMAT_TGZ)) {
+
+ @Override
+ protected CharSequence getOnClickScript(CharSequence url) {
+ return dropdown.closeBeforeClick(super.getOnClickScript(url));
+ }
+
+ });
+
+ }
+
+ 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 3702b23cee..fb5f1f826e 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,9 +5,9 @@
<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="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="download" title="Download code archive of whole project at this revision">Download <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>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index b5d4f1256a..c435fc39f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -95,7 +95,7 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.ArchiveMenuLink;
+import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.menu.MenuItem;
@@ -596,12 +596,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
blobOperations.add(new ViewStateAwarePageLink<Void>("history", ProjectCommitsPage.class,
ProjectCommitsPage.paramsOf(getProject(), query, compareWith)));
- blobOperations.add(new ArchiveMenuLink("download", projectModel) {
-
- @Override
- protected String getRevision() {
- return state.blobIdent.revision;
- }
+ blobOperations.add(new DropdownLink("cloneOrDownload") {
@Override
protected void onConfigure() {
@@ -609,6 +604,23 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
setVisible(state.blobIdent.revision != null && state.blobIdent.path == null);
}
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new CloneOrDownloadPanel(id, this) {
+
+ @Override
+ protected Project getProject() {
+ return ProjectBlobPage.this.getProject();
+ }
+
+ @Override
+ protected String getRevision() {
+ return state.blobIdent.revision;
+ }
+
+ };
+ }
+
});
if (target != null) {
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 a9ec51b57f..c4f6999766 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
@@ -150,4 +150,36 @@ body.ProjectBlobPage.additionalWidth3 {
color: #05B305;
margin-left: 4px;
}
-
+.clone-or-download {
+ width: 400px;
+ 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;
+}
+.clone-or-download>.download {
+ margin-top: 20px;
+ display: table;
+ width: 100%;
+}
+.clone-or-download>.download>div {
+ display: table-cell;
+ width: 50%;
+}
+.clone-or-download>.download>:first-child {
+ padding-right: 10px;
+}
+.clone-or-download>.download>:last-child {
+ padding-left: 10px;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index c02d50715e..01d6330e05 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -63,7 +63,6 @@ import io.onedev.server.model.support.MarkPos;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.branch.create.CreateBranchLink;
import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
@@ -75,6 +74,7 @@ import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.RunJobLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -259,7 +259,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));
add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));
- add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(getCommit().name()))));
+ add(new CopyToClipboardLink("copyHash", Model.of(getCommit().name())));
newParentsContainer(null);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoCssResourceReference.java
new file mode 100644
index 0000000000..64ec792955
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.project.info;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class ProjectInfoCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ProjectInfoCssResourceReference() {
+ super(ProjectInfoCssResourceReference.class, "project-info.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoJsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoJsResourceReference.java
deleted file mode 100644
index a93bd6489e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoJsResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.info;
-
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class ProjectInfoJsResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectInfoJsResourceReference() {
- super(ProjectInfoJsResourceReference.class, "project-info.js");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
index 381709e4a6..208453a5fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
@@ -1,59 +1,15 @@
<wicket:panel>
<div class="project-info" id="project-info">
- <div class="head clearfix">
- <div wicket:id="name" class="name pull-left"></div>
- <div class="pull-right">
- <a wicket:id="forks" class="forks"><span wicket:id="label"></span></a>
- <a wicket:id="forkNow" class="fork-now">fork now</a>
- </div>
- </div>
-
+ <div wicket:id="name" class="name"></div>
<wicket:enclosure child="forkedFrom">
<div class="forked-from">
forked from <a wicket:id="forkedFrom"><span wicket:id="label"></span></a>
</div>
</wicket:enclosure>
-
+ <div class="forks">
+ <a wicket:id="forks" class="forks"><span wicket:id="label"></span></a>
+ <a wicket:id="forkNow" class="fork-now">fork now</a>
+ </div>
<div wicket:id="description" class="description"></div>
-
- <wicket:enclosure child="cloneUrl">
- <div class="clone form-inline">
- <div class="input-group">
- <div class="input-group-addon">
- <b>Clone</b>
- </div>
- <input wicket:id="cloneUrl" readonly="readonly"
- class="form-control" /> <a wicket:id="copyUrl"
- class="input-group-addon"><i class="fa fa-clipboard"></i></a>
- </div>
- </div>
- </wicket:enclosure>
- <wicket:enclosure child="cloneSshUrl">
- <div class="clone form-inline hidden">
- <div class="input-group">
- <div class="input-group-addon">
- <b>Clone</b>
- </div>
- <input wicket:id="cloneSshUrl" readonly="readonly"
- class="form-control" /> <a wicket:id="copySshUrl"
- class="input-group-addon"><i class="fa fa-clipboard"></i></a>
- </div>
- <br />
- </div>
- <div class="clearfix">
- <div class="pull-left">
- <a href="#" id="sshHttpsSwitch">Use SSH</a>
- </div>
- <div class="pull-right hidden" id="noKeyWarning" wicket:id="noKeyWarning">
- <a href="#" class="text-warning" target="_blank" wicket:id="registerKey"
- title="To use SSH, you need to register a public key clicking here.">
- <i class="fa fa-shield" aria-hidden="true"></i>
- No SSH key found! Register it here.
- </a>
-
- </div>
- </div>
-
- </wicket:enclosure>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
index 541e738ea5..c510eb0562 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
@@ -5,11 +5,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel;
@@ -17,21 +14,15 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.search.entity.project.ProjectQueryLexer;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.MarkdownViewer;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
@@ -110,27 +101,6 @@ public abstract class ProjectInfoPanel extends Panel {
add(forkedFromLink);
}
- UrlManager urlManager = OneDev.getInstance(UrlManager.class);
-
- Model<String> cloneUrlModel = Model.of(urlManager.httpCloneUrlFor(getProject()));
- add(new TextField<String>("cloneUrl", cloneUrlModel)
- .setVisible(canReadCode));
- add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
-
- User loggedInUser = SecurityUtils.getUser();
- boolean userHasNoKeys = loggedInUser.getSshKeys().isEmpty();
- boolean isSshEnabled = ((BasePage)getPage()).isSshEnabled();
-
- Model<String> cloneSshUrlModel = Model.of(urlManager.sshCloneUrlFor(getProject()));
- add(new TextField<String>("cloneSshUrl", cloneSshUrlModel)
- .setVisible(isSshEnabled && canReadCode));
- add(new WebMarkupContainer("copySshUrl").add(new CopyClipboardBehavior(cloneSshUrlModel)));
-
- WebMarkupContainer noKeyWarning = new WebMarkupContainer("noKeyWarning");
- BookmarkablePageLink<Void> registerKey = new BookmarkablePageLink<Void>("registerKey", MySshKeysPage.class);
- noKeyWarning.add(registerKey);
-
- add(noKeyWarning.setVisible(userHasNoKeys));
}
private Project getProject() {
@@ -146,10 +116,7 @@ public abstract class ProjectInfoPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectInfoResourceReference()));
-
- response.render(JavaScriptHeaderItem.forReference(new ProjectInfoJsResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.projectInfo.onDomReady('sshHttpsSwitch');"));
+ response.render(CssHeaderItem.forReference(new ProjectInfoCssResourceReference()));
}
protected abstract void onPromptForkOption(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoResourceReference.java
deleted file mode 100644
index 0766bc1bf8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.info;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ProjectInfoResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectInfoResourceReference() {
- super(ProjectInfoResourceReference.class, "project-info.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
index f0949d83b8..bab008b271 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
@@ -1,43 +1,23 @@
.project-info {
- padding: 20px;
+ padding: 12px;
+ width: 360px;
}
.project-info>div {
- margin-bottom: 20px;
+ margin-bottom: 12px;
}
.project-info>div:last-child {
margin-bottom: 0;
}
-
-.project-info>.head {
- font-size: 16px;
+.project-info>.name {
font-weight: bold;
+ font-size: 16px;
}
-.project-info>.head>.name {
- margin-right: 4px;
-}
-.project-info>.head>.owner {
- margin-right: 20px;
-}
-
-.project-info>.head .forks {
+.project-info>.forks>.forks {
margin-right: 8px;
}
-
-.project-info>.forked-from {
- margin-top: -20px;
- font-size: 13px;
- color: #666;
-}
-
.project-info>.description {
border: 1px dashed #BBB;
padding: 20px 20px 10px 20px;
border-radius: 4px;
background: #F5F5F5;
}
-.project-info>.clone>.input-group {
- width: 100%;
-}
-.project-info>.clone input {
- background: white;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.js b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.js
deleted file mode 100644
index 422d849739..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.js
+++ /dev/null
@@ -1,34 +0,0 @@
-onedev.server.projectInfo = {
- selectedProtocol: '',
- cookieKey: 'onedev.server.projectInfo.selectedProtocol',
- onDomReady: function(switchId) {
- //by default we start with HTTPS protocol
- this.selectedProtocol = 'HTTPS';
- var savedProtocol = Cookies.get(this.cookieKey) || 'HTTPS';
-
- if (savedProtocol === 'SSH') {
- this.switchCloneURL(switchId);
- }
-
- //handle the 'switch protocol' click
- const projectInfo = this;
- $("#" + switchId).click(function() {
- projectInfo.switchCloneURL(switchId);
- });
- },
- switchCloneURL : function(switchId) {
- $(".clone").toggleClass('hidden');
- $("#noKeyWarning").toggleClass('hidden');
-
- var oldProtocol = this.selectedProtocol;
-
- if (this.selectedProtocol === 'HTTPS') {
- this.selectedProtocol = 'SSH';
- } else {
- this.selectedProtocol = 'HTTPS';
- }
-
- Cookies.set(this.cookieKey, this.selectedProtocol);
- $("#" + switchId).text('Use ' + oldProtocol);
- }
-};
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index 5aacb98e01..ed8cc55aaa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.project.pullrequests.detail.activities.activit
import java.util.List;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
@@ -22,10 +21,10 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.PersonIdentPanel;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -103,7 +102,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
item.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
- item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
+ item.add(new CopyToClipboardLink("copyHash", Model.of(commit.name())));
BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);
ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
index b00c97b181..9964f8db7d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
@@ -29,10 +29,10 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.EditParamsAware;
@@ -102,7 +102,7 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("targetHead", CommitDetailPage.class, params);
fragment.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getTargetHead())));
- fragment.add(new WebMarkupContainer("copyTargetHead").add(new CopyClipboardBehavior(Model.of(preview.getTargetHead()))));
+ fragment.add(new CopyToClipboardLink("copyTargetHead", Model.of(preview.getTargetHead())));
commitState = new CommitDetailPage.State();
commitState.revision = preview.getMerged();
@@ -110,7 +110,7 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam
hashLink = new ViewStateAwarePageLink<Void>("mergedCommit", CommitDetailPage.class, params);
fragment.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMerged())));
- fragment.add(new WebMarkupContainer("copyMergedCommit").add(new CopyClipboardBehavior(Model.of(preview.getMerged()))));
+ fragment.add(new CopyToClipboardLink("copyMergedCommit", Model.of(preview.getMerged())));
fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMerged())) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
index bd05abc548..d9acee8ef8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
@@ -29,7 +29,7 @@
<span wicket:id="contributor" class="contributor"></span>
</div>
<div class="actions">
- <a wicket:id="download" title="Download tag archive"><i class="fa fa-download"></i> Download</a>
+ <a wicket:id="download" title="Download tag archive"><i class="fa fa-download"></i> Download <i class="fa fa-caret-down"></i></a>
<a wicket:id="delete" title="Delete this tag"><i class="fa fa-trash"></i> Delete</a>
</div>
</wicket:fragment>
diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
index 4e03ca7253..8c7d0aea57 100644
--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
@@ -3,11 +3,14 @@ package io.onedev.server.product;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+
import javax.inject.Inject;
import javax.inject.Singleton;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
import org.glassfish.jersey.internal.guava.Preconditions;
+
import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.OneException;
@@ -62,13 +65,15 @@ public class DefaultServerConfig implements ServerConfig {
httpsPort = Integer.parseInt(httpsPortStr.trim());
if (httpPort == 0 && httpsPort == 0)
- throw new RuntimeException("Either " + PROP_HTTPPORT + " or " + PROP_HTTPSPORT + " or both should be enabled");
+ throw new OneException("Either " + PROP_HTTPPORT + " or " + PROP_HTTPSPORT + " or both should be enabled");
String sshPortStr = System.getenv(PROP_SSHPORT);
if (StringUtils.isBlank(sshPortStr))
sshPortStr = props.getProperty(PROP_SSHPORT);
if (StringUtils.isNotBlank(sshPortStr))
sshPort = Integer.parseInt(sshPortStr.trim());
+ else
+ throw new OneException(PROP_SSHPORT + " should be specified");
String keystore = System.getenv(PROP_KEYSTORE);
if (StringUtils.isBlank(keystore))
@@ -122,7 +127,7 @@ public class DefaultServerConfig implements ServerConfig {
if (StringUtils.isNotBlank(sessionTimeoutStr))
sessionTimeout = Integer.parseInt(sessionTimeoutStr.trim());
else
- throw new RuntimeException(PROP_SESSION_TIMEOUT + " should be specified");
+ throw new OneException(PROP_SESSION_TIMEOUT + " should be specified");
}
@Override
diff --git a/server-product/system/conf/server.properties b/server-product/system/conf/server.properties
index 2c6e1bcc2b..b987d93fae 100644
--- a/server-product/system/conf/server.properties
+++ b/server-product/system/conf/server.properties
@@ -8,7 +8,7 @@ session_timeout=1800
http_port=6610
# Specify port for embedded ssh server that will enable ssh based services such as
-# git over ssh. Comment to disable ssh access
+# git over ssh
ssh_port=6611
# Uncomment below properties to enable https support