The Unified and Autonomous Development Platform
chore: Minor UI improvements
Robin Shen6c5b073ce6d5
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java b/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.javaindex f83a1f5dfa..70192dbfa4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java@@ -1,14 +1,12 @@package io.onedev.server.buildspec;-import java.io.Serializable;-import io.onedev.server.annotation.Editable;+import java.io.Serializable;+@Editablepublic interface NamedElement extends Serializable {String getName();- void setName(String name);-}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex 113ed797c5..35dfcf9f99 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -51,7 +51,7 @@ public class GroovyScript implements Serializable {this.content = content;}- @Editable(order=350)+ @Editable(order=350, name="Can Be Used By Jobs", description = "Whether or not this script can be used in CI/CD jobs")public boolean isCanBeUsedByBuildJobs() {return canBeUsedByBuildJobs;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.htmlindex 8b27da3e39..4f7c4b7462 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html@@ -15,7 +15,7 @@<span wicket:id="verificationStatus" class="ml-1"></span></td><td>- <a wicket:id="operations" title="Operatioins"><wicket:svg href="ellipsis" class="icon"/></a>+ <a wicket:id="operations" title="Operations" class="btn btn-xs btn-icon btn-light btn-hover-primary"><wicket:svg href="arrow" class="icon rotate-90"/></a></td></tr><tr>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.htmlindex 4c80bd5a18..f9bbe25ee7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html@@ -1,12 +1,12 @@-<wicket:panel>- <div class="post-build-action-list">- <table wicket:id="actions" class="table-hover"></table>- <div class="foot">- <a wicket:id="addNew" title="Add new post-build action" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>- </div>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment>+<wicket:panel>+ <div class="post-build-action-list">+ <table wicket:id="actions" class="table-hover"></table>+ <div class="foot">+ <a wicket:id="addNew" title="Add new post-build action" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ </div>+ </div>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.htmlindex d04d5f2864..8c4b639dd5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html@@ -15,7 +15,7 @@<div wicket:id="editor"></div></div><div class="modal-footer">- <button wicket:id="ok" class="btn btn-primary">Ok</button>+ <button wicket:id="save" class="btn btn-primary">Save</button><button wicket:id="cancel" class="btn btn-secondary">Cancel</button></div></form>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.javaindex b4f33302e7..352f9e1941 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java@@ -86,7 +86,7 @@ abstract class StepEditContentPanel extends Panel {BeanEditor editor = BeanContext.edit("editor", step);form.add(editor);- form.add(new AjaxButton("ok") {+ form.add(new AjaxButton("save") {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.htmlindex 0665719dab..391a30bf14 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html@@ -6,7 +6,7 @@</div></div><wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="more" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>- <a wicket:id="actions" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Add new step above this"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="actions" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More operations"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.javaindex 3b93a5fcfe..d2f7ae5d99 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java@@ -125,7 +125,7 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {Item<?> row = cellItem.findParent(Item.class);var index = row.getIndex();row.setOutputMarkupId(true);- fragment.add(new AjaxLink<Void>("more") {+ fragment.add(new AjaxLink<Void>("edit") {@Overridepublic void onClick(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.htmlindex 0287b50cb6..04211b2a55 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.html@@ -6,7 +6,7 @@</div></div><wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a><a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.htmlindex 79586cf6e1..fb41bb5096 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html@@ -1,12 +1,12 @@-<wicket:extend>- <div class="card">- <div class="card-body">- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add groovy script"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <table wicket:id="scripts" class="table table-hover"></table>- </div>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment>-</wicket:extend>+<wicket:extend>+ <div class="card">+ <div class="card-body">+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add groovy script"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <table wicket:id="scripts" class="table table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.javaindex 417710c449..7d607cfa59 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java@@ -11,7 +11,9 @@ import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.util.TextUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -29,6 +31,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import java.lang.reflect.AnnotatedElement;import java.util.ArrayList;import java.util.List;@@ -77,7 +80,7 @@ public class GroovyScriptListPage extends AdministrationPage {List<IColumn<GroovyScript, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("")) {+ columns.add(new AbstractColumn<>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {@@ -89,31 +92,53 @@ public class GroovyScriptListPage extends AdministrationPage {tag.setName("svg");tag.put("class", "icon drag-indicator");}-+});}-+@Overridepublic String getCssClass() {return "minimum actions";}-+});- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<>(Model.of("Name")) {@Overridepublic void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {cellItem.add(new Label(componentId, rowModel.getObject().getName()));}- });+ });+ columns.add(new AbstractColumn<>(Model.of("Can Be Used By Jobs")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {+ cellItem.add(new Label(componentId, TextUtils.getDisplayValue(rowModel.getObject().isCanBeUsedByBuildJobs())));+ }+ });+ columns.add(new AbstractColumn<>(Model.of("Job Authorization")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {+ var script = rowModel.getObject();+ if (script.isCanBeUsedByBuildJobs()) {+ if (script.getAuthorization() != null)+ cellItem.add(new Label(componentId, script.getAuthorization()));+ else+ cellItem.add(new Label(componentId, "<i>Any job</i>").setEscapeModelStrings(false));+ } else {+ cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));+ }+ }+ });- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("")) {+ columns.add(new AbstractColumn<>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {int scriptIndex = cellItem.findParent(LoopItem.class).getIndex();-+Fragment fragment = new Fragment(componentId, "actionColumnFrag", GroovyScriptListPage.this);fragment.add(new ModalLink("edit") {@@ -139,7 +164,7 @@ public class GroovyScriptListPage extends AdministrationPage {};}-+});fragment.add(new AjaxLink<Void>("delete") {@@ -155,9 +180,9 @@ public class GroovyScriptListPage extends AdministrationPage {OneDev.getInstance(SettingManager.class).saveGroovyScripts(scripts);target.add(scriptsTable);}-+});-+cellItem.add(fragment);}@@ -177,7 +202,7 @@ public class GroovyScriptListPage extends AdministrationPage {};- add(scriptsTable = new DataTable<GroovyScript, Void>("scripts", columns, dataProvider, Integer.MAX_VALUE));+ add(scriptsTable = new DataTable<>("scripts", columns, dataProvider, Integer.MAX_VALUE));scriptsTable.addTopToolbar(new HeadersToolbar<Void>(scriptsTable, null));scriptsTable.addBottomToolbar(new NoRecordsToolbar(scriptsTable));scriptsTable.add(new NoRecordsBehavior());diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.htmlindex 63953e0452..d7984b3359 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html@@ -7,7 +7,7 @@<table wicket:id="issueBoards" class="table table-hover"></table><wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a><a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.htmlindex ecb683c944..81c1b152f2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html@@ -1,16 +1,16 @@-<wicket:extend>- <div class="issue-fields">- <div class="text-muted mb-4">- <wicket:svg href="bulb" class="icon"/> Define all custom issue fields here. Each project can- decide to use all or a subset of these fields via its issue transition setting.- <b class="text-warning">NOTE: </b> Newly defined fields by default only appear in new issues.- Batch edit existing issues from issue list page if you want them to have these new fields- </div>- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add custom field"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <table wicket:id="issueFields" class="table table-hover"></table>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment>-</wicket:extend>+<wicket:extend>+ <div class="issue-fields">+ <div class="text-muted mb-4">+ <wicket:svg href="bulb" class="icon"/> Define all custom issue fields here. Each project can+ decide to use all or a subset of these fields via its issue transition setting.+ <b class="text-warning">NOTE: </b> Newly defined fields by default only appear in new issues.+ Batch edit existing issues from issue list page if you want them to have these new fields+ </div>+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add custom field"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <table wicket:id="issueFields" class="table table-hover"></table>+ </div>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.htmlindex 67b5e9cc4f..c2e304fc18 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.html@@ -1,13 +1,13 @@-<wicket:extend>- <div class="text-muted mb-4">- <wicket:svg href="bulb" class="icon"/> Define issue templates here.- When a new issue is created, the first matching template will be used.- </div>- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue description template"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <table wicket:id="issueTemplates" class="table table-hover"></table>-- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment>-</wicket:extend>+<wicket:extend>+ <div class="text-muted mb-4">+ <wicket:svg href="bulb" class="icon"/> Define issue templates here.+ When a new issue is created, the first matching template will be used.+ </div>+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue description template"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <table wicket:id="issueTemplates" class="table table-hover"></table>++ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.htmlindex bdde8d2a0c..828553a7a0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html@@ -1,14 +1,14 @@-<wicket:extend>- <div class="issue-links">- <div class="text-muted mb-4">- <wicket:svg href="bulb" class="icon"/> Links can be used to associate different issues. For instance, an issue can be linked to- child issues or blocking issues- </div>- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue link"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <table wicket:id="links" class="table table-hover"></table>- </div>- <wicket:fragment wicket:id="linkActionsFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon align-middle"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this link"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>- </wicket:fragment>-</wicket:extend>+<wicket:extend>+ <div class="issue-links">+ <div class="text-muted mb-4">+ <wicket:svg href="bulb" class="icon"/> Links can be used to associate different issues. For instance, an issue can be linked to+ child issues or blocking issues+ </div>+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue link"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <table wicket:id="links" class="table table-hover"></table>+ </div>+ <wicket:fragment wicket:id="linkActionsFrag">+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon align-middle"></wicket:svg></a>+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this link"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.htmlindex 95d788cb48..2147497932 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html@@ -18,7 +18,7 @@<div wicket:id="applicable"></div></wicket:fragment><wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a><a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.htmlindex db302a4f8e..343e955256 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.html@@ -1,16 +1,16 @@-<wicket:extend>- <div class="card">- <div class="card-body">- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add SSO Provider"><wicket:svg href="plus" class="icon"/></a>- <table wicket:id="connectors" class="table table-hover"></table>- </div>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment>- <wicket:fragment wicket:id="callbackUriFrag">- <span wicket:id="value"></span>- <a wicket:id="copy"><wicket:svg href="copy" class="icon icon-sm"/></a>- </wicket:fragment>-</wicket:extend>+<wicket:extend>+ <div class="card">+ <div class="card-body">+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add SSO Provider"><wicket:svg href="plus" class="icon"/></a>+ <table wicket:id="connectors" class="table table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="callbackUriFrag">+ <span wicket:id="value"></span>+ <a wicket:id="copy"><wicket:svg href="copy" class="icon icon-sm"/></a>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.htmlindex b45ea78d25..3f6315acd7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html@@ -30,7 +30,7 @@<wicket:svg href="grip" class="icon drag-indicator flex-shrink-0 mr-1"/><span wicket:id="label" class="label"></span></a>- <a wicket:id="actions" title="Actions" class="actions btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>+ <a wicket:id="actions" title="Operations" class="actions btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a></div></div><div class="add btn-group btn-block"><a wicket:id="create" class="create btn btn-primary justify-content-start no-suggestions">@@ -48,7 +48,7 @@<wicket:svg href="grip" class="icon drag-indicator flex-shrink-0 mr-1"/><span wicket:id="label" class="label"></span></a>- <a wicket:id="actions" title="Actions" class="actions btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>+ <a wicket:id="actions" title="Operations" class="actions btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a></wicket:fragment><wicket:fragment wicket:id="addJobFrag"><a wicket:id="create" class="create btn btn-primary justify-content-start text-nowrap">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex 8b89e1f0a6..e12e69bf1d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -261,9 +261,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);dropdown.close();- var newJob = SerializationUtils.clone(getJobs().get(jobIndex));- newJob.setName(null);- addJob(target, newJob);+ addJob(target, SerializationUtils.clone(getJobs().get(jobIndex)));}@Override@@ -1066,9 +1064,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);dropdown.close();- var newElement = SerializationUtils.clone(getElements().get(item.getIndex()));- newElement.setName(null);- addElement(target, newElement);+ addElement(target, SerializationUtils.clone(getElements().get(item.getIndex())));}@Override