The Unified and Autonomous Development Platform
chore: Improve project navigator on mobile devices
Robin Shen7d90d06ad47e
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex 167772de69..c02b9c91d3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -47,7 +47,7 @@</a><span wicket:id="labels" class="mr-2"></span></div>- <div wicket:id="description" class="mt-1 font-size-sm text-muted"></div>+ <div wicket:id="description" class="mt-2 font-size-sm text-muted"></div><div class="d-flex flex-wrap project-summary"><div wicket:id="codeStats" class="code-stats mt-2 d-flex align-items-center flex-wrap mr-3"></div><div wicket:id="pullRequestStats" class="pull-request-stats mt-2 d-flex align-items-center flex-wrap"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.htmlindex 01cf5006ce..08c33d80cd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html@@ -7,9 +7,9 @@<wicket:child></wicket:child></div><wicket:fragment wicket:id="topbarTitleFrag">- <a wicket:id="projects" class="d-none d-sm-inline"><wicket:t>Projects</wicket:t></a>- <a wicket:id="favorites" class="dropdown-triangle-indicator mx-1 d-inline-flex flex-shrink-0 align-items-center justify-content-center"><span></span></a>- <span class="project-path d-inline-flex align-items-center text-truncate">+ <a wicket:id="projects" class="d-none d-sm-inline text-nowrap"><wicket:t>Projects</wicket:t></a>+ <a wicket:id="favorites" class="dropdown-triangle-indicator mx-1 d-none d-sm-inline-flex flex-shrink-0 align-items-center justify-content-center"><span></span></a>+ <span class="project-path project-path-full d-inline-flex align-items-center text-truncate"><wicket:container wicket:id="pathSegments"><a wicket:id="link" class="text-truncate"><span wicket:id="label"></span>@@ -18,7 +18,9 @@<span wicket:id="dot" class="flex-shrink-0"></span></wicket:container></span>- <span wicket:id="projectTitle"></span>+ <a wicket:id="compactProjectPath" class="project-path project-path-compact text-nowrap"><span wicket:id="label"></span></a>+ <span class="project-path-compact-separator dot"></span>+ <span wicket:id="projectTitle" class="text-nowrap"></span></wicket:fragment><wicket:fragment wicket:id="childFrag"><a wicket:id="link">@@ -36,4 +38,4 @@</li></ul></wicket:fragment>-</wicket:extend>\ No newline at end of file+</wicket:extend>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.javaindex 035cf703c4..718a43ce37 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@@ -21,6 +21,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -514,7 +515,11 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {}});-++ WebMarkupContainer compactProjectPath = navToProject("compactProjectPath", getProject());+ compactProjectPath.add(new Label("label", getProject().getPath()));+ fragment.add(compactProjectPath);+fragment.add(newProjectTitle("projectTitle"));return fragment;}@@ -539,6 +544,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {response.render(CssHeaderItem.forReference(new ProjectCssResourceReference()));response.render(CssHeaderItem.forReference(new DropdownTriangleIndicatorCssResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new ProjectResourceReference()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.javanew file mode 100644index 0000000000..18c44cadb3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project;++import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class ProjectResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectResourceReference() {+ super(ProjectResourceReference.class, "project.js");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.htmlindex 1e5b458478..015f174b3d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.html@@ -5,32 +5,26 @@<div wicket:id="summary" class="summary d-flex"><img wicket:id="avatar" class="mr-3 flex-shrink-0"><div class="details flex-grow-1">- <div class="d-flex justify-content-between align-items-start">- <div class="mr-4">- <div class="d-flex flex-wrap align-items-center">- <span wicket:id="path" class="mb-0 mr-2 h2"></span>- <span wicket:id="labels"></span>- </div>- <div wicket:id="description" class="text-muted mt-2"></div>- <div class="font-size-lg font-weight-bold mt-3">- <span wicket:id="id"></span><span wicket:id="key"></span><wicket:enclosure child="forkedFrom"> · <wicket:t>forked from <a wicket:id="forkedFrom"></a></wicket:t></wicket:enclosure>- </div>- <wicket:enclosure child="serviceDesk">- <div class="mt-3">- <a wicket:id="serviceDesk" t:data-tippy-content="Issues can be created in this project by sending email to this address"><wicket:svg href="mail" class="icon"></wicket:svg> <span wicket:id="label"></span></a>- </div>- </wicket:enclosure>- <div wicket:id="replicas"></div>- </div>+ <div class="d-flex flex-wrap align-items-center row-gap-1">+ <span wicket:id="path" class="path mb-0 mr-2 h2 text-truncate"></span><wicket:enclosure child="forkInfo">- <div class="flex-shrink-0">- <span wicket:id="forkInfo" class="btn-group fork-info">- <a wicket:id="forks" class="btn btn-sm btn-outline-secondary btn-hover-primary"><span wicket:id="label"></span></a>- <a wicket:id="forkNow" class="btn btn-sm btn-outline-secondary btn-hover-primary btn-icon" t:data-tippy-content="Fork now"><wicket:svg href="fork" class="icon"/></a>- </span>- </div>+ <span wicket:id="forkInfo" class="btn-group fork-info flex-shrink-0 ml-sm-auto">+ <a wicket:id="forks" class="btn btn-sm btn-outline-secondary btn-hover-primary"><span wicket:id="label"></span></a>+ <a wicket:id="forkNow" class="btn btn-sm btn-outline-secondary btn-hover-primary btn-icon" t:data-tippy-content="Fork now"><wicket:svg href="fork" class="icon"/></a>+ </span></wicket:enclosure></div>+ <span wicket:id="labels" class="mt-2"></span>+ <div wicket:id="description" class="text-muted mt-2"></div>+ <div class="font-size-lg font-weight-bold mt-2">+ <span wicket:id="id"></span><span wicket:id="key"></span><wicket:enclosure child="forkedFrom"> · <wicket:t>forked from <a wicket:id="forkedFrom"></a></wicket:t></wicket:enclosure>+ </div>+ <wicket:enclosure child="serviceDesk">+ <div class="mt-2">+ <a wicket:id="serviceDesk" t:data-tippy-content="Issues can be created in this project by sending email to this address"><wicket:svg href="mail" class="icon"></wicket:svg> <span wicket:id="label"></span></a>+ </div>+ </wicket:enclosure>+ <div wicket:id="replicas"></div><div wicket:id="entityStats"></div></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.css b/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.cssindex 3e46b4300e..2265f57b75 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.css@@ -6,9 +6,15 @@.project-overview .summary .details {min-width: 0;}-.project-overview .summary .h2 {+.project-overview .summary .path {font-weight: 600;line-height: 1.3;+ min-width: 0;+ flex: 1 1 12rem;+ max-width: 100%;+}+.project-overview .fork-info > .btn {+ flex: 0 0 auto;}.project-overview .section {padding-top: 1.25rem;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/project.css b/server-core/src/main/java/io/onedev/server/web/page/project/project.cssindex a3b569a606..f3e776e026 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/project.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/project.css@@ -4,3 +4,32 @@.favorite-projects li:last-child {margin-bottom: 0;}++.topbar-title .project-path-compact,+.topbar-title .project-path-compact-separator {+ display: none;+}++.topbar-title.project-path-compact-mode .project-path-full {+ display: none !important;+}+.topbar-title.project-path-compact-mode .project-path-compact {+ display: block;+ flex-shrink: 0;+}+.topbar-title.project-path-compact-mode .project-path-compact-separator {+ display: inline-block;+ flex-shrink: 0;+}++.topbar-title.project-path-truncated-mode .project-path-compact {+ min-width: 0;+ flex-shrink: 1;+ overflow: hidden;+ text-overflow: ellipsis;+}++.topbar-title.project-path-hidden-mode .project-path-compact,+.topbar-title.project-path-hidden-mode .project-path-compact-separator {+ display: none;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/project.js b/server-core/src/main/java/io/onedev/server/web/page/project/project.jsnew file mode 100644index 0000000000..077392bd9b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/project.js@@ -0,0 +1,56 @@+(function() {+ var compactMode = "project-path-compact-mode";+ var truncatedMode = "project-path-truncated-mode";+ var hiddenMode = "project-path-hidden-mode";+ var minimumTruncatedPathWidth = 48;++ function isTruncated(element) {+ return element.scrollWidth > element.clientWidth + 1;+ }++ function fitProjectPath(title) {+ var $title = $(title);+ var fullPath = $title.find(".project-path-full")[0];+ if (!fullPath)+ return;++ $title.removeClass(compactMode + " " + truncatedMode + " " + hiddenMode);+ var fullPathIsTruncated = isTruncated(fullPath) || Array.prototype.some.call(+ fullPath.querySelectorAll("a.text-truncate"), isTruncated);+ if (!fullPathIsTruncated)+ return;++ $title.addClass(compactMode);+ if (title.scrollWidth <= title.clientWidth + 1)+ return;++ $title.addClass(truncatedMode);+ var compactPath = $title.find(".project-path-compact")[0];+ if (compactPath.clientWidth < minimumTruncatedPathWidth)+ $title.addClass(hiddenMode);+ }++ function setup() {+ var title = document.querySelector(".topbar-title");+ if (!title || !title.querySelector(".project-path-full"))+ return;++ var scheduled = false;+ function scheduleFit() {+ if (!scheduled) {+ scheduled = true;+ window.requestAnimationFrame(function() {+ scheduled = false;+ fitProjectPath(title);+ });+ }+ }++ if (window.ResizeObserver)+ new ResizeObserver(scheduleFit).observe(title);+ $(window).on("resize", scheduleFit);+ scheduleFit();+ }++ $(setup);+})();