Skip to content

The Unified and Autonomous Development Platform

Minor UI improvements

Robin Shen7d6324e5b2dc
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
index d19574c835..f83da3d979 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="leave-confirm board-spec-edit">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Board</h5>
+ <h5 id="modal-title" class="modal-title">Issue Board</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
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.html
index 2c4a847cb6..1add1ef9d3 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="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="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:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
index 63925d1d04..ba07aee864 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
@@ -130,7 +130,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
}
});
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html
index 62850fe13d..89e99878c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="groovy-script-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Groovy Script</h5>
+ <h5 id="modal-title" class="modal-title">Groovy Script</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
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 f261008fb8..79586cf6e1 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
@@ -6,7 +6,7 @@
</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="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>
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 78fd34ddf0..1593ec1b8e 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
@@ -36,7 +36,6 @@ 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.page.admin.AdministrationPage;
-import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
public class GroovyScriptListPage extends AdministrationPage {
@@ -119,16 +118,7 @@ public class GroovyScriptListPage extends AdministrationPage {
}
});
- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Can be Used by Build Jobs")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
- cellItem.add(new Label(componentId, TextUtils.describe(rowModel.getObject().isCanBeUsedByBuildJobs())));
- }
-
- });
-
- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index 187eb57402..89e67472d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
@@ -188,7 +188,7 @@ public class GroupListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<Group, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<Group, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId, IModel<Group> rowModel) {
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 d7984b3359..63953e0452 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="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <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>
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 9ad1b8f127..514b38e06f 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
@@ -133,7 +133,7 @@ public class DefaultBoardListPage extends IssueSettingPage {
});
- columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html
index 7fd2f6592a..f119fa23d1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="field-spec-edit input-spec-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Field</h5>
+ <h5 id="modal-title" class="modal-title">Issue Field</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
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 a5b41fbd19..3d7847ab08 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
@@ -8,7 +8,7 @@
<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="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>
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 f08bdcea12..597b4258b8 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
@@ -43,7 +43,6 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
-import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
public class IssueFieldListPage extends IssueSettingPage {
@@ -127,22 +126,7 @@ public class IssueFieldListPage extends IssueSettingPage {
}
});
- columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Display in Issue List")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
- FieldSpec field = rowModel.getObject();
- cellItem.add(new Label(componentId, TextUtils.describe(getSetting().getListFields().contains(field.getName()))));
- }
-
- @Override
- public String getCssClass() {
- return "d-none d-lg-table-cell";
- }
-
- });
-
- columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html
index e9c75960c7..39e5ad8d6a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="issue-template-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Template</h5>
+ <h5 id="modal-title" class="modal-title">Description Template</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
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 371d5e52f9..67b5e9cc4f 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
@@ -7,7 +7,7 @@
<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="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>
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 a0a200f9b9..097cb8047b 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
@@ -125,7 +125,7 @@ public class IssueTemplateListPage extends IssueSettingPage {
}
});
- columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
index 22f8c82faa..22496b91b5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
@@ -149,7 +149,7 @@ public class IssueStateListPage extends IssueSettingPage {
});
- columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html
index 7f98a71302..d68806ed53 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="state-spec-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit State</h5>
+ <h5 id="modal-title" class="modal-title">Issue State</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
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 b62bb99d34..1370e38e53 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
@@ -8,7 +8,7 @@
<table wicket:id="stateTransitions" 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="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>
\ No newline at end of file
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 796487c52e..cab7d10f47 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
@@ -139,25 +139,7 @@ public class StateTransitionListPage extends IssueSettingPage {
});
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Applicable Issues")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- TransitionSpec transition = rowModel.getObject();
- if (transition.getTrigger().getIssueQuery() != null)
- cellItem.add(new Label(componentId, transition.getTrigger().getIssueQuery()));
- else
- cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));
- }
-
- @Override
- public String getCssClass() {
- return "d-none d-lg-table-cell";
- }
-
- });
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.html
index a2bf7f91a4..972466347f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="transition-spec-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit State Transition</h5>
+ <h5 id="modal-title" class="modal-title">Issue State Transition</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
index 8194fd77ef..ee7a9dbdc9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
@@ -177,7 +177,7 @@ public class RoleListPage extends AdministrationPage {
}
});
- columns.add(new AbstractColumn<Role, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<Role, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<Role>> cellItem, String componentId, IModel<Role> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.html
index d71f1d2fac..cb67389d0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="default-project-designation-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Default Project</h5>
+ <h5 id="modal-title" class="modal-title">Default Project</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java
index d517758090..8415d07fb8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java
@@ -134,7 +134,7 @@ public class DefaultProjectDesignationListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<DefaultProjectDesignation, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<DefaultProjectDesignation, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<DefaultProjectDesignation>> cellItem, String componentId, IModel<DefaultProjectDesignation> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.html
index 2852c2058c..81c9f94373 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="issue-creation-setting-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Issue Creation Setting</h5>
+ <h5 id="modal-title" class="modal-title">Issue Creation Setting</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html
index 07c1844311..0a987c36f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html
@@ -9,7 +9,7 @@
</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="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>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.java
index 1cb92effe6..a19b8f2d79 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.java
@@ -138,16 +138,7 @@ public class IssueCreationSettingListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("Issue Fields")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
- cellItem.add(new Label(componentId, "<i>Edit to show</i>").setEscapeModelStrings(false));
- }
-
- });
-
- columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.html
index 6954b899ff..a5bdbc3649 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="sender-authorization-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Sender Authorization</h5>
+ <h5 id="modal-title" class="modal-title">Sender Authorization</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java
index 442e719034..2da52a6291 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java
@@ -148,7 +148,7 @@ public class SenderAuthorizationListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId, IModel<SenderAuthorization> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html
index 24a350a455..f5d41edea5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="sso-connector-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Single Sign On Provider</h5>
+ <h5 id="modal-title" class="modal-title">Single Sign On Provider</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html
index 0b91807fd5..db302a4f8e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html
@@ -6,7 +6,7 @@
</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="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">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
index ff1db95def..fc2dd93bee 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
@@ -129,7 +129,7 @@ public class SsoConnectorListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index cc09888dec..6d541b7d28 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -232,7 +232,7 @@ public class UserListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<User, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<User, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
index 6f8c487025..37adeb52fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
@@ -278,7 +278,7 @@ public class MilestoneListPage extends ProjectPage {
});
if (SecurityUtils.canManageIssues(getProject())) {
- columns.add(new AbstractColumn<Milestone, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<Milestone, Void>(Model.of("")) {
@Override
public String getCssClass() {