Skip to content

The Unified and Autonomous Development Platform

Fix issue #551 - Reorganize side bar

Robin Shenb3a80f1f5f28
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/git.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/git.svg
new file mode 100644
index 0000000000..4073b4f76a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/git.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="199.80px" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M1004.692673 466.396616l-447.094409-447.073929c-25.743103-25.763582-67.501405-25.763582-93.264987 0l-103.873521 103.873521 78.171378 78.171378c12.533635-6.00058 26.562294-9.359266 41.389666-9.359266 53.02219 0 96.00928 42.98709 96.00928 96.00928 0 14.827372-3.358686 28.856031-9.359266 41.389666l127.97824 127.97824c12.533635-6.00058 26.562294-9.359266 41.389666-9.359266 53.02219 0 96.00928 42.98709 96.00928 96.00928s-42.98709 96.00928-96.00928 96.00928-96.00928-42.98709-96.00928-96.00928c0-14.827372 3.358686-28.856031 9.359266-41.389666l-127.97824-127.97824c-3.051489 1.454065-6.184898 2.744293-9.379746 3.870681l0 266.97461c37.273227 13.188988 63.99936 48.721433 63.99936 90.520695 0 53.02219-42.98709 96.00928-96.00928 96.00928s-96.00928-42.98709-96.00928-96.00928c0-41.799262 26.726133-77.331707 63.99936-90.520695l0-266.97461c-37.273227-13.188988-63.99936-48.721433-63.99936-90.520695 0-14.827372 3.358686-28.856031 9.359266-41.389666l-78.171378-78.171378-295.892081 295.871601c-25.743103 25.784062-25.743103 67.542365 0 93.285467l447.114889 447.073929c25.743103 25.743103 67.480925 25.743103 93.264987 0l445.00547-445.00547c25.763582-25.763582 25.763582-67.542365 0-93.285467z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
index 71f561de6b..174ecafb87 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
@@ -154,6 +154,10 @@
background-color: #1b1b28;
}
+.sidebar>.sidebar-body>.sidebar-menu+.sidebar-menu {
+ border-top: 1px solid var(--dark-mode-lighter-dark);
+}
+
.dark-mode .sidebar-menu .sidebar-dropdown {
background: #1b1b28 !important;
box-shadow: 0 0 30px rgb(0 0 0 / 50%) !important;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 0c38f2a3d8..912125427b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -144,47 +144,48 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
List<SidebarMenuItem> menuItems = new ArrayList<>();
if (getProject().isCodeManagementEnabled() && SecurityUtils.canReadCode(getProject())) {
- menuItems.add(new SidebarMenuItem.Page("files", "Files",
+ List<SidebarMenuItem> codeMenuItems = new ArrayList<>();
+
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Files",
ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject())));
- menuItems.add(new SidebarMenuItem.Page("commit", "Commits",
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Commits",
ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject(), null),
Lists.newArrayList(CommitDetailPage.class)));
- menuItems.add(new SidebarMenuItem.Page("branch", "Branches",
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Branches",
ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())));
- menuItems.add(new SidebarMenuItem.Page("tag", "Tags",
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Tags",
ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())));
- menuItems.add(new SidebarMenuItem.Page("pull-request", "Pull Requests",
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Pull Requests",
ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(getProject(), 0),
Lists.newArrayList(NewPullRequestPage.class, PullRequestDetailPage.class, InvalidPullRequestPage.class)));
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Code Comments",
+ ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(getProject(), 0)));
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Code Compare",
+ RevisionComparePage.class, RevisionComparePage.paramsOf(getProject())));
+
+ menuItems.add(new SidebarMenuItem.SubMenu("git", "Code", codeMenuItems));
}
if (getProject().isIssueManagementEnabled()) {
- menuItems.add(new SidebarMenuItem.Page("bug", "Issues",
+ List<SidebarMenuItem> issueMenuItems = new ArrayList<>();
+
+ issueMenuItems.add(new SidebarMenuItem.Page(null, "List",
ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject(), 0),
Lists.newArrayList(NewIssuePage.class, IssueDetailPage.class)));
- menuItems.add(new SidebarMenuItem.Page("split", "Boards",
+ issueMenuItems.add(new SidebarMenuItem.Page(null, "Boards",
IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject())));
-
- menuItems.add(new SidebarMenuItem.Page("milestone", "Milestones",
+ issueMenuItems.add(new SidebarMenuItem.Page(null, "Milestones",
MilestoneListPage.class, MilestoneListPage.paramsOf(getProject(), false, null),
Lists.newArrayList(NewMilestonePage.class, MilestoneDetailPage.class, MilestoneEditPage.class)));
+
+ menuItems.add(new SidebarMenuItem.SubMenu("bug", "Issues", issueMenuItems));
}
if (getProject().isCodeManagementEnabled()) {
menuItems.add(new SidebarMenuItem.Page("play-circle", "Builds",
ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(getProject(), 0),
Lists.newArrayList(BuildDetailPage.class, InvalidBuildPage.class)));
-
- if (SecurityUtils.canReadCode(getProject())) {
- menuItems.add(new SidebarMenuItem.Page("comments", "Code Comments",
- ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(getProject(), 0)));
- menuItems.add(new SidebarMenuItem.Page("diff", "Code Compare",
- RevisionComparePage.class, RevisionComparePage.paramsOf(getProject())));
- }
}
- menuItems.add(new SidebarMenuItem.Page("tree", "Child Projects",
- ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(getProject(), null, 0)));
-
List<SidebarMenuItem> statsMenuItems = new ArrayList<>();
if (getProject().isCodeManagementEnabled() && SecurityUtils.canReadCode(getProject())) {
@@ -203,6 +204,9 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
if (!statsMenuItems.isEmpty())
menuItems.add(new SidebarMenuItem.SubMenu("statistics", "Statistics", statsMenuItems));
+ menuItems.add(new SidebarMenuItem.Page("tree", "Child Projects",
+ ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(getProject(), null, 0)));
+
if (SecurityUtils.canManage(getProject())) {
List<SidebarMenuItem> settingMenuItems = new ArrayList<>();
settingMenuItems.add(new SidebarMenuItem.Page(null, "General Setting",