The Unified and Autonomous Development Platform
feat: Responsive page navigator based on screen width
Robin Shen0e045328e8b0
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.html b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.htmlindex 076ed927f6..9bd9331f64 100644--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.html+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.html@@ -2,7 +2,7 @@<tr class="navigation"><td wicket:id="span"><div class="d-flex align-items-center justify-content-between">- <span wicket:id="count" class="d-none d-lg-inline text-gray text-nowrap mr-2"></span>+ <span wicket:id="count" class="d-none d-sm-inline text-gray text-nowrap mr-2"></span><div class="navigator"><ul wicket:id="navigator"></ul></div></div></td>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.html b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.htmlindex a55a2d4a3f..bd2113dd3f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.html@@ -1,7 +1,11 @@<wicket:panel><li><a wicket:id="prev" class="prev btn btn-sm btn-light btn-icon mr-2"><wicket:svg href="arrow" class="icon stroke-50 flip-x"/></a></li>+ <li><a wicket:id="first" class="first page-number btn btn-sm btn-light btn-icon mr-2"><span wicket:id="pageNumber">1</span></a></li>+ <li class="page-ellipsis page-ellipsis-left d-none"><span class="btn btn-sm btn-light btn-icon mr-2 disabled">…</span></li><li wicket:id="navigation">- <a wicket:id="pageLink" href="#" class="btn btn-sm btn-light btn-icon mr-2"><span wicket:id="pageNumber">5</span></a>+ <a wicket:id="pageLink" href="#" class="page-number btn btn-sm btn-light btn-icon mr-2"><span wicket:id="pageNumber">5</span></a></li>+ <li class="page-ellipsis page-ellipsis-right d-none"><span class="btn btn-sm btn-light btn-icon mr-2 disabled">…</span></li>+ <li><a wicket:id="last" class="last page-number btn btn-sm btn-light btn-icon mr-2"><span wicket:id="pageNumber">10</span></a></li><li><a wicket:id="next" class="next btn btn-sm btn-light btn-icon"><wicket:svg href="arrow" class="icon stroke-50"/></a></li></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.javaindex 8aaf937fc6..1494d3cbc3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java@@ -13,6 +13,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.AbstractLink;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.DisabledAttributeLinkBehavior;@@ -21,6 +22,8 @@ import org.apache.wicket.markup.html.list.LoopItem;import org.apache.wicket.markup.html.navigation.paging.IPageable;import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;import org.jspecify.annotations.Nullable;@@ -37,9 +40,46 @@ public class OnePagingNavigator extends AjaxPagingNavigator {@Overrideprotected void onInitialize() {super.onInitialize();-- get("first").remove();- get("last").remove();++ getPagingNavigation().setViewSize(7);++ var first = (AbstractLink) get("first");+ first.add(new Label("pageNumber", "1"));+ first.add(AttributeModifier.replace("data-page-index", "0"));+ first.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getPageable().getCurrentPage() == 0 ? "active" : "";+ }++ }));++ var last = (AbstractLink) get("last");+ last.add(new Label("pageNumber", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return String.valueOf(getPageable().getPageCount());+ }++ }));+ last.add(AttributeModifier.replace("data-page-index", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return String.valueOf(getPageable().getPageCount() - 1);+ }++ }));+ last.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getPageable().getCurrentPage() == getPageable().getPageCount() - 1 ? "active" : "";+ }++ }));add(AttributeAppender.append("class", "pagination justify-content-center align-items-center"));@@ -62,8 +102,7 @@ public class OnePagingNavigator extends AjaxPagingNavigator {@Overrideprotected Link<?> newPagingNavigationLink(String id, IPageable pageable, long pageIndex) {if (pagingHistorySupport instanceof ParamPagingHistorySupport) {- return new BookmarkablePageLink<Void>(id, getPage().getClass(),- ((ParamPagingHistorySupport)pagingHistorySupport).newPageParameters((int) pageIndex));+ return newParamPagingLink(id, (int) pageIndex, false, false);} else {return new AjaxPagingNavigationLink(id, pageable, pageIndex) {@@ -81,7 +120,17 @@ public class OnePagingNavigator extends AjaxPagingNavigator {@Overrideprotected void populateItem(final LoopItem loopItem) {super.populateItem(loopItem);- if ((getStartIndex() + loopItem.getIndex()) == pageable.getCurrentPage()) {+ long pageIndex = getStartIndex() + loopItem.getIndex();+ loopItem.get("pageLink").add(AttributeModifier.replace("data-page-index", String.valueOf(pageIndex)));+ loopItem.setVisible(pageIndex != 0 && pageIndex != pageable.getPageCount() - 1);+ long distance = Math.abs(pageIndex - pageable.getCurrentPage());+ if (distance >= 1)+ loopItem.add(AttributeAppender.append("class", "page-distance-1-plus"));+ if (distance >= 2)+ loopItem.add(AttributeAppender.append("class", "page-distance-2-plus"));+ if (distance >= 3)+ loopItem.add(AttributeAppender.append("class", "page-distance-3-plus"));+ if (pageIndex == pageable.getCurrentPage()) {loopItem.add(activeAttribute);}}@@ -91,24 +140,14 @@ public class OnePagingNavigator extends AjaxPagingNavigator {@Overrideprotected AbstractLink newPagingNavigationIncrementLink(String id, IPageable pageable, int increment) {AbstractLink link;- int pageNumber = (int) pageable.getCurrentPage() + increment;if (pagingHistorySupport instanceof ParamPagingHistorySupport) {- link = new BookmarkablePageLink<Void>(id, getPage().getClass(),- ((ParamPagingHistorySupport)pagingHistorySupport).newPageParameters(pageNumber)) {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(pageNumber >= 0 && pageNumber < getPageable().getPageCount());- }-- };- link.add(new DisabledAttributeLinkBehavior());+ link = newParamPagingLink(id, increment, true, false);} else {link = new AjaxPagingNavigationIncrementLink(id, pageable, increment) {@Overridepublic void onClick(AjaxRequestTarget target) {super.onClick(target);+ int pageNumber = (int) getPageable().getCurrentPage();if (pagingHistorySupport instanceof AjaxPagingHistorySupport)((AjaxPagingHistorySupport)pagingHistorySupport).onPageNavigated(target, pageNumber);}@@ -120,23 +159,8 @@ public class OnePagingNavigator extends AjaxPagingNavigator {@Overrideprotected AbstractLink newPagingNavigationLink(String id, IPageable pageable, int pageNumber) {AbstractLink link;- int absolutePageNumber;- if (pageNumber == -1)- absolutePageNumber = (int) (getPageable().getPageCount()-1);- else- absolutePageNumber = pageNumber;if (pagingHistorySupport instanceof ParamPagingHistorySupport) {- link = new BookmarkablePageLink<Void>(id, getPage().getClass(),- ((ParamPagingHistorySupport)pagingHistorySupport).newPageParameters(absolutePageNumber)) {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(absolutePageNumber != pageable.getCurrentPage());- }-- };- link.add(new DisabledAttributeLinkBehavior());+ link = newParamPagingLink(id, pageNumber, false, true);} else {link = new AjaxPagingNavigationLink(id, pageable, pageNumber) {@Override@@ -150,6 +174,42 @@ public class OnePagingNavigator extends AjaxPagingNavigator {return link;}+ private BookmarkablePageLink<Void> newParamPagingLink(String id, int pageNumber,+ boolean relativeToCurrent, boolean disableWhenCurrent) {+ var link = new BookmarkablePageLink<Void>(id, getPage().getClass()) {++ private int getAbsolutePageNumber() {+ if (relativeToCurrent)+ return (int) getPageable().getCurrentPage() + pageNumber;+ else if (pageNumber == -1)+ return (int) getPageable().getPageCount() - 1;+ else+ return pageNumber;+ }++ @Override+ public PageParameters getPageParameters() {+ return ((ParamPagingHistorySupport) pagingHistorySupport)+ .newPageParameters(getAbsolutePageNumber());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ int absolutePageNumber = getAbsolutePageNumber();+ if (relativeToCurrent) {+ setEnabled(absolutePageNumber >= 0+ && absolutePageNumber < getPageable().getPageCount());+ } else if (disableWhenCurrent) {+ setEnabled(absolutePageNumber != getPageable().getCurrentPage());+ }+ }++ };+ link.add(new DisabledAttributeLinkBehavior());+ return link;+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.css b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.cssindex 7cfa7238bd..d22ad12887 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.css@@ -1,4 +1,26 @@-.pagination>li.active>a.btn {+.pagination>li.active>a.btn, .pagination>li>a.btn.active {color: white;background-color: var(--primary);-}\ No newline at end of file+}++.pagination>li.page-forced-visible {+ display: list-item !important;+}++@media (max-width: 1399.98px) {+ .pagination>li.page-distance-3-plus {+ display: none;+ }+}++@media (max-width: 991.98px) {+ .pagination>li.page-distance-2-plus {+ display: none;+ }+}++@media (max-width: 767.98px) {+ .pagination>li.page-distance-1-plus {+ display: none;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.js b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.jsindex f5e1cb3a6c..7e26017f22 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.js+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.js@@ -1,8 +1,54 @@onedev.server.pagingNavigator = {onDomReady: function(containerId) {- $('#' + containerId).find('a[disabled=disabled]').each(function() {+ var $container = $('#' + containerId);+ $container.find('a[disabled=disabled]').each(function() {$(this).addClass("disabled");$(this).parent().addClass('disabled');- });+ });++ function updateEllipses() {+ $container.find('li.page-forced-visible').removeClass('page-forced-visible');+ var lastIndex = Number($container.find('a.last').attr('data-page-index'));+ var $activePage = $container.find('li.active a.page-number, a.page-number.active').first();+ var activeIndex = Number($activePage.attr('data-page-index'));+ var $visiblePages = $container.find('a.page-number:visible');+ if ($visiblePages.length < 3 && lastIndex >= 2) {+ var $nearestInteriorPage;+ var nearestDistance = Number.MAX_VALUE;+ $container.find('li a.page-number').each(function() {+ var pageIndex = Number($(this).attr('data-page-index'));+ var distance = Math.abs(pageIndex - activeIndex);+ if (pageIndex > 0 && pageIndex < lastIndex && distance < nearestDistance) {+ $nearestInteriorPage = $(this);+ nearestDistance = distance;+ }+ });+ if ($nearestInteriorPage)+ $nearestInteriorPage.parent().addClass('page-forced-visible');+ $visiblePages = $container.find('a.page-number:visible');+ }++ var interiorIndexes = [];+ $visiblePages.each(function() {+ var pageIndex = Number($(this).attr('data-page-index'));+ if (pageIndex > 0 && pageIndex < lastIndex)+ interiorIndexes.push(pageIndex);+ });++ var hasInteriorPages = interiorIndexes.length !== 0;+ var showLeft = hasInteriorPages+ ? interiorIndexes[0] > 1+ : lastIndex > 1 && activeIndex === 0;+ var showRight = hasInteriorPages+ ? interiorIndexes[interiorIndexes.length - 1] < lastIndex - 1+ : lastIndex > 1 && activeIndex === lastIndex;++ $container.find('.page-ellipsis-left').toggleClass('d-none', !showLeft);+ $container.find('.page-ellipsis-right').toggleClass('d-none', !showRight);+ }++ updateEllipses();+ var resizeNamespace = '.onedev-paging-' + containerId.replace(/[^a-zA-Z0-9_-]/g, '-');+ $(window).off('resize' + resizeNamespace).on('resize' + resizeNamespace, updateEllipses);}-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.javaindex 573a0b3cc4..46aba71592 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java@@ -164,7 +164,7 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf}});-+setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.cssindex 1112a499be..45947c5a06 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css@@ -32,13 +32,13 @@max-width: none;}-@media (min-width: 992px) {+@media (min-width: 1200px) {.side-main:has(> .saved-queries-panel:not(.saved-queries-closed)) .show-saved-queries {display: none !important;}}-@media (max-width: 991px) {+@media (max-width: 1199px) {.side-main > .saved-queries-panel {display: none;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.js b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.jsindex a2e9a11f05..4f9cd59c4d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.js+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.js@@ -1,5 +1,5 @@onedev.server.savedQueries = {- breakpoint: 992,+ breakpoint: 1200,showDropdown: function(link) {if (window.innerWidth >= this.breakpoint)