The Unified and Autonomous Development Platform
Added a hint on ProjectInfoPanel to help users to register their ssh public key if they haven't done it yet.
Andrea Del Bene528115b78b7a
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.htmlindex 4d83bac124..1a515f60a8 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,38 +1,62 @@<wicket:panel>- <div class="project-info">+ <div class="project-info" id="project-info"><div class="head clearfix"><div wicket:id="name" class="name pull-left"></div>- <div class="owner pull-left">(owner: <a wicket:id="owner"></a>)</div>+ <div class="owner pull-left">+ (owner: <a wicket:id="owner"></a>)+ </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>-+<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="forked-from">+ forked from <a wicket:id="forkedFrom"><span wicket:id="label"></span></a>+ </div>+ </wicket:enclosure>+<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 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>+ <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 text-info" wicket:id="noKeyWarning">+ <a href="#" target="_blank" wicket:id="registerKey"+ title="To use SSH, register a public key here.">+ <i class="fa fa-shield" aria-hidden="true"></i>+ Register your SSH key+ </a>++ </div></div>- <a href="#" id="sshHttpsSwitch">Use SSH</a>+</wicket:enclosure></div></wicket:panel>\ No newline at end of filediff --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.javaindex 615b84b731..0b3b258683 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@@ -32,6 +32,7 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.page.my.profile.MyProfilePage;+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;@@ -53,10 +54,12 @@ public abstract class ProjectInfoPanel extends Panel {add(new Label("name", getProject().getName()));User owner = getProject().getOwner();- if (SecurityUtils.isAdministrator()) {+ User loggedInUser = SecurityUtils.getUser();++ if (SecurityUtils.isAdministrator()) {add(new ViewStateAwarePageLink<Void>("owner", UserProfilePage.class, UserProfilePage.paramsOf(owner)).setBody(Model.of(owner.getDisplayName())));- } else if (owner.equals(SecurityUtils.getUser())) {+ } else if (owner.equals(loggedInUser)) {add(new ViewStateAwarePageLink<Void>("owner", MyProfilePage.class).setBody(Model.of(owner.getDisplayName())));} else {@@ -136,12 +139,19 @@ public abstract class ProjectInfoPanel extends Panel {.setVisible(canReadCode));add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));+ boolean userHasNoKeys = loggedInUser.getSshKeys().isEmpty();boolean isSshEnabled = OneWebApplication.get().isSshEnabled();Model<String> cloneSshUrlModel = Model.of(urlManager.sshUrlFor(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() {