Skip to content

The Unified and Autonomous Development Platform

chore: Add link to show package publish help even packages are published

Robin Shen38775b6a9aad
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/question-o.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle-o.svg
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/asset/icon/question-o.svg
rename to server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle-o.svg
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle.svg
new file mode 100644
index 0000000000..8fbe47cc0e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ t="1733212620482"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ p-id="4267"
+ width="200"
+ height="200"
+ id="svg1"
+ sodipodi:docname="question-circle.svg"
+ inkscape:version="1.3.2 (091e20e, 2023-11-25)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs1" />
+ <sodipodi:namedview
+ id="namedview1"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="0"
+ inkscape:deskcolor="#d1d1d1"
+ inkscape:zoom="3.075"
+ inkscape:cx="100"
+ inkscape:cy="99.837398"
+ inkscape:window-width="1512"
+ inkscape:window-height="903"
+ inkscape:window-x="240"
+ inkscape:window-y="25"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg1" />
+ <path
+ d="m 512,65.888038 c 250.06338,0 452.77212,200.472402 452.77212,447.777002 0,247.3046 -202.70874,447.777 -452.77212,447.777 -250.06338,0 -452.772125,-200.4724 -452.772125,-447.777 C 59.227875,266.36044 261.93662,65.888038 512,65.888038 Z m 0,79.019472 c -205.93142,0 -372.87116,165.09801 -372.87116,368.75753 0,203.65951 166.93974,368.75753 372.87116,368.75753 205.93141,0 372.87116,-165.09802 372.87116,-368.75753 C 884.87116,310.00552 717.93141,144.90751 512,144.90751 Z m 49.51196,526.79647 v 79.01947 H 486.6714 l -0.0266,-79.01947 z m -4.42118,-391.0937 c 48.34008,9.64037 105.84214,55.23461 105.84214,121.55829 0,66.35002 -54.78543,91.45187 -74.41443,103.85792 -19.65564,12.4324 -27.00653,26.76126 -27.00653,41.98568 v 71.01217 h -74.8672 v -97.95781 c 0,-23.23173 7.53733,-39.50973 28.49801,-53.89128 l 4.71416,-3.08176 42.05454,-27.65681 c 26.82008,-17.8584 26.44722,-53.70691 9.85445,-69.53714 a 75.373241,74.541701 0 0 0 -65.97156,-16.72579 c -46.66217,9.0609 -52.04216,41.61693 -52.36177,73.22471 v 17.88474 h -74.60086 c 0,-61.52983 7.13781,-89.4237 40.32335,-124.66638 37.18058,-39.37804 89.56898,-45.6996 137.9357,-36.00654 z"
+ p-id="4268"
+ id="path1"
+ style="stroke-width:1.08635" />
+</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/EntityReferencePanel.html b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/EntityReferencePanel.html
index b7e4d229b1..7e94fca680 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/EntityReferencePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/EntityReferencePanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="head">Reference <a wicket:id="referenceHelp" class="ml-2 text-gray"><wicket:svg href="question-o" class="icon icon-sm"/></a></div>
+ <div class="head">Reference <a wicket:id="referenceHelp" class="ml-2 text-gray"><wicket:svg href="question-circle-o" class="icon icon-sm"/></a></div>
<div class="body">
<div class="d-flex align-items-center flex-nowrap">
<span wicket:id="reference" class="text-nowrap text-truncate mr-3"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
index c2b1bfd7f7..86dcd82314 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
@@ -24,16 +24,15 @@
<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
+ <a wicket:id="help" class="help text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="question-circle" class="icon"></wicket:svg> How to Publish
+ </a>
<span wicket:id="count" class="float-right text-gray"></span>
</div>
<div wicket:id="body">
<div wicket:id="feedback"></div>
<table wicket:id="packs" class="table"></table>
- <div wicket:id="help">
- <div class="alert alert-notice alert-light-info">No packages found. Follow below instructions to publish packages</div>
- <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-4"></ul>
- <div wicket:id="content"></div>
- </div>
+ <div wicket:id="help"></div>
</div>
</div>
</div>
@@ -44,4 +43,9 @@
</a>
<span wicket:id="labels"></span>
</wicket:fragment>
+ <wicket:fragment wicket:id="helpFrag">
+ <div class="alert alert-notice alert-light-info">Follow below instructions to publish packages into this project</div>
+ <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-4"></ul>
+ <div wicket:id="content"></div>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index ef95717fe3..fdb4858a07 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -45,6 +45,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -102,6 +103,8 @@ public abstract class PackListPanel extends Panel {
private Component saveQueryLink;
+ private Component helpLink;
+
private boolean querySubmitted = true;
public PackListPanel(String id, IModel<String> queryModel, boolean showType) {
@@ -166,6 +169,7 @@ public abstract class PackListPanel extends Panel {
private void doQuery(AjaxRequestTarget target) {
packsTable.setCurrentPage(0);
+ target.add(helpLink);
target.add(countLabel);
target.add(body);
if (selectionColumn != null)
@@ -420,6 +424,23 @@ public abstract class PackListPanel extends Panel {
});
+ add(helpLink = new DropdownLink("help") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ var help = newHelpPanel(id);
+ help.add(AttributeAppender.append("class", "pack-publish-help"));
+ return help;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!shouldShowHelp());
+ }
+
+ });
+ helpLink.setOutputMarkupPlaceholderTag(true);
+
queryInput = new TextField<>("input", queryStringModel);
queryInput.add(new PackQueryBehavior(new AbstractReadOnlyModel<>() {
@@ -520,7 +541,16 @@ public abstract class PackListPanel extends Panel {
};
- body = new WebMarkupContainer("body");
+ body = new WebMarkupContainer("body") {
+ @Override
+ protected void onBeforeRender() {
+ if (shouldShowHelp())
+ addOrReplace(newHelpPanel("help"));
+ else
+ addOrReplace(new WebMarkupContainer("help").setVisible(false));
+ super.onBeforeRender();
+ }
+ };
add(body.setOutputMarkupId(true));
body.add(new FencedFeedbackPanel("feedback", this));
@@ -622,42 +652,34 @@ public abstract class PackListPanel extends Panel {
setVisible(!shouldShowHelp());
}
});
-
- body.add(new WebMarkupContainer("help") {
- @Override
- protected void onBeforeRender() {
- var packSupports = new ArrayList<>(OneDev.getExtensions(PackSupport.class));
- packSupports.sort(Comparator.comparing(PackSupport::getOrder));
- List<Tab> tabs = new ArrayList<>();
- for (var packSupport: packSupports) {
- tabs.add(new AjaxActionTab(Model.of(packSupport.getPackType()), Model.of(packSupport.getPackIcon())) {
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- var helpContent = packSupport.renderHelp("content", getProject()) ;
- helpContent.setOutputMarkupId(true);
- replace(helpContent);
- target.add(helpContent);
- }
-
- });
+
+ setOutputMarkupId(true);
+ }
+
+ private WebMarkupContainer newHelpPanel(String componentId) {
+ var fragment = new Fragment(componentId, "helpFrag", this);
+ var packSupports = new ArrayList<>(OneDev.getExtensions(PackSupport.class));
+ packSupports.sort(Comparator.comparing(PackSupport::getOrder));
+ List<Tab> tabs = new ArrayList<>();
+ for (var packSupport: packSupports) {
+ tabs.add(new AjaxActionTab(Model.of(packSupport.getPackType()), Model.of(packSupport.getPackIcon())) {
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ var helpContent = packSupport.renderHelp("content", getProject()) ;
+ helpContent.setOutputMarkupId(true);
+ fragment.replace(helpContent);
+ target.add(helpContent);
}
- addOrReplace(new Tabbable("tabs", tabs));
-
- var helpContent = packSupports.iterator().next().renderHelp("content", getProject());
- helpContent.setOutputMarkupId(true);
- addOrReplace(helpContent);
- super.onBeforeRender();
- }
+ });
+ }
+ fragment.add(new Tabbable("tabs", tabs));
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(shouldShowHelp());
- }
- });
+ var helpContent = packSupports.iterator().next().renderHelp("content", getProject());
+ helpContent.setOutputMarkupId(true);
+ fragment.add(helpContent);
- setOutputMarkupId(true);
+ return fragment;
}
private boolean shouldShowHelp() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/pack-list.css b/server-core/src/main/java/io/onedev/server/web/component/pack/list/pack-list.css
index e69de29bb2..a349e2ab2b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/pack-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/pack-list.css
@@ -0,0 +1,4 @@
+.floating>.pack-publish-help {
+ max-width: 900px;
+ padding: 2rem;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index 977366ac69..1a8fbc0005 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -7,7 +7,7 @@
<th wicket:id="headers">
<span wicket:id="header"></span>
<span wicket:id="required" class="text-danger"></span>
- <span wicket:id="help"><wicket:svg href="question-o" class="icon icon-sm"/></span>
+ <span wicket:id="help"><wicket:svg href="question-circle-o" class="icon icon-sm"/></span>
</th>
<th class="actions"></th>
</tr>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
index f2c607a461..c6269639c3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
@@ -37,10 +37,10 @@
</div>
</div>
<wicket:fragment wicket:id="cpuHeaderFrag">
- <span class="mr-1">CPU</span> <a title="CPU capability in millis. This is normally (CPU cores)*1000"><wicket:svg href="question-o" class="icon icon-sm"/></a>
+ <span class="mr-1">CPU</span> <a title="CPU capability in millis. This is normally (CPU cores)*1000"><wicket:svg href="question-circle-o" class="icon icon-sm"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="memoryHeaderFrag">
- <span class="mr-1">Memory</span> <a title="Physical memory in mega bytes"><wicket:svg href="question-o" class="icon icon-sm"/></a>
+ <span class="mr-1">Memory</span> <a title="Physical memory in mega bytes"><wicket:svg href="question-circle-o" class="icon icon-sm"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="agentLinkFrag">
<a wicket:id="link" class="d-flex align-items-center"><svg wicket:id="icon" class="icon icon-lg mr-1"></svg> <span wicket:id="label"></span></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 31f667ae93..558591013b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -19,7 +19,7 @@
<a wicket:id="tryEE" href="https://onedev.io/pricing" class="try-ee badge badge-sm" title="Try Enterprise Edition">Try EE</a>
<div class="dropdown sidebar-help">
<a href="#" class="dropdown-toggle no-dropdown-caret" data-toggle="dropdown">
- <wicket:svg href="question-o" class="icon"></wicket:svg>
+ <wicket:svg href="question-circle-o" class="icon"></wicket:svg>
</a>
<div class="dropdown-menu">
<a href="https://docs.onedev.io" class="dropdown-item" target="_blank">Documentation</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
index 1cfad07b72..09b28649de 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
@@ -10,7 +10,7 @@
<input wicket:id="compareWithMergeBase" type="checkbox">
common ancestor
</label>
- <span wicket:id="mergeBaseTooltip" class="help"><wicket:svg href="question-o" class="icon"></wicket:svg></span>
+ <span wicket:id="mergeBaseTooltip" class="help"><wicket:svg href="question-circle-o" class="icon"></wicket:svg></span>
</wicket:enclosure>
</div>
<div wicket:id="leftRevSelector" class="selector"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 2bf21a6c7b..b7d7176b44 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -201,7 +201,7 @@
<div class="synchronize d-flex align-items-center mr-3">
<a wicket:id="synchronize" class="btn btn-light-primary mr-2">Synchronize</a>
<a href="javascript:void(0)" class="help text-muted text-hover-primary" title="In case the pull request status is out of sync with underlying repository, you may synchronize them manually here">
- <wicket:svg href="question-o" class="icon"/>
+ <wicket:svg href="question-circle-o" class="icon"/>
</a>
</div>
</wicket:enclosure>