The Unified and Autonomous Development Platform
Enhance top navigation area to work with mobile devices
Robin Shen694ea6e464af
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 9852cea0c3..390f9fa638 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -16,12 +16,11 @@ import io.onedev.server.web.page.admin.group.GroupListPage;import io.onedev.server.web.page.admin.group.GroupMembershipsPage;import io.onedev.server.web.page.admin.group.GroupProfilePage;import io.onedev.server.web.page.admin.group.NewGroupPage;-import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;+import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;+import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;-import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;-import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;@@ -155,7 +154,6 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/server-log", ServerLogPage.class));add(new OnePageMapper("administration/server-information", ServerInformationPage.class));- add(new OnePageMapper("administration/license-management", LicenseManagementPage.class));}private void addProjectPages() {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.htmlindex 1d3bd98d78..249a8cbd7c 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html@@ -1,8 +1,5 @@<wicket:extend><div id="administration">- <div wicket:id="sidebar"></div>- <div class="content">- <wicket:child></wicket:child>- </div>+ <wicket:child></wicket:child></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.javaindex 3b6acf5ff2..6d0eeaf4e4 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java@@ -1,31 +1,9 @@package io.onedev.server.web.page.admin;-import java.util.ArrayList;-import java.util.List;-import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.sidebar.SideBar;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;-import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;-import io.onedev.server.web.page.admin.group.GroupListPage;-import io.onedev.server.web.page.admin.group.GroupPage;-import io.onedev.server.web.page.admin.group.NewGroupPage;-import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;-import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;-import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;-import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;-import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;-import io.onedev.server.web.page.admin.serverlog.ServerLogPage;-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;-import io.onedev.server.web.page.admin.user.NewUserPage;-import io.onedev.server.web.page.admin.user.UserListPage;-import io.onedev.server.web.page.admin.user.UserPage;import io.onedev.server.web.page.layout.LayoutPage;@SuppressWarnings("serial")@@ -39,27 +17,6 @@ public abstract class AdministrationPage extends LayoutPage {@Overrideprotected void onInitialize() {super.onInitialize();-- add(new SideBar("sidebar", "administration.miniSidebar") {-- @Override- protected List<? extends Tab> newTabs() {- List<PageTab> tabs = new ArrayList<>();- tabs.add(new AdministrationTab("User Management", "fa fa-fw fa-user", UserListPage.class, NewUserPage.class, UserPage.class));- tabs.add(new AdministrationTab("Group Management", "fa fa-fw fa-group", GroupListPage.class, NewGroupPage.class, GroupPage.class));- tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));- tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));- tabs.add(new AdministrationTab("Issue Setting", "fa fa-fw fa-bug", IssueFieldListPage.class, GlobalIssueSettingPage.class));- tabs.add(new AdministrationTab("External Authentication", "fa fa-fw fa-key", AuthenticatorPage.class));- tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));- tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));- tabs.add(new AdministrationTab("Server Log", "fa fa-fw fa-file-text-o", ServerLogPage.class));- tabs.add(new AdministrationTab("Server Information", "fa fa-fw fa-desktop", ServerInformationPage.class));- tabs.add(new AdministrationTab("License Management", "fa fa-fw fa-vcard-o", LicenseManagementPage.class));- return tabs;- }-- });}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.html b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.htmldeleted file mode 100644index f9086e7c60..0000000000--- a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label" class="text"></span></a>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/administration.css b/core/src/main/java/io/onedev/server/web/page/admin/administration.cssindex 6ac77ca275..9591e7e6f4 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/administration.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/administration.css@@ -2,6 +2,10 @@margin-bottom: 20px;}+#administration>.server-information>.page-title {+ border-bottom: none;+ margin-bottom: 0;+}.server-information table td {padding: 8px;font-size: 13px;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.htmlindex f48ac9870d..cea9cbd9fa 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html@@ -1,9 +1,10 @@<wicket:extend>+ <div class="page-title">External Authentication</div><form wicket:id="authenticator" class="authenticator leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting"></input>- <input wicket:id="test" type="submit" class="btn btn-primary" value="Test setting"></input>+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting">+ <input wicket:id="test" type="submit" class="btn btn-primary" value="Test setting"></div></form><wicket:fragment wicket:id="testFrag">diff --git a/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html b/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.htmlindex c248a1edf6..b623d67908 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Database Backup</div><div class="database-backup"><div class="alert alert-info">OneDev stores project meta data into database, and <b>its backup/restore will not affect git repositories</b>.@@ -7,7 +8,7 @@<form wicket:id="backupSetting" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save setting"></input>+ <input type="submit" class="btn btn-primary dirty-aware" value="Save setting"><a wicket:id="backupNow" class="btn btn-primary">Backup now</a></div></form>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.htmlindex 9440edc6b5..dc0b24a667 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html@@ -1,11 +1,12 @@<wicket:extend>+ <div class="page-title">Group Authorizations</div><div class="authorization list"><div class="head clearfix"><div class="pull-left clearable-wrapper">- <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input>+ <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></div><div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>+ <input wicket:id="addNew" type="hidden" class="form-control"></div><div class="pull-left"><a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.htmlindex 3f675f3446..6cdf0916e8 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html@@ -1,8 +1,9 @@<wicket:extend>+ <div class="page-title">Group Administration</div><div class="group list"><div class="head clearfix"><div class="pull-left clearable-wrapper">- <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name"></input>+ <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name"></div><div class="pull-left"><a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Group</a>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.htmlindex 2e50193f50..cdd5bc53a6 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Group Memberships</div><div class="membership list"><div class="head clearfix"><div class="pull-left clearable-wrapper">diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.htmlindex b8d098defd..ec8587f6c6 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html@@ -5,4 +5,14 @@<wicket:child></wicket:child></div></div>+ <wicket:fragment wicket:id="navContextFrag">+ <a wicket:id="dropdown" class="dropdown group-dropdown">+ <i class="fa fa-group"></i>+ <span wicket:id="name" class="ellipsis-text"></span>+ <i class="fa fa-angle-down"></i>+ </a>+ </wicket:fragment>+ <wicket:fragment wicket:id="navContextDropdownFrag">+ <ul wicket:id="menu" class="menu list-unstyled"></ul>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex 76704f29a6..0627da0518 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -4,19 +4,26 @@ import java.util.ArrayList;import java.util.List;import org.apache.wicket.Component;+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.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;import io.onedev.server.manager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.util.model.EntityModel;@@ -42,23 +49,53 @@ public abstract class GroupPage extends AdministrationPage {@Overrideprotected Component newHead(String componentId) {- return new Label(componentId, getGroup().getName());+ String content = "<i class='fa fa-group'></i> " + HtmlEscape.escapeHtml5(getGroup().getName());+ return new Label(componentId, content).setEscapeModelStrings(false);}@Overrideprotected List<? extends Tab> newTabs() {- List<PageTab> tabs = new ArrayList<>();-- tabs.add(new GroupTab("Profile", "fa fa-fw fa-list-alt", GroupProfilePage.class));- tabs.add(new GroupTab("Members", "fa fa-fw fa-user", GroupMembershipsPage.class));- if (SecurityUtils.isAdministrator() && !getGroup().isAdministrator())- tabs.add(new GroupTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", GroupAuthorizationsPage.class));- return tabs;+ return GroupPage.this.newTabs();}});}++ private List<? extends Tab> newTabs() {+ List<PageTab> tabs = new ArrayList<>();++ tabs.add(new GroupTab("Profile", "fa fa-fw fa-list-alt", GroupProfilePage.class));+ tabs.add(new GroupTab("Members", "fa fa-fw fa-user", GroupMembershipsPage.class));+ if (SecurityUtils.isAdministrator() && !getGroup().isAdministrator())+ tabs.add(new GroupTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", GroupAuthorizationsPage.class));+ return tabs;+ }+ @Override+ protected Component newNavContext(String componentId) {+ Fragment fragment = new Fragment(componentId, "navContextFrag", this);+ DropdownLink link = new DropdownLink("dropdown", AlignPlacement.bottom(15)) {++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ super.onInitialize(dropdown);+ dropdown.add(AttributeAppender.append("class", "nav-context-dropdown user-nav-context-dropdown"));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "navContextDropdownFrag", GroupPage.this);+ fragment.add(new Tabbable("menu", newTabs()));+ return fragment;+ }++ };+ link.add(new Label("name", getGroup().getName()));+ fragment.add(link);++ return fragment;+ }+@Overrideprotected void onDetach() {groupModel.detach();diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.htmlindex 6c5c209fea..14cde65396 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Group Profile</div><div wicket:id="content" class="profile"></div><wicket:fragment wicket:id="editFrag"><form wicket:id="form" class="leave-confirm">diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.htmlindex 7a9c13bf11..a8db476ba4 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">New Group</div><div class="new-group"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>@@ -15,7 +16,7 @@</label></div><div class="actions clearfix">- <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></div></form></div>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/group.css b/core/src/main/java/io/onedev/server/web/page/admin/group/group.cssindex d271321c8e..bafd18bd52 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/group.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/group.css@@ -1,5 +1,12 @@+@media(max-width: 768px) {+ #group>.sidebar {+ display: none;+ }+ #group>.sidebar+.content {+ padding-left: 0;+ }+}#group>.sidebar {- left: 240px;background: white;border-left: none;/* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.htmlindex cdc3b18356..c2e99b3a3f 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Issue Setting</div><div id="issue-setting"><ul wicket:id="issueSettingTabs" class="tabs nav nav-tabs"></ul><wicket:child></wicket:child>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html b/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.htmldeleted file mode 100644index 56d8dcb640..0000000000--- a/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html+++ /dev/null@@ -1,56 +0,0 @@-<wicket:extend>- <div class="license-management panel panel-default">- <div class="panel-heading">- <h4 class="panel-title">Current License</h4>- </div>- <div class="panel-body">- <div wicket:id="licenseDetail"></div>- </div>- </div>- <div class="actions">- <a wicket:id="inputLicenseKey" class="btn btn-primary">Install New License</a>- <a wicket:id="removeLicense" class="btn btn-danger">Remove Current License</a>- </div>- <wicket:fragment wicket:id="licenseDetailFrag">- <div class="license-detail">- <div wicket:id="expiredNotice" class="expired alert alert-danger"></div>- <div wicket:id="aboutToExpireNotice" class="about-to-expire alert alert-warning"></div>- <table class="properties">- <tr>- <td class="name">Users</td>- <td wicket:id="users" class="value"></td>- </tr>- <tr>- <td class="name">Issue Date</td>- <td wicket:id="issueDate" class="value"></td>- </tr>- <tr>- <td class="name">Expiration Date</td>- <td wicket:id="expirationDate" class="value"></td>- </tr>- <tr>- <td class="name">Issue Account</td>- <td wicket:id="issueAccount" class="value"></td>- </tr>- </table>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="licenseKeyInputFrag">- <form wicket:id="form" class="credit-key-input">- <div class="modal-header">- <button wicket:id="close" type="button" class="close">×</button>- <h4 class="modal-title">Input License Key</h4>- </div>- <div class="modal-body">- <div wicket:id="feedback"></div>- <textarea wicket:id="licenseKey" rows="10" class="form-control"></textarea>- <p class="help-block">License key can be generated from account at- <a href="https://www.onedev.io">onedev.io</a>- </div>- <div class="modal-footer">- <button wicket:id="ok" class="btn btn-primary">Ok</button>- <button wicket:id="cancel" class="btn btn-default">Cancel</button>- </div>- </form>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java b/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.javadeleted file mode 100644index db2956eb49..0000000000--- a/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java+++ /dev/null@@ -1,226 +0,0 @@-package io.onedev.server.web.page.admin.licensemanagement;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.joda.time.DateTime;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;-import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.Constants;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.web.util.ConfirmOnClick;-import io.onedev.utils.license.LicenseDetail;--@SuppressWarnings("serial")-public class LicenseManagementPage extends AdministrationPage {-- private static final String LICENSE_DETAIL_ID = "licenseDetail";-- private String licenseKey;-- private final IModel<LicenseDetail> licenseModel = new LoadableDetachableModel<LicenseDetail>() {-- @Override- protected LicenseDetail load() {- return OneDev.getInstance(SettingManager.class).getLicense();- }-- };-- private final IModel<Integer> userCountModel = new LoadableDetachableModel<Integer>() {-- @Override- protected Integer load() {- return OneDev.getInstance(UserManager.class).count(EntityCriteria.of(User.class));- }-- };-- @Override- protected void onInitialize() {- super.onInitialize();-- LicenseDetail licenseDetail = getLicense();- if (licenseDetail != null) {- Fragment fragment = new Fragment(LICENSE_DETAIL_ID, "licenseDetailFrag", this);- fragment.add(new Label("expiredNotice", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return String.format("License was expired. The free %d-user license is now taking effect",- LicenseDetail.FREE_LICENSE_USERS);- }-- }).setVisible(licenseDetail.getRemainingDays()<0).setEscapeModelStrings(false));-- fragment.add(new Label("aboutToExpireNotice", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- if (getUserCount() > LicenseDetail.FREE_LICENSE_USERS) {- return String.format(""- + "License will expire in %d days. The free %d-user license will take effect "- + "after expiration", licenseDetail.getRemainingDays(), LicenseDetail.FREE_LICENSE_USERS);- } else {- return String.format("License will expire in %d days, The free %d-user license will take "- + "effect after expiration", licenseDetail.getRemainingDays(),- LicenseDetail.FREE_LICENSE_USERS);- }- }-- }).setVisible(licenseDetail.getRemainingDays()>=0 && licenseDetail.getRemainingDays() < LicenseDetail.ABOUT_TO_EXPIRE_DAYS).setEscapeModelStrings(false));-- String usersInfo = String.format("%d free + %d licensed (<a href=\"https://www.onedev.io/purchase\">add more</a>)",- LicenseDetail.FREE_LICENSE_USERS, licenseDetail.getLicensedUsers());- fragment.add(new Label("users", usersInfo).setEscapeModelStrings(false));- fragment.add(new Label("issueDate",- Constants.DATE_FORMATTER.print(new DateTime(licenseDetail.getIssueDate()))));- fragment.add(new Label("expirationDate",- Constants.DATE_FORMATTER.print(new DateTime(licenseDetail.getExpirationDate())) + " (<a href=\"https://www.onedev.io/purchase\">renew</a>)").setEscapeModelStrings(false));- fragment.add(new Label("issueAccount", licenseDetail.getIssueAccount()));- add(fragment);- } else {- if (getUserCount() > LicenseDetail.FREE_LICENSE_USERS) {- String message = String.format(""- + "Free %d-user license. <a href=\"https://www.onedev.io/purchase\">Add additional users</a>",- LicenseDetail.FREE_LICENSE_USERS);- add(new Label(LICENSE_DETAIL_ID, message).setEscapeModelStrings(false));- } else {- String message = String.format(""- + "Free %d-user license. <a href=\"https://www.onedev.io/purchase\">Add additional users</a>",- LicenseDetail.FREE_LICENSE_USERS);- add(new Label(LICENSE_DETAIL_ID, message).setEscapeModelStrings(false));- }- }-- add(new ModalLink("inputLicenseKey") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- Fragment fragment = new Fragment(id, "licenseKeyInputFrag", LicenseManagementPage.this);- licenseKey = null;- Form<?> form = new Form<Void>("form");- form.add(new TextArea<String>("licenseKey", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return licenseKey;- }-- @Override- public void setObject(String object) {- licenseKey = object;- }-- }));-- NotificationPanel feedback = new NotificationPanel("feedback", fragment);- feedback.setOutputMarkupId(true);- form.add(feedback);-- form.add(new AjaxButton("ok") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- if (licenseKey == null) {- error("Please input license key");- target.add(feedback);- } else {- LicenseDetail license = LicenseDetail.decode(licenseKey);- if (license == null) {- error("Invalid license key");- target.add(feedback);- } else {- OneDev.getInstance(SettingManager.class).saveLicense(license);- setResponsePage(LicenseManagementPage.class);- getSession().success("License key applied successfully");- }- }- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- modal.close();- }-- });-- form.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- modal.close();- }-- });-- fragment.add(form);-- return fragment;- }-- });-- String confirmMessage = String.format(""- + "The free-%d user license will take effect after removal. Do you really want to continue?",- LicenseDetail.FREE_LICENSE_USERS);- add(new Link<Void>("removeLicense") {-- @Override- public void onClick() {- OneDev.getInstance(SettingManager.class).saveLicense(null);- setResponsePage(LicenseManagementPage.class);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLicense() != null);- }-- }.add(new ConfirmOnClick(confirmMessage)));- }-- @Nullable- private LicenseDetail getLicense() {- return licenseModel.getObject();- }-- private int getUserCount() {- return userCountModel.getObject();- }-- @Override- protected void onDetach() {- userCountModel.detach();- licenseModel.detach();- super.onDetach();- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.htmlindex c2d3bba848..6ceac5fddd 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Mail Setting</div><form wicket:id="mailSetting" class="mail-setting leave-confirm"><div wicket:id="editor"></div><div class="actions">diff --git a/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html b/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.htmlindex 2934a144ad..6a37f8f7c5 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html@@ -1,9 +1,10 @@<wicket:extend>+ <div class="page-title">Security Setting</div><div class="security-setting"><form wicket:id="securitySetting" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save setting"></input>+ <input type="submit" class="btn btn-primary dirty-aware" value="Save setting"></div></form></div>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html b/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.htmlindex 2458dc6a5a..95e18dd484 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html@@ -1,5 +1,6 @@<wicket:extend><div class="server-information">+ <div class="page-title">Server Information</div><table class="table"><tbody><tr>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html b/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.htmlindex 72d7000ae5..b679fdac76 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Server Log</div><div class="server-log"><div class="head"><a wicket:id="download" class="btn btn-default"><i class="fa fa-download"></i> Download Full Log</a>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html b/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.htmlindex 93d5690ba1..135e9a6c03 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">System Setting</div><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.htmlindex 48821d1228..c88926dee7 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">New User</div><div class="new-user"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.htmlindex 1d4864de78..ab5d5d9c17 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html@@ -1,11 +1,12 @@<wicket:extend>+ <div class="page-title">Authorized Projects</div><div class="authorization list"><div class="head clearfix"><div class="pull-left clearable-wrapper">- <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input>+ <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></div><div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>+ <input wicket:id="addNew" type="hidden" class="form-control"></div><div class="pull-left"><a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.htmlindex b969f3a480..595b71fe8a 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">User Administration</div><div class="user list"><div class="head clearfix"><div class="pull-left clearable-wrapper">diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.htmlindex 5b54f5e911..836484e4a9 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.html@@ -1,11 +1,12 @@<wicket:extend>+ <div class="page-title">Belonging Groups</div><div class="membership list"><div class="head clearfix"><div class="pull-left clearable-wrapper">- <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by group name"></input>+ <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by group name"></div><div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>+ <input wicket:id="addNew" type="hidden" class="form-control"></div><div class="pull-left"><a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.htmlindex 3bb3a75b12..3537051def 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html@@ -9,4 +9,14 @@<img wicket:id="avatar"><span wicket:id="name"></span></wicket:fragment>+ <wicket:fragment wicket:id="navContextFrag">+ <a wicket:id="dropdown" class="dropdown user-dropdown">+ <img wicket:id="avatar">+ <span wicket:id="name" class="ellipsis-text"></span>+ <i class="fa fa-angle-down"></i>+ </a>+ </wicket:fragment>+ <wicket:fragment wicket:id="navContextDropdownFrag">+ <ul wicket:id="menu" class="menu list-unstyled"></ul>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 20b2ea68ea..ad91a14da2 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -16,12 +16,16 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.util.model.EntityModel;@SuppressWarnings("serial")@@ -53,21 +57,25 @@ public abstract class UserPage extends AdministrationPage {@Overrideprotected List<? extends Tab> newTabs() {- List<PageTab> tabs = new ArrayList<>();-- tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));- tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", UserAvatarPage.class));-- tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));- tabs.add(new UserTab("Access Token", "fa fa-fw fa-ticket", UserTokenPage.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));-- return tabs;+ return UserPage.this.newTabs();}});}++ private List<? extends Tab> newTabs() {+ List<PageTab> tabs = new ArrayList<>();++ tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));+ tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", UserAvatarPage.class));++ tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));+ tabs.add(new UserTab("Access Token", "fa fa-fw fa-ticket", UserTokenPage.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));++ return tabs;+ }@Overrideprotected void onDetach() {@@ -76,6 +84,32 @@ public abstract class UserPage extends AdministrationPage {super.onDetach();}+ @Override+ protected Component newNavContext(String componentId) {+ Fragment fragment = new Fragment(componentId, "navContextFrag", this);+ DropdownLink link = new DropdownLink("dropdown", AlignPlacement.bottom(15)) {++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ super.onInitialize(dropdown);+ dropdown.add(AttributeAppender.append("class", "nav-context-dropdown user-nav-context-dropdown"));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "navContextDropdownFrag", UserPage.this);+ fragment.add(new Tabbable("menu", newTabs()));+ return fragment;+ }++ };+ link.add(new UserAvatar("avatar", UserIdent.of(getUser().getFacade())));+ link.add(new Label("name", getUser().getDisplayName()));+ fragment.add(link);++ return fragment;+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.htmlindex d93f935cce..9c2faa12fe 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.html@@ -1,3 +1,4 @@<wicket:extend>+ <div class="page-title">Change Password</div><div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.htmlindex d93f935cce..b9040d9cbf 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.html@@ -1,3 +1,4 @@<wicket:extend>+ <div class="page-title">User Profile</div><div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.htmlindex d93f935cce..8fe73e67ec 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html@@ -1,3 +1,4 @@<wicket:extend>+ <div class="page-title">Access Token</div><div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/user.css b/core/src/main/java/io/onedev/server/web/page/admin/user/user.cssindex f06cbb6455..d0da9dea83 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/user.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/user.css@@ -1,5 +1,16 @@+@media(max-width: 768px) {+ #user>.sidebar {+ display: none;+ }+ #user>.sidebar+.content {+ padding-left: 0;+ }+}+.nav-context .user-dropdown .avatar {+ width: 24px;+ height: 24px;+}#user>.sidebar {- left: 240px;background: white;border-left: none;/* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html b/core/src/main/java/io/onedev/server/web/page/base/BasePage.htmlindex ef5bfa5945..cfd12564de 100644--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.html@@ -13,6 +13,7 @@<link rel="apple-touch-icon-precomposed" href="/img/apple-touch-icon.png"/></head><body>+ <script wicket:id="script" type="application/javascript"></script><wicket:child></wicket:child><div wicket:id="sessionFeedback" id="session-feedback"></div>diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex daf2e43149..41200681b0 100644--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -117,6 +117,15 @@ public abstract class BasePage extends WebPage {}});++ StringBuilder builder = new StringBuilder();+ Class<?> clazz = getClass();+ while (clazz != BasePage.class) {+ builder.append(clazz.getSimpleName()).append(" ");+ clazz = clazz.getSuperclass();+ }+ String script = String.format("$('body').addClass('%s');", builder.toString());+ add(new Label("script", script).setEscapeModelStrings(false));add(new AbstractPostAjaxBehavior() {diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 7089b263c7..a50be05b7d 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -3,27 +3,44 @@<nav class="navbar navbar-fixed-top navbar-inverse"><div class="container-fluid"><div class="navbar-header">- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand" href="https://onedev.io">- <img alt="Brand" src="/img/logo.png">- </a>- </div>+ <img alt="Brand" src="/img/logo.png">+ <div class="separator"></div>+ </a>+ <div wicket:id="navContext" class="nav-context"></div>+ </div><div class="collapse navbar-collapse" id="navbar-collapse"><ul class="nav navbar-nav tabs"><li wicket:id="navProjects"><a wicket:id="link">Projects</a></li>- <li wicket:id="navContributions"><a wicket:id="link"><span wicket:id="label"></span></a></li>- <li wicket:id="navAdministration"><a wicket:id="link">Administration</a></li>- <li wicket:id="navMy"><a wicket:id="link">My</a></li>+ <li wicket:id="navContributions"><a wicket:id="link"><span wicket:id="label"></span></a></li>+ <li wicket:id="navAdministration" class="dropdown">+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Administration <i class="fa fa-angle-down"></i></a>+ <ul class="dropdown-menu">+ <li wicket:id="userManagement"><a wicket:id="link"><i class="fa fa-fw fa-user"></i> User Management</a></li>+ <li wicket:id="groupManagement"><a wicket:id="link"><i class="fa fa-fw fa-group"></i> Group Management</a></li>+ <li role="separator" class="divider"></li>+ <li wicket:id="securitySetting"><a wicket:id="link"><i class="fa fa-fw fa-lock"></i> Security Setting</a></li>+ <li wicket:id="externelAuthentication"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Externel Authentication</a></li>+ <li role="separator" class="divider"></li>+ <li wicket:id="systemSetting"><a wicket:id="link"><i class="fa fa-fw fa-sliders"></i> System Setting</a></li>+ <li wicket:id="issueSetting"><a wicket:id="link"><i class="fa fa-fw fa-bug"></i> Issue Setting</a></li>+ <li wicket:id="mailSetting"><a wicket:id="link"><i class="fa fa-fw fa-envelope"></i> Mail Setting</a></li>+ <li role="separator" class="divider"></li>+ <li wicket:id="databaseBackup"><a wicket:id="link"><i class="fa fa-fw fa-database"></i> Database Backup</a></li>+ <li wicket:id="serverLog"><a wicket:id="link"><i class="fa fa-fw fa-file-text-o"></i> Server Log</a></li>+ <li wicket:id="serverInformation"><a wicket:id="link"><i class="fa fa-fw fa-desktop"></i> Server Information</a></li>+ </ul>+ </li></ul><ul class="nav navbar-nav navbar-right">- <li class="dropdown">- <a href="#" class="dropdown-toggle expanded" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle"></i> <i class="fa fa-angle-down"></i></a>- <a href="#" class="dropdown-toggle collapsed" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help <i class="fa fa-angle-down"></i></a>+ <li class="dropdown help">+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle icon"></i> <span class="name">Help</span> <i class="fa fa-angle-down"></i></a><ul class="dropdown-menu"><li wicket:id="productVersion" class="dropdown-header"></li><li role="separator" class="divider"></li>@@ -37,17 +54,19 @@<li><a wicket:id="signUp">Sign Up</a></li></wicket:enclosure></wicket:container>- <wicket:container wicket:id="signedIn">- <li class="dropdown">- <a href="#" class="dropdown-toggle avatar expanded" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img wicket:id="avatar"/> <i class="fa fa-angle-down"></i></a>- <a href="#" class="dropdown-toggle collapsed" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span wicket:id="userNameCollapsed"></span> <i class="fa fa-angle-down"></i></a>+ <li wicket:id="navSignedIn" class="dropdown signed-in">+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span> <i class="fa fa-angle-down"></i></a><ul class="dropdown-menu">- <li wicket:id="userNameExpanded" class="dropdown-header expanded"></li>- <li role="separator" class="divider expanded"></li>- <li><a wicket:id="signOut">Sign Out</a></li>+ <li wicket:id="header" class="dropdown-header"></li>+ <li role="separator" class="divider"></li>+ <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="myAccessToken"><a wicket:id="link"><i class="fa fa-fw fa-ticket"></i> Access Token</a></li>+ <li role="separator" class="divider"></li>+ <li><a wicket:id="signOut"><i class="fa fa-fw fa-sign-out"></i> Sign Out</a></li></ul></li>- </wicket:container></ul></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex dddef62237..032324b10f 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -5,6 +5,7 @@ import java.util.Collections;import java.util.Comparator;import java.util.List;+import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;@@ -23,20 +24,37 @@ import io.onedev.server.manager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;+import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;+import io.onedev.server.web.page.admin.group.GroupListPage;+import io.onedev.server.web.page.admin.group.GroupPage;+import io.onedev.server.web.page.admin.group.NewGroupPage;+import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;+import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;+import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;+import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;+import io.onedev.server.web.page.admin.serverlog.ServerLogPage;+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;+import io.onedev.server.web.page.admin.user.NewUserPage;import io.onedev.server.web.page.admin.user.UserListPage;+import io.onedev.server.web.page.admin.user.UserPage;import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.my.MyPage;+import io.onedev.server.web.page.my.MyPasswordPage;import io.onedev.server.web.page.my.MyProfilePage;+import io.onedev.server.web.page.my.MyTokenPage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;import io.onedev.server.web.page.security.RegisterPage;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {@@ -54,6 +72,8 @@ public abstract class LayoutPage extends BasePage {User loginUser = getLoginUser();+ add(newNavContext("navContext"));+WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage || getPage() instanceof NewProjectPage)@@ -85,15 +105,59 @@ public abstract class LayoutPage extends BasePage {}add(contributionsView);- WebMarkupContainer myContainer = new WebMarkupContainer("navMy");- myContainer.add(new ViewStateAwarePageLink<Void>("link", MyProfilePage.class));- if (getPage() instanceof MyPage)- myContainer.add(AttributeAppender.append("class", "active"));- myContainer.setVisible(loginUser != null);- add(myContainer);-WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");- administrationContainer.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));+ WebMarkupContainer item;++ administrationContainer.add(item = new WebMarkupContainer("userManagement"));+ item.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));+ if (getPage() instanceof UserListPage || getPage() instanceof NewUserPage || getPage() instanceof UserPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("groupManagement"));+ item.add(new ViewStateAwarePageLink<Void>("link", GroupListPage.class));+ if (getPage() instanceof GroupListPage || getPage() instanceof NewGroupPage || getPage() instanceof GroupPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("securitySetting"));+ item.add(new ViewStateAwarePageLink<Void>("link", SecuritySettingPage.class));+ if (getPage() instanceof SecuritySettingPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("externelAuthentication"));+ item.add(new ViewStateAwarePageLink<Void>("link", AuthenticatorPage.class));+ if (getPage() instanceof AuthenticatorPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("systemSetting"));+ item.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));+ if (getPage() instanceof SystemSettingPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("issueSetting"));+ item.add(new ViewStateAwarePageLink<Void>("link", IssueFieldListPage.class));+ if (getPage() instanceof GlobalIssueSettingPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("mailSetting"));+ item.add(new ViewStateAwarePageLink<Void>("link", MailSettingPage.class));+ if (getPage() instanceof MailSettingPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("databaseBackup"));+ item.add(new ViewStateAwarePageLink<Void>("link", DatabaseBackupPage.class));+ if (getPage() instanceof DatabaseBackupPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("serverLog"));+ item.add(new ViewStateAwarePageLink<Void>("link", ServerLogPage.class));+ if (getPage() instanceof ServerLogPage)+ item.add(AttributeAppender.append("class", "active"));++ administrationContainer.add(item = new WebMarkupContainer("serverInformation"));+ item.add(new ViewStateAwarePageLink<Void>("link", ServerInformationPage.class));+ if (getPage() instanceof ServerInformationPage)+ item.add(AttributeAppender.append("class", "active"));+if (getPage() instanceof AdministrationPage)administrationContainer.add(AttributeAppender.append("class", "active"));administrationContainer.setVisible(SecurityUtils.isAdministrator());@@ -118,12 +182,36 @@ public abstract class LayoutPage extends BasePage {notSignedInContainer.setVisible(loginUser == null);add(notSignedInContainer);- WebMarkupContainer signedInContainer = new WebMarkupContainer("signedIn");+ WebMarkupContainer signedInContainer = new WebMarkupContainer("navSignedIn");signedInContainer.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(loginUser))));- signedInContainer.add(new Label("userNameExpanded", loginUser!=null?loginUser.getDisplayName():""));- signedInContainer.add(new Label("userNameCollapsed", loginUser!=null?loginUser.getDisplayName():""));+ signedInContainer.add(new Label("name", loginUser!=null?loginUser.getDisplayName():""));+ signedInContainer.add(new Label("header", loginUser!=null?loginUser.getDisplayName():""));++ signedInContainer.add(item = new WebMarkupContainer("myProfile"));+ item.add(new ViewStateAwarePageLink<Void>("link", MyProfilePage.class));+ if (getPage() instanceof MyProfilePage)+ item.add(AttributeAppender.append("class", "active"));++ signedInContainer.add(item = new WebMarkupContainer("myAvatar"));+ item.add(new ViewStateAwarePageLink<Void>("link", MyAvatarPage.class));+ if (getPage() instanceof MyAvatarPage)+ item.add(AttributeAppender.append("class", "active"));++ signedInContainer.add(item = new WebMarkupContainer("myPassword"));+ item.add(new ViewStateAwarePageLink<Void>("link", MyPasswordPage.class));+ if (getPage() instanceof MyPasswordPage)+ item.add(AttributeAppender.append("class", "active"));++ signedInContainer.add(item = new WebMarkupContainer("myAccessToken"));+ item.add(new ViewStateAwarePageLink<Void>("link", MyTokenPage.class));+ if (getPage() instanceof MyTokenPage)+ item.add(AttributeAppender.append("class", "active"));+signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));signedInContainer.setVisible(loginUser != null);+ if (getPage() instanceof MyPage)+ signedInContainer.add(AttributeAppender.append("class", "active"));+add(signedInContainer);}@@ -138,4 +226,8 @@ public abstract class LayoutPage extends BasePage {response.render(CssHeaderItem.forReference(new LayoutResourceReference()));}+ protected Component newNavContext(String componentId) {+ return new WebMarkupContainer(componentId);+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/layout/layout.css b/core/src/main/java/io/onedev/server/web/page/layout/layout.cssindex 36025b3f4a..e6128fbb20 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/layout.css+++ b/core/src/main/java/io/onedev/server/web/page/layout/layout.css@@ -1,16 +1,46 @@.navbar-brand {padding-top: 14px;padding-bottom: 14px;+ margin-right: 12px;}.navbar-brand img {width: 24px;height: 24px;margin-left: -6px;}-.navbar .tabs a {+.navbar-brand .separator {+ border-left: 1px solid #444;+ height: 30px;+ position: absolute;+ left: 48px;+ top: 11px;+}+@media(min-width: 768px) {+ .navbar-header>.nav-context, .navbar-brand .separator {+ display: none;+ }+}+.navbar-header>.nav-context {+ color: white;+ margin-top: 14px;+}+.navbar-header>.nav-context .text {+ text-overflow: ellipsis;+ overflow: hidden;+ white-space: nowrap;+ max-width: 240px;+}+.navbar-header>.nav-context a {+ color: white;+ text-decoration: none;+}+.navbar a {font-size: 16px;}-.navbar-nav>li>a.avatar {+.navbar .dropdown-menu a {+ font-size: 14px;+}+.navbar-nav>li.signed-in>a {padding-top: 10px;padding-bottom: 10px;}@@ -18,26 +48,26 @@width: 30px;height: 30px;}-.navbar .dropdown-header {+.navbar .dropdown-menu .dropdown-header {font-size: 16px;padding: 4px 20px 0 20px;}@media (max-width: 768px) {- .navbar .expanded {+ .navbar .help .icon,+ .navbar .signed-in .avatar,+ .navbar .signed-in .dropdown-header,+ .navbar .signed-in .dropdown-header+.divider {display: none;}}@media (min-width: 768px) {- .navbar .collapsed {+ .navbar .help .name,+ .navbar .signed-in .name {display: none;}}-#layout {- min-width: 1050px;-}-#layout>.body {padding: 70px 20px 20px 20px;width: 100%;@@ -73,4 +103,32 @@}.floating.side>.content>.body {padding: 12px;+}++.nav-context-dropdown.floating>.content {+ padding: 20px;+ width: 100vw;+}+.nav-context-dropdown.floating .menu a {+ display: block;+ color: #666;+ padding: 8px;+ text-decoration: none;+}+.nav-context-dropdown.floating .menu li.active a {+ background: #EEE;+ color: black;+ font-weight: bold;+}+.nav-context-dropdown.floating .menu li:hover a {+ background: #EEE;+ color: black;+}++.page-title {+ font-weight: bold;+ font-size: 18px;+ margin-bottom: 20px;+ padding-bottom: 20px;+ border-bottom: 1px solid #E8E8E8;}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/my/MyCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/my/MyCssResourceReference.javadeleted file mode 100644index 181da19417..0000000000--- a/core/src/main/java/io/onedev/server/web/page/my/MyCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.my;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class MyCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public MyCssResourceReference() {- super(MyCssResourceReference.class, "my.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyPage.html b/core/src/main/java/io/onedev/server/web/page/my/MyPage.htmlindex d54bdbd06b..9f8fe5a012 100644--- a/core/src/main/java/io/onedev/server/web/page/my/MyPage.html+++ b/core/src/main/java/io/onedev/server/web/page/my/MyPage.html@@ -1,8 +1,5 @@<wicket:extend><div id="my">- <div wicket:id="mySidebar"></div>- <div class="content">- <wicket:child></wicket:child>- </div>+ <wicket:child></wicket:child></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/my/MyPage.java b/core/src/main/java/io/onedev/server/web/page/my/MyPage.javaindex f4d777d6df..7b7665e7cb 100644--- a/core/src/main/java/io/onedev/server/web/page/my/MyPage.java+++ b/core/src/main/java/io/onedev/server/web/page/my/MyPage.java@@ -1,15 +1,7 @@package io.onedev.server.web.page.my;-import java.util.ArrayList;-import java.util.List;-import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import io.onedev.server.web.component.sidebar.SideBar;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.security.LoginPage;@@ -22,28 +14,6 @@ public abstract class MyPage extends LayoutPage {if (getLoginUser() == null)throw new RestartResponseAtInterceptPageException(LoginPage.class);-- add(new SideBar("mySidebar", "my.miniSidebar") {-- @Override- protected List<? extends Tab> newTabs() {- List<PageTab> tabs = new ArrayList<>();-- tabs.add(new MyTab("Profile", "fa fa-fw fa-list-alt", MyProfilePage.class));- tabs.add(new MyTab("Edit Avatar", "fa fa-fw fa-picture-o", MyAvatarPage.class));- tabs.add(new MyTab("Change Password", "fa fa-fw fa-key", MyPasswordPage.class));- tabs.add(new MyTab("Access Token", "fa fa-fw fa-ticket", MyTokenPage.class));-- return tabs;- }-- });}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new MyCssResourceReference()));- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.html b/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.htmlindex d93f935cce..9c2faa12fe 100644--- a/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.html+++ b/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.html@@ -1,3 +1,4 @@<wicket:extend>+ <div class="page-title">Change Password</div><div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.html b/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.htmlindex d93f935cce..fd0f2ec252 100644--- a/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.html+++ b/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.html@@ -1,3 +1,4 @@<wicket:extend>+ <div class="page-title">My Profile</div><div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/my/MyTab.java b/core/src/main/java/io/onedev/server/web/page/my/MyTab.javadeleted file mode 100644index a132ac1002..0000000000--- a/core/src/main/java/io/onedev/server/web/page/my/MyTab.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.web.page.my;--import org.apache.wicket.Component;-import org.apache.wicket.model.Model;--import io.onedev.server.web.component.tabbable.PageTab;--@SuppressWarnings("serial")-public class MyTab extends PageTab {-- private final String iconClass;-- public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass) {- super(Model.of(title), mainPageClass);-- this.iconClass = iconClass;- }-- public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass,- Class<? extends MyPage> additionalPageClass1) {- super(Model.of(title), mainPageClass, additionalPageClass1);-- this.iconClass = iconClass;- }-- public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass,- Class<? extends MyPage> additionalPageClass1,- Class<? extends MyPage> additionalPageClass2) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);-- this.iconClass = iconClass;- }-- public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass,- Class<? extends MyPage> additionalPageClass1,- Class<? extends MyPage> additionalPageClass2,- Class<? extends MyPage> additionalPageClass3) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);-- this.iconClass = iconClass;- }-- public String getIconClass() {- return iconClass;- }-- @Override- public Component render(String componentId) {- return new MyTabLink(componentId, this);- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.java b/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.javadeleted file mode 100644index 934194509b..0000000000--- a/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.java+++ /dev/null@@ -1,32 +0,0 @@-package io.onedev.server.web.page.my;--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.panel.Panel;--import io.onedev.server.web.component.link.ViewStateAwarePageLink;--@SuppressWarnings("serial")-public class MyTabLink extends Panel {-- private final MyTab tab;-- public MyTabLink(String id, MyTab tab) {- super(id);-- this.tab = tab;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Link<Void> link = new ViewStateAwarePageLink<Void>("link", tab.getMainPageClass());- link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));- link.add(new Label("label", tab.getTitleModel()));- add(link);- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.html b/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.htmlindex d93f935cce..8fe73e67ec 100644--- a/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.html+++ b/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.html@@ -1,3 +1,4 @@<wicket:extend>+ <div class="page-title">Access Token</div><div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/my/my.css b/core/src/main/java/io/onedev/server/web/page/my/my.cssdeleted file mode 100644index e69de29bb2..0000000000diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.htmlindex 502ae39ee9..26afd28982 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html@@ -7,9 +7,28 @@</div><wicket:fragment wicket:id="sidebarHeadFrag"><a wicket:id="link">- <img wicket:id="avatar"></img>+ <img wicket:id="avatar"><span wicket:id="name"></span><i class="fa fa-angle-down"></i></a></wicket:fragment>+ <wicket:fragment wicket:id="navContextFrag">+ <a wicket:id="dropdown" class="dropdown">+ <img wicket:id="avatar">+ <span wicket:id="name" class="ellipsis-text"></span>+ <i class="fa fa-angle-down"></i>+ </a>+ </wicket:fragment>+ <wicket:fragment wicket:id="navContextDropdownFrag">+ <div wicket:id="info" class="info"></div>+ <ul class="menu list-unstyled">+ <li wicket:id="items">+ <wicket:container wicket:id="item"></wicket:container>+ </li>+ <li wicket:id="setting" class="setting">+ <a onclick="$(this).parent().toggleClass('expanded'); var $floating = $(this).closest('.floating'); $floating.align($floating.data('alignment'));"><i class="fa fa-cog"></i> Settings <i class="fa fa-angle-down"></i></a>+ <ul wicket:id="menu" class="menu list-unstyled"></ul>+ </li>+ </ul>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 3f7c8fb711..a382edc354 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -10,10 +10,14 @@ import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;+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;+import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -35,8 +39,8 @@ import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.sidebar.SideBar;-import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;@@ -45,17 +49,29 @@ import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.info.ProjectInfoPanel;import io.onedev.server.web.page.project.issues.IssuesPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.page.project.issues.list.IssueListPage;-import io.onedev.server.web.page.project.moreinfo.MoreInfoPanel;import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.list.PullRequestListPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.page.project.setting.ProjectSettingTab;+import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;+import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;+import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;+import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;+import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;+import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;+import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;+import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;+import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.ProjectStatsPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@@ -135,107 +151,9 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {@Overrideprotected List<? extends Tab> newTabs() {- List<PageTab> tabs = new ArrayList<>();- if (SecurityUtils.canReadCode(getProject().getFacade())) {- tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));- tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,- ProjectCommitsPage.class, CommitDetailPage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- ProjectCommitsPage.State state = new ProjectCommitsPage.State();- state.query = "";- return new ViewStateAwarePageLink<Void>(linkId, ProjectCommitsPage.class,- ProjectCommitsPage.paramsOf(getProject(), state));- }- };- }-- });- tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",- 0, ProjectBranchesPage.class));- tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",- 0, ProjectTagsPage.class));-- tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",- 0, PullRequestListPage.class, NewPullRequestPage.class, PullRequestDetailPage.class, InvalidRequestPage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, PullRequestListPage.class,- PullRequestListPage.paramsOf(getProject(), "", 0));- }- };- }-- });- }-- tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, IssuesPage.class,- IssueDetailPage.class, NewIssuePage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, IssueListPage.class,- IssueListPage.paramsOf(getProject(), "", 0));- }- };- }-- });-- tabs.add(new ProjectTab(Model.of("Builds"), "fa fa-fw fa-cubes", 0, BuildListPage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, BuildListPage.class, BuildListPage.paramsOf(getProject(), ""));- }- };- }-- });-- if (SecurityUtils.canReadCode(getProject().getFacade())) {- tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",- 0, ProjectCodeCommentsPage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, ProjectCodeCommentsPage.class,- ProjectCodeCommentsPage.paramsOf(getProject(), ""));- }- };- }-- });- tabs.add(new ProjectTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));- tabs.add(new ProjectTab(Model.of("Statistics"), "fa fa-fw fa-bar-chart", 0, ProjectContribsPage.class,- ProjectStatsPage.class));- }-+ List<ProjectTab> tabs = ProjectPage.this.newTabs();if (SecurityUtils.canAdministrate(getProject().getFacade()))tabs.add(new ProjectTab(Model.of("Setting"), "fa fa-fw fa-cog", 0, GeneralSettingPage.class, ProjectSettingPage.class));-return tabs;}@@ -248,7 +166,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new MoreInfoPanel(id, projectModel) {+ return new ProjectInfoPanel(id, projectModel) {@Overrideprotected void onPromptForkOption(AjaxRequestTarget target) {@@ -285,6 +203,172 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {return projectModel.getObject();}+ private List<ProjectTab> newTabs() {+ List<ProjectTab> tabs = new ArrayList<>();+ if (SecurityUtils.canReadCode(getProject().getFacade())) {+ tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));+ tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,+ ProjectCommitsPage.class, CommitDetailPage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ ProjectCommitsPage.State state = new ProjectCommitsPage.State();+ state.query = "";+ return new ViewStateAwarePageLink<Void>(linkId, ProjectCommitsPage.class,+ ProjectCommitsPage.paramsOf(getProject(), state));+ }+ };+ }++ });+ tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",+ 0, ProjectBranchesPage.class));+ tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",+ 0, ProjectTagsPage.class));++ tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",+ 0, PullRequestListPage.class, NewPullRequestPage.class, PullRequestDetailPage.class, InvalidRequestPage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new ViewStateAwarePageLink<Void>(linkId, PullRequestListPage.class,+ PullRequestListPage.paramsOf(getProject(), "", 0));+ }+ };+ }++ });+ }++ tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, IssuesPage.class,+ IssueDetailPage.class, NewIssuePage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new ViewStateAwarePageLink<Void>(linkId, IssueListPage.class,+ IssueListPage.paramsOf(getProject(), "", 0));+ }+ };+ }++ });++ tabs.add(new ProjectTab(Model.of("Builds"), "fa fa-fw fa-cubes", 0, BuildListPage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new ViewStateAwarePageLink<Void>(linkId, BuildListPage.class, BuildListPage.paramsOf(getProject(), ""));+ }+ };+ }++ });++ if (SecurityUtils.canReadCode(getProject().getFacade())) {+ tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",+ 0, ProjectCodeCommentsPage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new ViewStateAwarePageLink<Void>(linkId, ProjectCodeCommentsPage.class,+ ProjectCodeCommentsPage.paramsOf(getProject(), ""));+ }+ };+ }++ });+ tabs.add(new ProjectTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));+ tabs.add(new ProjectTab(Model.of("Statistics"), "fa fa-fw fa-bar-chart", 0, ProjectContribsPage.class,+ ProjectStatsPage.class));+ }++ return tabs;+ }++ @Override+ protected Component newNavContext(String componentId) {+ Fragment fragment = new Fragment(componentId, "navContextFrag", this);+ DropdownLink link = new DropdownLink("dropdown", AlignPlacement.bottom(15)) {++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ super.onInitialize(dropdown);+ dropdown.add(AttributeAppender.append("class", "nav-context-dropdown project-nav-context-dropdown"));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "navContextDropdownFrag", ProjectPage.this);+ fragment.add(new ProjectInfoPanel("info", projectModel) {++ @Override+ protected void onPromptForkOption(AjaxRequestTarget target) {+ dropdown.close();+ }++ });+ fragment.add(new ListView<ProjectTab>("items", newTabs()) {++ @Override+ protected void populateItem(ListItem<ProjectTab> item) {+ item.add(new ProjectTabLink("item", item.getModelObject()));+ if (item.getModelObject().isActive(getPage()))+ item.add(AttributeAppender.append("class", "active"));+ }++ });+ WebMarkupContainer settingItem = new WebMarkupContainer("setting");+ settingItem.setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ settingItem.add(new Tabbable("menu", newSettingTabs()));+ if (getPage() instanceof ProjectSettingPage)+ settingItem.add(AttributeAppender.append("class", "active expanded"));+ fragment.add(settingItem);+ return fragment;+ }++ };+ link.add(new ProjectAvatar("avatar", getProject()));+ link.add(new Label("name", getProject().getName()));+ fragment.add(link);++ return fragment;+ }++ protected List<ProjectSettingTab> newSettingTabs() {+ List<ProjectSettingTab> tabs = new ArrayList<>();+ tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));+ tabs.add(new ProjectSettingTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));+ tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));+ tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));+ tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));+ tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug", StateTransitionsPage.class, PromptFieldsUponIssueOpenSettingPage.class));+ tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-comments", CommitMessageTransformPage.class));+ tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));+ tabs.add(new ProjectSettingTab("Build Configurations", "fa fa-fw fa-cube", ConfigurationListPage.class,+ NewConfigurationPage.class, ConfigurationEditPage.class));+ return tabs;+ }+@Overrideprotected void onDetach() {projectModel.detach();diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.htmlindex 610438879e..8296c70713 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html@@ -1,14 +1,15 @@<html xmlns:wicket><wicket:extend>+ <div class="page-title">Branches</div><div id="project-branches"><div class="list"><div class="head clearfix"><div class="input-group pull-left base"><span class="input-group-addon">Base</span>- <input wicket:id="baseBranch" type="hidden" class="form-control"></input>+ <input wicket:id="baseBranch" type="hidden" class="form-control"></div><div class="pull-left clearable-wrapper">- <input wicket:id="searchBranches" class="form-control search" placeholder="Search branches"></input>+ <input wicket:id="searchBranches" class="form-control search" placeholder="Search branches"></div><div class="pull-left"><a wicket:id="createBranch" class="btn btn-success"><i class="fa fa-plus"></i> Create Branch</a>@@ -55,7 +56,7 @@<div class="center"><ul wicket:id="branchesPageNav"></ul></div><div wicket:id="noBranches" class="alert alert-warning">No branches found</div><div id="searching-branches" class="ajax-indicator">- <img src="/img/ajax-indicator-big.gif"></img>+ <img src="/img/ajax-indicator-big.gif"></div></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.htmlindex e6eceb6cad..1780822542 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Builds</div><div id="build-list" class="query-save-support"><div wicket:id="side" class="side"></div><div wicket:id="main" class="main"></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.htmlindex 55b690d736..3b0b1e41e5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Code Comments</div><div id="project-code-comments" class="query-save-support"><div wicket:id="side" class="side"></div><div wicket:id="main" class="main"></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.htmlindex acb9b75d07..7372bbf7d5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Commits</div><div id="project-commits" class="query-save-support"><div wicket:id="side" class="side"></div><div class="main">diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.htmlindex beb6589fdb..64b3d3f492 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Revision Compare</div><div id="revision-compare"><table class="revisions"><tr>diff --git a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.html b/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex f078661473..832c75acb2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.moreinfo;+package io.onedev.server.web.page.project.info;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.html b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.htmlsimilarity index 86%rename from core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.htmlrename to core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.htmlindex 7f9904ec75..62f11551db 100644--- a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html@@ -1,10 +1,11 @@<wicket:panel>- <div class="project more-info">+ <div class="project-info"><div class="general"><wicket:enclosure child="forkedFromLink"><span>forked from: <a wicket:id="forkedFromLink"><span wicket:id="name"></span></a></span></wicket:enclosure>- <span>id: <span wicket:id="id"></span></span>+ <span>Name: <span wicket:id="name"></span></span>+ <span>Id: <span wicket:id="id"></span></span></div><div class="metrics"><a wicket:id="commitsLink"><span wicket:id="count"></span></a>diff --git a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.javarename to core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex a7e1f10a8e..58d0803b87 100644--- a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.moreinfo;+package io.onedev.server.web.page.project.info;import java.util.Collection;@@ -36,11 +36,11 @@ import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@SuppressWarnings("serial")-public abstract class MoreInfoPanel extends Panel {+public abstract class ProjectInfoPanel extends Panel {private final IModel<Project> projectModel;- public MoreInfoPanel(String id, IModel<Project> projectModel) {+ public ProjectInfoPanel(String id, IModel<Project> projectModel) {super(id);this.projectModel = projectModel;}@@ -60,6 +60,7 @@ public abstract class MoreInfoPanel extends Panel {link.setVisible(false);add(link);}+ add(new Label("name", getProject().getName()));add(new Label("id", getProject().getId()));UrlManager urlManager = OneDev.getInstance(UrlManager.class);@@ -196,7 +197,7 @@ public abstract class MoreInfoPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new MoreInfoResourceReference()));+ response.render(CssHeaderItem.forReference(new ProjectInfoResourceReference()));}protected abstract void onPromptForkOption(AjaxRequestTarget target);diff --git a/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoResourceReference.javanew file mode 100644index 0000000000..0766bc1bf8--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoResourceReference.java@@ -0,0 +1,13 @@+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/core/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.css b/core/src/main/java/io/onedev/server/web/page/project/info/project-info.csssimilarity index 52%rename from core/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.cssrename to core/src/main/java/io/onedev/server/web/page/project/info/project-info.cssindex bbe828a5aa..4b183c73f2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.css+++ b/core/src/main/java/io/onedev/server/web/page/project/info/project-info.css@@ -1,37 +1,37 @@-.project.more-info {+.project-info {padding: 20px;}-.project.more-info>div {+.project-info>div {margin-bottom: 20px;}-.project.more-info>.general {+.project-info>.general {border-bottom: 1px solid #ddd;padding-bottom: 20px;font-size: 20px;}-.project.more-info>.general>a {+.project-info>.general>a {color: #777;}-.project.more-info>.general>span {+.project-info>.general>span {margin-right: 16px;}-.project.more-info>.description {+.project-info>.description {border: 1px solid #DDD;padding: 20px 20px 10px 20px;border-radius: 4px;background: #F5F5F5;}-.project.more-info>.metrics>a, .project.more-info>.metrics>span {+.project-info>.metrics>a, .project-info>.metrics>span {font-size: 16px;color: #444;margin-right: 20px;}-.project.more-info>.clone {+.project-info>.clone {margin-bottom: 20px;}-.project.more-info>.clone>.input-group {+.project-info>.clone>.input-group {width: 100%;}-.project.more-info>.clone input {+.project-info>.clone input {background: white;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.javaindex 9b65264530..237f95aaf8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java@@ -105,7 +105,7 @@ public abstract class IssuesPage extends ProjectPage {}List<Tab> tabs = new ArrayList<>();- tabs.add(new IssuesTab("List", IssueListPage.class) {+ tabs.add(new IssuesTab("Issue List", IssueListPage.class) {@Overridepublic Component render(String componentId) {@@ -121,7 +121,7 @@ public abstract class IssuesPage extends ProjectPage {}});- tabs.add(new IssuesTab("Boards", IssueBoardsPage.class));+ tabs.add(new IssuesTab("Issue Boards", IssueBoardsPage.class));tabs.add(new IssuesTab("Milestones", MilestoneListPage.class, NewMilestonePage.class,MilestoneDetailPage.class, MilestoneEditPage.class));diff --git a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoResourceReference.javadeleted file mode 100644index edf53f82ea..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.moreinfo;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class MoreInfoResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public MoreInfoResourceReference() {- super(MoreInfoResourceReference.class, "more-info.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/project.css b/core/src/main/java/io/onedev/server/web/page/project/project.cssindex 26b916d1ec..acf85357c5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/project.css+++ b/core/src/main/java/io/onedev/server/web/page/project/project.css@@ -1,3 +1,11 @@+@media(max-width: 768px) {+ #project>.sidebar {+ display: none;+ }+ #project>.sidebar+.content {+ padding-left: 0;+ }+}#project>.sidebar>.head a {display: block;border-bottom: 2px solid #E0E0E0;@@ -62,4 +70,26 @@.no-commits>.body>.help-block {margin-top: -8px;}-+.project-nav-context-dropdown .info {+ margin: -20px;+}+.project-nav-context-dropdown .setting ul {+ display: none;+ padding-left: 10px;+}+.project-nav-context-dropdown .setting.expanded ul {+ display: block;+}+.project-nav-context-dropdown .setting li a {+ background: white !important;+ font-weight: normal !important;+ color: #666 !important;+}+.project-nav-context-dropdown .setting li:hover a {+ background: #EEE !important;+ color: black !important;+}+.project-nav-context-dropdown .setting li.active a {+ font-weight: bold !important;+ color: black !important;+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.htmlindex bee9f91536..b85e57e057 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Pull Requests</div><div id="request-list" class="query-save-support"><div wicket:id="side" class="side"></div><div class="main">diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.javaindex 88c2407488..2c41cbf99c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java@@ -1,6 +1,5 @@package io.onedev.server.web.page.project.setting;-import java.util.ArrayList;import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;@@ -10,21 +9,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.sidebar.SideBar;-import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;-import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;-import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;-import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;-import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;-import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;-import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;-import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;-import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;-import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;-import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;-import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;@SuppressWarnings("serial")public abstract class ProjectSettingPage extends ProjectPage {@@ -46,18 +32,7 @@ public abstract class ProjectSettingPage extends ProjectPage {@Overrideprotected List<? extends Tab> newTabs() {- List<PageTab> tabs = new ArrayList<>();- tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));- tabs.add(new ProjectSettingTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));- tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));- tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));- tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));- tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug", StateTransitionsPage.class, PromptFieldsUponIssueOpenSettingPage.class));- tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-comments", CommitMessageTransformPage.class));- tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));- tabs.add(new ProjectSettingTab("Build Configurations", "fa fa-fw fa-cube", ConfigurationListPage.class,- NewConfigurationPage.class, ConfigurationEditPage.class));- return tabs;+ return newSettingTabs();}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.java b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.javaindex 825db28e0d..b658b79185 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.java@@ -7,6 +7,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class ProjectSettingTabLink extends Panel {@@ -23,9 +24,9 @@ public class ProjectSettingTabLink extends Panel {protected void onInitialize() {super.onInitialize();- ProjectSettingPage page = (ProjectSettingPage) getPage();+ ProjectPage page = (ProjectPage) getPage();Link<Void> link = new ViewStateAwarePageLink<Void>("link",- tab.getMainPageClass(), ProjectSettingPage.paramsOf(page.getProject()));+ tab.getMainPageClass(), ProjectPage.paramsOf(page.getProject()));link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));link.add(new Label("label", tab.getTitleModel()));add(link);diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.htmlindex 7c81d78afd..c4ce7e807c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">User Authorizations</div><div class="authorization list"><div class="head clearfix"><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.htmlindex 63a1c1fe01..d43c24b731 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Branch Protection</div><div wicket:id="branchProtectionSetting" class="panel-list"><ul class="list-unstyled protections"><li wicket:id="protections" class="protection"><div wicket:id="protection"></div></li>diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.htmlindex c1c93db150..0986691897 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Commit Message Transform</div><form wicket:id="commitMessageTransformSetting" class="commit-message-transform leave-confirm"><div wicket:id="editor"></div><div class="actions">diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.htmlindex 9428e7de32..15b746a003 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Build Configurations</div><div class="configuration list"><div class="head clearfix"><div class="pull-left clearable-wrapper">diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.htmlindex b24c0ea7ce..50ff207d39 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html@@ -1,9 +1,10 @@<wicket:extend>+ <div class="page-title">General Setting</div><div class="general-setting"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input class="btn btn-primary dirty-aware" value="Update" type="submit"></input>+ <input class="btn btn-primary dirty-aware" value="Update" type="submit"><a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a></div></form>diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.htmlindex 80b1004641..cec964b512 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Issue Setting</div><div class="issue-setting"><ul wicket:id="issueSettingTabs" class="nav nav-tabs"></ul><wicket:child></wicket:child>diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex 1edca961d8..42752ce313 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -1,3 +1,11 @@+@media(max-width: 768px) {+ #project-setting>.sidebar {+ display: none;+ }+ #project-setting>.sidebar+.content {+ padding-left: 0 !important;+ }+}#project-setting>.sidebar {left: 240px;background: white;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.htmlindex 43f90bb0d7..50b6f0837f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Tag Protection</div><div wicket:id="tagProtectionSetting" class="panel-list"><ul class="list-unstyled protections"><li wicket:id="protections" class="protection"><div wicket:id="protection"></div></li>diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.htmlindex 466a8bc005..0db958da33 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Web Hooks</div><div class="web-hook list"><form wicket:id="form"><div wicket:id="feedback"></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.htmlindex 28e77922e7..cfa1d321bf 100644--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html@@ -1,5 +1,6 @@<html xmlns:wicket><wicket:extend>+ <div class="page-title">Tags</div><div id="project-tags"><div class="list"><div class="head clearfix">