The Unified and Autonomous Development Platform
Minor UI improvements
Robin Shenfc423b87aed4
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.jsindex 2f79fbbae1..214d6e1be7 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js@@ -54,12 +54,12 @@ onedev.server.infiniteScroll = {$container.data("callback")($items.length, pageSize);$container.data("appending", true);if ($lastItem.is("li")) {- $lastItem.after("<li class='loading-indicator' style='text-align:center;'><img src='/img/" + ajaxIndicator + "'></img></li>");+ $lastItem.after("<li class='loading-indicator' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></li>");} else if ($lastItem.is("tr")) {var colspan = $lastItem.children().length;- $lastItem.after("<tr class='loading-indicator'><td colspan='" + colspan + "' style='text-align:center;'><img src='/img/" + ajaxIndicator + "'></img></td></tr>");+ $lastItem.after("<tr class='loading-indicator'><td colspan='" + colspan + "' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></td></tr>");} else {- $lastItem.after("<div class='loading-indicator' style='text-align:center;'><img src='/img/" + ajaxIndicator + "'></img></div>");+ $lastItem.after("<div class='loading-indicator' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></div>");}} else if (scrollTop) {if (scrollTop > $container.scrollTop())diff --git a/server-core/src/main/java/io/onedev/server/web/component/AjaxLazyLoadPanel.java b/server-core/src/main/java/io/onedev/server/web/component/AjaxLazyLoadPanel.javanew file mode 100644index 0000000000..fe24e21509--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/AjaxLazyLoadPanel.java@@ -0,0 +1,28 @@+package io.onedev.server.web.component;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.web.page.base.BasePage;++public abstract class AjaxLazyLoadPanel extends org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel {++ private static final long serialVersionUID = 1L;++ public AjaxLazyLoadPanel(String id) {+ super(id);+ }++ public AjaxLazyLoadPanel(final String id, final IModel<?> model) {+ super(id, model);+ }++ @Override+ public Component getLoadingComponent(String markupId) {+ BasePage page = (BasePage) getPage();+ String icon = page.isDarkMode()? "dark-ajax-indicator.gif": "ajax-indicator.gif";+ return new Label(markupId, "<img alt='Loading...' src='/~img/" + icon + "'/>").setEscapeModelStrings(false);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.cssindex 81e5f49fba..7bcb4c77ea 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css@@ -163,7 +163,7 @@}.commit-list .no-commits {- background: url(/icon/empty.svg) no-repeat scroll center center;+ background: url(/~icon/empty.svg) no-repeat scroll center center;background-size: 240px 240px;border-top: none;height: 240px;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css b/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.cssindex 0349470c02..3212bf11e3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css@@ -1,6 +1,9 @@.diff-stat-bar {color: var(--secondary);}+.dark-mode .diff-stat-bar {+ color: var(--gray-dark);+}.diff-stat-bar>i {font-size: 16px;font-style: normal;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.cssindex f10a334700..7451a909bc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css@@ -57,7 +57,7 @@.revision-diff>.body>.detail>.comment>.ui-resizable-handle {border-right: 1px solid var(--light-gray);- background: var(--light) url(/icon/grip3.svg) no-repeat scroll center center;+ background: var(--light) url(/~icon/grip3.svg) no-repeat scroll center center;background-size: 18px 18px;cursor: e-resize;width: 4px;@@ -66,7 +66,7 @@}.dark-mode .revision-diff>.body>.detail>.comment>.ui-resizable-handle {border-right-color: var(--dark-mode-lighter-dark);- background: var(--dark-mode-light-dark) url(/icon/dark-grip3.svg) no-repeat scroll center center;+ background: var(--dark-mode-light-dark) url(/~icon/dark-grip3.svg) no-repeat scroll center center;background-size: 18px 18px;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex 06bf613e9f..f2f85eebe4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -82,7 +82,7 @@}.markdown-editor .ui-resizable-handle {- background: var(--light-gray) url(/icon/grip2.svg) no-repeat scroll center center;+ background: var(--light-gray) url(/~icon/grip2.svg) no-repeat scroll center center;background-size: 20px 20px;cursor: s-resize;height: 4px;@@ -90,7 +90,7 @@border-radius: 0 0 0.42rem 0.42rem;}.dark-mode .markdown-editor .ui-resizable-handle {- background: var(--dark-mode-light-dark) url(/icon/dark-grip2.svg) no-repeat scroll center center;+ background: var(--dark-mode-light-dark) url(/~icon/dark-grip2.svg) no-repeat scroll center center;background-size: 20px 20px;}@@ -451,10 +451,10 @@position: absolute;left: 0;top: 0;- background: url("/img/ajax-indicator-big.png") center no-repeat;+ background: url("/~img/ajax-indicator-big.png") center no-repeat;}.dark-mode .markdown-image-loading {- background: url("/img/dark-ajax-indicator-big.png") center no-repeat;+ background: url("/~img/dark-ajax-indicator-big.png") center no-repeat;}.reference.mention {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.javaindex f0146e7879..66a145b250 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java@@ -27,7 +27,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.AgentTokenManager;import io.onedev.server.model.AgentToken;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;-import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.util.LoadableDetachableDataProvider;@@ -156,9 +155,16 @@ public class TokenListPanel extends GenericPanel<List<AgentToken>> {};DataTable<AgentToken, Void> table;- add(table = new DataTable<AgentToken, Void>("tokens", columns, dataProvider, Integer.MAX_VALUE));+ add(table = new DataTable<AgentToken, Void>("tokens", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getUnusedTokens().isEmpty());+ }++ });table.addBottomToolbar(new NoRecordsToolbar(table));- table.add(new NoRecordsBehavior());}private List<AgentToken> getUnusedTokens() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.htmlindex 6b1e8daae6..d2dbe0484e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html@@ -7,7 +7,7 @@<meta name="Author" content="onedev.io" /><meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, shrink-to-fit=no"><meta wicket:id="robots" name="robots">- <link rel="icon" type="image/png" href="/img/logo.png">+ <link rel="icon" type="image/png" href="/~img/logo.png"><title wicket:id="pageTitle">OneDev</title></head><body>diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex c36a2137db..90e6b1e287 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -658,7 +658,7 @@ table.norecords thead {display: none;}table.norecords tfoot td, div.norecords, td.norecords {- background: url(/icon/empty.svg) no-repeat scroll center center;+ background: url(/~icon/empty.svg) no-repeat scroll center center;background-size: 240px 240px;border-top: none;height: 240px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.cssindex d2787ec67a..cefa5376cc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css@@ -45,7 +45,7 @@border-top-color: var(--dark-mode-lighter-dark);}.project-blob>.search-result>.ui-resizable-handle {- background: var(--light) url(/icon/grip2.svg) no-repeat scroll center center;+ background: var(--light) url(/~icon/grip2.svg) no-repeat scroll center center;background-size: 20px 20px;cursor: n-resize;height: 4px;@@ -53,7 +53,7 @@position: relative;}.dark-mode .project-blob>.search-result>.ui-resizable-handle {- background: var(--dark-mode-light-dark) url(/icon/dark-grip2.svg) no-repeat scroll center center;+ background: var(--dark-mode-light-dark) url(/~icon/dark-grip2.svg) no-repeat scroll center center;background-size: 20px 20px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.htmlindex b2d8c4a7d4..b865131e65 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.html@@ -1,6 +1,6 @@<wicket:panel><div class="m-4 no-commits text-center">- <img src="/icon/empty.svg" class="text-center mb-5"/>+ <img src="/~icon/empty.svg" class="text-center mb-5"/><h3 class="alert-heading mb-3">Project does not have any code yet</h3><div class="mb-4">You may initialize the project by <a wicket:id="addFiles" class="link-primary">adding files</a>,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.cssindex 1d67abc53a..b623d77410 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css@@ -9,7 +9,7 @@}.source-view>.comment>.ui-resizable-handle {border-right: 1px solid var(--light-gray);- background: var(--light) url(/icon/grip3.svg) no-repeat scroll center center;+ background: var(--light) url(/~icon/grip3.svg) no-repeat scroll center center;background-size: 18px 18px;cursor: e-resize;width: 4px;@@ -18,7 +18,7 @@}.dark-mode .source-view>.comment>.ui-resizable-handle {border-right-color: var(--dark-mode-lighter-dark);- background: var(--dark-mode-light-dark) url(/icon/dark-grip3.svg) no-repeat scroll center center;+ background: var(--dark-mode-light-dark) url(/~icon/dark-grip3.svg) no-repeat scroll center center;background-size: 18px 18px;}.source-view>.outline {@@ -26,7 +26,7 @@}.source-view>.outline>.ui-resizable-handle {border-left: 1px solid var(--light-gray);- background: var(--light) url(/icon/grip3.svg) no-repeat scroll center center;+ background: var(--light) url(/~icon/grip3.svg) no-repeat scroll center center;background-size: 18px 18px;cursor: w-resize;width: 4px;@@ -35,7 +35,7 @@}.dark-mode .source-view>.outline>.ui-resizable-handle {border-left-color: var(--dark-mode-lighter-dark);- background: var(--dark-mode-light-dark) url(/icon/dark-grip3.svg) no-repeat scroll center center;+ background: var(--dark-mode-light-dark) url(/~icon/dark-grip3.svg) no-repeat scroll center center;background-size: 18px 18px;}.source-view>.outline>.content>.body {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css b/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.cssindex ec3d464d26..5996cff540 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css@@ -66,7 +66,7 @@}#searching-branches {- background: url(/img/ajax-indicator-big.png) no-repeat scroll center center;+ background: url(/~img/ajax-indicator-big.png) no-repeat scroll center center;background-size: 64px 64px;width: 64px;height: 64px;@@ -77,5 +77,5 @@display: none;}.dark-mode #searching-branches {- background: url(/img/dark-ajax-indicator-big.png) no-repeat scroll center center;+ background: url(/~img/dark-ajax-indicator-big.png) no-repeat scroll center center;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 178e3c83b0..d98cc50cfe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -17,7 +17,6 @@ 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.extensions.ajax.markup.html.AjaxLazyLoadPanel;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -73,6 +72,7 @@ import io.onedev.server.util.JobSecretAuthorizationContext;import io.onedev.server.util.JobSecretAuthorizationContextAware;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.asset.emoji.Emojis;+import io.onedev.server.web.component.AjaxLazyLoadPanel;import io.onedev.server.web.component.branch.create.CreateBranchLink;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.createtag.CreateTagLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.cssindex abe9de5b8c..fc11468659 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css@@ -12,12 +12,12 @@}.project-contribs .top-contributors .loading {- background: url(/img/ajax-indicator-big.png) no-repeat scroll center center;+ background: url(/~img/ajax-indicator-big.png) no-repeat scroll center center;background-size: 64px 64px;height: 64px;}.dark-mode .project-contribs .top-contributors .loading {- background: url(/img/dark-ajax-indicator-big.png) no-repeat scroll center center;+ background: url(/~img/dark-ajax-indicator-big.png) no-repeat scroll center center;}.project-contribs .top-contributors .head .total-contribution span.additions {diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.cssindex 9c59d20395..2a7b5048a5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css@@ -1,9 +1,9 @@.SimplePage {- background: url(/img/mesh.jpg) no-repeat left top fixed;+ background: url(/~img/mesh.jpg) no-repeat left top fixed;background-size: cover;}.SimplePage.dark-mode {- background: url(/img/dark-mesh.jpg) no-repeat left top fixed;+ background: url(/~img/dark-mesh.jpg) no-repeat left top fixed;background-size: cover;}.SimplePage>body {diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.javaindex 5994900b3a..e4b0a6968b 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java@@ -98,8 +98,8 @@ public class ProductServletConfigurator implements ServletConfigurator {*/context.addServlet(new ServletHolder(wicketServlet), "/");- context.addServlet(new ServletHolder(new ClasspathAssetServlet(ImageScope.class)), "/img/*");- context.addServlet(new ServletHolder(new ClasspathAssetServlet(IconScope.class)), "/icon/*");+ context.addServlet(new ServletHolder(new ClasspathAssetServlet(ImageScope.class)), "/~img/*");+ context.addServlet(new ServletHolder(new ClasspathAssetServlet(IconScope.class)), "/~icon/*");context.getSessionHandler().addEventListener(new HttpSessionListener() {