The Unified and Autonomous Development Platform
Merged pull request #2
Robin Shen8305bf487bb2
diff --cc server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 082818d5d4,cef358a528..945ae6b512--- 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@@@ -98,7 -99,12 +99,12 @@@ public abstract class UserPage extendstabs.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("Build Setting", "fa fa-fw fa-cubes", UserJobSecretsPage.class, UserBuildSettingPage.class));+ tabs.add(new UserTab("Build Setting", "fa fa-fw fa-play-circle", UserJobSecretsPage.class, UserBuildSettingPage.class));tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.class));return tabs;diff --cc server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 4cbe3879ee,1d9c1f5137..c5112eb276--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@@ -64,7 -65,8 +65,8 @@@<li wicket:id="myProfile"><a wicket:id="link"><i class="fa fa-fw fa-list-alt"></i> My Profile</a></li><li wicket:id="myAvatar"><a wicket:id="link"><i class="fa fa-fw fa-picture-o"></i> Edit Avatar</a></li><li wicket:id="myPassword"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Change Password</a></li>+ <li wicket:id="mySshKeys"><a wicket:id="link"><i class="fa fa-fw fa-shield"></i> Ssh Keys</a></li>- <li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-cubes"></i> Build Setting</a></li>+ <li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-play-circle"></i> Build Setting</a></li><li wicket:id="myWebHooks"><a wicket:id="link"><i class="fa fa-fw fa-volume-up"></i> Web Hooks</a></li><li role="separator" class="divider"></li><li><a wicket:id="signOut"><i class="fa fa-fw fa-sign-out"></i> <span wicket:id="label"></span></a></li>diff --cc server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 25d1c708fe,a096e6aa8f..a867dfbb79--- 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@@@ -112,10 -114,16 +114,16 @@@ public abstract class LayoutPage extenditem.add(new ViewStateAwarePageLink<Void>("link", AuthenticatorPage.class));if (getPage() instanceof AuthenticatorPage)item.add(AttributeAppender.append("class", "active"));-++ administrationContainer.add(item = new WebMarkupContainer("sshSetting"));+ 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", JobExecutorPage.class));- if (getPage() instanceof JobExecutorPage)+ item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorsPage.class));+ if (getPage() instanceof JobExecutorsPage)item.add(AttributeAppender.append("class", "active"));administrationContainer.add(item = new WebMarkupContainer("groovyScripts"));