Skip to content

The Unified and Autonomous Development Platform

chore: Minor UI improvements

Robin Shenaf6cf4ad8190
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
index 6853294d30..f428999e70 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
@@ -304,8 +304,6 @@ public abstract class FieldSpec extends InputSpec {
ComponentContext.push(new ComponentContext(new PropertyComponent()));
try {
runScripts();
- } catch (Exception e) {
- e.printStackTrace();
} finally {
ComponentContext.pop();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ssoaccount/SsoAccountListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/ssoaccount/SsoAccountListPanel.html
index 36281bbf3b..f39cfa3d53 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/ssoaccount/SsoAccountListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ssoaccount/SsoAccountListPanel.html
@@ -1,12 +1,13 @@
<wicket:panel>
<div class="alert alert-light alert-notice mb-5">
<wicket:svg href="bulb" class="icon mr-2"></wicket:svg>
- <wicket:t>Delete SSO account here to unlink user and SSO subject. Note that SSO subject with verified email address
- will be linked with user with same verified email address automatically
+ <wicket:t>Delete SSO account here to reconnect corresponding SSO subject upon next login.
+ Note that SSO subject with verified email will be connected to user with same
+ verified email automatically
</wicket:t>
</div>
<table wicket:id="ssoAccounts" class="sso-accounts table table-hover"></table>
<wicket:fragment wicket:id="actionFrag">
<a wicket:id="delete" title="Delete" class="btn btn-xs btn-icon btn-light btn-hover-danger"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
-</wicket:panel>
\ No newline at end of file
+</wicket:panel>
\ No newline at end of file
diff --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.html
index 44187ff306..099520ffc7 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
@@ -5,6 +5,9 @@
<table wicket:id="scripts" class="table table-hover"></table>
</div>
</div>
+ <wicket:fragment wicket:id="nameColumn">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" t:data-tippy-content="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" t:data-tippy-content="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
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.java
index 97b2d62b29..66743baff6 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
@@ -16,6 +16,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -52,6 +53,35 @@ public class GroovyScriptListPage extends AdministrationPage {
private DataTable<GroovyScript, Void> scriptsTable;
+ private WebMarkupContainer newEditLink(String componentId, int scriptIndex) {
+ return new ModalLink(componentId) {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new GroovyScriptEditPanel(id, scriptIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(scriptsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected List<GroovyScript> getScripts() {
+ return scripts;
+ }
+
+ };
+ }
+
+ };
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -112,7 +142,12 @@ public class GroovyScriptListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getName()));
+ var fragment = new Fragment(componentId, "nameColumn", GroovyScriptListPage.this);
+ int scriptIndex = cellItem.findParent(LoopItem.class).getIndex();
+ var link = newEditLink("link", scriptIndex);
+ link.add(new Label("label", rowModel.getObject().getName()));
+ fragment.add(link);
+ cellItem.add(fragment);
}
});
columns.add(new AbstractColumn<>(Model.of(_T("Can Be Used By Jobs"))) {
@@ -145,32 +180,7 @@ public class GroovyScriptListPage extends AdministrationPage {
int scriptIndex = cellItem.findParent(LoopItem.class).getIndex();
Fragment fragment = new Fragment(componentId, "actionColumnFrag", GroovyScriptListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new GroovyScriptEditPanel(id, scriptIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(scriptsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected List<GroovyScript> getScripts() {
- return scripts;
- }
-
- };
- }
-
- });
+ fragment.add(newEditLink("edit", scriptIndex));
fragment.add(new AjaxLink<Void>("delete") {
@Override
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.html
index 71658bcd9f..c93852c424 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
@@ -6,6 +6,9 @@
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" t:data-tippy-content="Add default issue board"><wicket:svg href="plus" class="icon"></wicket:svg></a>
<table wicket:id="issueBoards" class="table table-hover"></table>
+ <wicket:fragment wicket:id="nameColumnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" t:data-tippy-content="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" t:data-tippy-content="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java
index 9b0ebbe542..7f2081b144 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java
@@ -16,6 +16,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -50,6 +51,34 @@ public class DefaultBoardListPage extends IssueSettingPage {
super(params);
}
+ private WebMarkupContainer newEditLink(String componentId, int boardIndex) {
+ return new ModalLink(componentId) {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ var oldAuditContent = VersionedXmlDoc.fromBean(getSetting().getBoardSpecs().get(boardIndex)).toXML();
+ return new BoardEditPanel(id, getSetting().getBoardSpecs(), boardIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, BoardSpec board) {
+ var newAuditContent = VersionedXmlDoc.fromBean(board).toXML();
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ getAuditManager().audit(null, "changed default issue board \"" + board.getName() + "\"", oldAuditContent, newAuditContent);
+ target.add(boardsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ };
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -108,7 +137,12 @@ public class DefaultBoardListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getName()));
+ var fragment = new Fragment(componentId, "nameColumnFrag", DefaultBoardListPage.this);
+ int boardIndex = cellItem.findParent(LoopItem.class).getIndex();
+ var link = newEditLink("link", boardIndex);
+ link.add(new Label("label", rowModel.getObject().getName()));
+ fragment.add(link);
+ cellItem.add(fragment);
}
});
@@ -144,31 +178,8 @@ public class DefaultBoardListPage extends IssueSettingPage {
int boardIndex = cellItem.findParent(LoopItem.class).getIndex();
Fragment fragment = new Fragment(componentId, "actionColumnFrag", DefaultBoardListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- var oldAuditContent = VersionedXmlDoc.fromBean(getSetting().getBoardSpecs().get(boardIndex)).toXML();
- return new BoardEditPanel(id, getSetting().getBoardSpecs(), boardIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, BoardSpec board) {
- var newAuditContent = VersionedXmlDoc.fromBean(board).toXML();
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- getAuditManager().audit(null, "changed default issue board \"" + board.getName() + "\"", oldAuditContent, newAuditContent);
- target.add(boardsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- });
+ fragment.add(newEditLink("edit", boardIndex));
+
fragment.add(new AjaxLink<Void>("delete") {
@Override
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.html
index ba123578ff..840692eebe 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
@@ -9,6 +9,9 @@
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" t:data-tippy-content="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="nameColumnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" t:data-tippy-content="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" t:data-tippy-content="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
index d686392583..1dc611a573 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
@@ -19,6 +19,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToo
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.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -115,7 +116,12 @@ public class IssueFieldListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getName()));
+ Fragment fragment = new Fragment(componentId, "nameColumnFrag", IssueFieldListPage.this);
+ int fieldIndex = cellItem.findParent(LoopItem.class).getIndex();
+ var link = newEditLink("link", fieldIndex);
+ link.add(new Label("label", rowModel.getObject().getName()));
+ fragment.add(link);
+ cellItem.add(fragment);
}
});
@@ -134,32 +140,7 @@ public class IssueFieldListPage extends IssueSettingPage {
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
int fieldIndex = cellItem.findParent(LoopItem.class).getIndex();
Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueFieldListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new FieldEditPanel(id, fieldIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(fieldsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected GlobalIssueSetting getSetting() {
- return IssueFieldListPage.this.getSetting();
- }
-
- };
- }
-
- });
+ fragment.add(newEditLink("edit", fieldIndex));
fragment.add(new AjaxLink<Void>("delete") {
@Override
@@ -221,6 +202,35 @@ public class IssueFieldListPage extends IssueSettingPage {
}.sortable("tbody"));
}
+ private WebMarkupContainer newEditLink(String componentId, int fieldIndex) {
+ return new ModalLink(componentId) {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new FieldEditPanel(id, fieldIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(fieldsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return IssueFieldListPage.this.getSetting();
+ }
+
+ };
+ }
+
+ };
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
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.html
index 50715b09b9..a09acb9b53 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
@@ -6,6 +6,9 @@
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" t:data-tippy-content="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="nameColumnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" t:data-tippy-content="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" t:data-tippy-content="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java
index a5eea878e3..a649b15301 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java
@@ -18,6 +18,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToo
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.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -52,6 +53,35 @@ public class IssueTemplateListPage extends IssueSettingPage {
private DataTable<IssueTemplate, Void> templatesTable;
+ private WebMarkupContainer newEditLink(String componentId, int templateIndex) {
+ return new ModalLink(componentId) {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new IssueTemplateEditPanel(id, templateIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(templatesTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return IssueTemplateListPage.this.getSetting();
+ }
+
+ };
+ }
+
+ };
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -112,13 +142,18 @@ public class IssueTemplateListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
+ int templateIndex = cellItem.findParent(LoopItem.class).getIndex();
+ var link = newEditLink("link", templateIndex);
String label;
IssueTemplate template = rowModel.getObject();
if (template.getIssueQuery() != null)
label = HtmlEscape.escapeHtml5(template.getIssueQuery());
else
label = "<i>All</i>";
- cellItem.add(new Label(componentId, label).setEscapeModelStrings(false));
+ link.add(new Label("label", label).setEscapeModelStrings(false));
+ Fragment fragment = new Fragment(componentId, "nameColumnFrag", IssueTemplateListPage.this);
+ fragment.add(link);
+ cellItem.add(fragment);
}
});
@@ -128,32 +163,7 @@ public class IssueTemplateListPage extends IssueSettingPage {
public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
int templateIndex = cellItem.findParent(LoopItem.class).getIndex();
Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueTemplateListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new IssueTemplateEditPanel(id, templateIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(templatesTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected GlobalIssueSetting getSetting() {
- return IssueTemplateListPage.this.getSetting();
- }
-
- };
- }
-
- });
+ fragment.add(newEditLink("edit", templateIndex));
fragment.add(new AjaxLink<Void>("delete") {
@Override
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.html
index d5e99bc705..05d9995e6b 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
@@ -7,7 +7,10 @@
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" t:data-tippy-content="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">
+ <wicket:fragment wicket:id="nameColumnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" t:data-tippy-content="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" t:data-tippy-content="Delete this link"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
index a0fbb56986..1993e7bb01 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
@@ -16,6 +16,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -48,6 +49,30 @@ public class LinkSpecListPage extends IssueSettingPage {
private DataTable<LinkSpec, Void> linksTable;
+ private WebMarkupContainer newEditLink(String componentId, IModel<LinkSpec> model) {
+ return new ModalLink(componentId) {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new LinkSpecEditPanel(id, model) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(linksTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ };
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -103,8 +128,11 @@ public class LinkSpecListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<LinkSpec>> cellItem, String componentId, IModel<LinkSpec> rowModel) {
- LinkSpec link = rowModel.getObject();
- cellItem.add(new Label(componentId, link.getName()));
+ var fragment = new Fragment(componentId, "nameColumnFrag", LinkSpecListPage.this);
+ var link = newEditLink("link", rowModel);
+ link.add(new Label("label", rowModel.getObject().getName()));
+ fragment.add(link);
+ cellItem.add(fragment);
}
});
@@ -125,28 +153,9 @@ public class LinkSpecListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<LinkSpec>> cellItem, String componentId, IModel<LinkSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "linkActionsFrag", LinkSpecListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new LinkSpecEditPanel(id, rowModel) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(linksTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- });
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", LinkSpecListPage.this);
+ fragment.add(newEditLink("edit", rowModel));
+
fragment.add(new AjaxLink<Void>("delete") {
@Override
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.html
index 15b1a096a8..8ce9e44f19 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
@@ -10,9 +10,11 @@
</div>
<wicket:fragment wicket:id="descriptionFrag">
<div class="font-weight-bolder text-nowrap mb-2">
- <span wicket:id="fromStates"></span>
- <wicket:svg href="arrow3" class="icon"/>
- <span wicket:id="toStates"></span>
+ <a wicket:id="link">
+ <span wicket:id="fromStates"></span>
+ <wicket:svg href="arrow3" class="icon"/>
+ <span wicket:id="toStates"></span>
+ </a>
</div>
<div wicket:id="when" class="mb-2"></div>
<div wicket:id="applicable"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
index b2f410fa9b..a32bbf7d3f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
@@ -17,6 +17,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -51,6 +52,35 @@ public class StateTransitionListPage extends IssueSettingPage {
super(params);
}
+ private WebMarkupContainer newEditLink(String componentId, int transitionIndex) {
+ return new ModalLink(componentId) {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new TransitionEditPanel(id, transitionIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(transitionsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return StateTransitionListPage.this.getSetting();
+ }
+
+ };
+ }
+
+ };
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -113,14 +143,18 @@ public class StateTransitionListPage extends IssueSettingPage {
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
TransitionSpec transition = rowModel.getObject();
Fragment fragment = new Fragment(componentId, "descriptionFrag", StateTransitionListPage.this);
+ int transitionIndex = cellItem.findParent(LoopItem.class).getIndex();
+ var link = newEditLink("link", transitionIndex);
if (transition.getFromStates().isEmpty())
- fragment.add(new Label("fromStates", _T("[Any state]")));
+ link.add(new Label("fromStates", _T("[Any state]")));
else
- fragment.add(new Label("fromStates", "[" + StringUtils.join(transition.getFromStates(), ",") + "]"));
+ link.add(new Label("fromStates", "[" + StringUtils.join(transition.getFromStates(), ",") + "]"));
if (transition.getToStates().isEmpty())
- fragment.add(new Label("toStates", _T("[Any state]")));
+ link.add(new Label("toStates", _T("[Any state]")));
else
- fragment.add(new Label("toStates", "[" + StringUtils.join(transition.getToStates(), ",") + "]"));
+ link.add(new Label("toStates", "[" + StringUtils.join(transition.getToStates(), ",") + "]"));
+
+ fragment.add(link);
fragment.add(new Label("when", MessageFormat.format(_T("When {0}"), transition.getTriggerDescription())));
@@ -140,32 +174,7 @@ public class StateTransitionListPage extends IssueSettingPage {
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
int transitionIndex = cellItem.findParent(LoopItem.class).getIndex();
Fragment fragment = new Fragment(componentId, "actionColumnFrag", StateTransitionListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new TransitionEditPanel(id, transitionIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(transitionsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected GlobalIssueSetting getSetting() {
- return StateTransitionListPage.this.getSetting();
- }
-
- };
- }
-
- });
+ fragment.add(newEditLink("edit", transitionIndex));
fragment.add(new AjaxLink<Void>("delete") {
@Override
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 efadcd794b..8837972211 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
@@ -104,7 +104,7 @@
<wicket:t>Two-factor Authentication</wicket:t>
</a>
<a wicket:id="mySsoAccounts" class="dropdown-item">
- <wicket:svg href="bell" class="icon mr-2"></wicket:svg>
+ <wicket:svg href="user" class="icon mr-2"></wicket:svg>
<wicket:t>SSO Accounts</wicket:t>
</a>
<a wicket:id="signOut" class="dropdown-item">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java
index 03ee36f95e..e5e4c9bf92 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java
@@ -381,7 +381,7 @@ public class SsoProcessPage extends SimplePage {
@Override
protected String getSubTitle() {
- return _T("Please tell how to set up your SSO account");
+ return _T("Connect with your SSO account");
}
private TransactionManager getTransactionManager() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java
index 90712d63cf..c1c3b461ce 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java
@@ -99,7 +99,7 @@ public abstract class UserPage extends LayoutPage implements UserAware {
if (!getUser().isServiceAccount() && getUser().isEnforce2FA())
tabs.add(new PageTab(Model.of(_T("Two-factor Authentication")), Model.of("shield"), UserTwoFactorAuthenticationPage.class, params));
if (!getUser().isServiceAccount()) {
- tabs.add(new PageTab(Model.of(_T("SSO Accounts")), Model.of("bell"), UserSsoAccountsPage.class, params));
+ tabs.add(new PageTab(Model.of(_T("SSO Accounts")), Model.of("user"), UserSsoAccountsPage.class, params));
tabs.add(new PageTab(Model.of(_T("Query Watches")), Model.of("bell"), UserQueryWatchesPage.class, params));
}
}