Skip to content

The Unified and Autonomous Development Platform

Fix some usability issues

Robin Shen74a96b905897
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
index 681ff6ff0a..b3b20784b0 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
@@ -1,9 +1,8 @@
package io.onedev.server.model.support.administration.sso;
import java.io.Serializable;
+import java.net.URI;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.usage.Usage;
@@ -56,9 +55,7 @@ public abstract class SsoConnector implements Serializable {
return usage;
}
- public Component renderAdditionalInfo(String componentId) {
- return new WebMarkupContainer(componentId).setVisible(false);
- }
+ public abstract URI getCallbackUri();
/**
* Authenticate specified user name and password against the authentication system
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
index 5367e4edd1..f0a651ab84 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -1614,8 +1614,7 @@ input[type="radio"], input[type="checkbox"] {
padding: 0.3rem;
}
.table-hover tbody tr:hover {
- color: var(--gray-dark);
- background-color: var(--secondary);
+ background-color: var(--light);
}
.table-borderless tbody+tbody, .table-borderless td, .table-borderless th, .table-borderless thead th {
border: 0;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html
index 609c94cf5d..45198f6d71 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="job-dependency-list">
- <table wicket:id="dependencies"></table>
+ <table wicket:id="dependencies" class="table-hover"></table>
<div class="foot">
<a wicket:id="addNew" title="Add new job dependency" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
index c363cb1d74..09d3b86fa3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="job-dependency-list">
<div class="body">
- <table wicket:id="dependencies"></table>
+ <table wicket:id="dependencies" class="table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="showDetailFrag">
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.html
index 400c03d97f..1972587ace 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,6 +1,6 @@
<wicket:panel>
<div class="post-build-action-list">
- <table wicket:id="actions"></table>
+ <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>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
index 840ecbf601..9c91a6e73b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="post-build-action-list">
<div class="body">
- <table wicket:id="actions"></table>
+ <table wicket:id="actions" class="table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="showDetailFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.html
deleted file mode 100644
index e401f803d8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<wicket:panel>
- <div class="job-privilege-list">
- <div class="body">
- <table wicket:id="privileges"></table>
- </div>
- </div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.java
deleted file mode 100644
index 0a78e81be0..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package io.onedev.server.web.editable.buildspec.job.privilege;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-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.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.model.support.role.JobPrivilege;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
-
-@SuppressWarnings("serial")
-class JobPrivilegeListViewPanel extends Panel {
-
- private final List<JobPrivilege> privileges = new ArrayList<>();
-
- public JobPrivilegeListViewPanel(String id, List<Serializable> elements) {
- super(id);
-
- for (Serializable each: elements)
- privileges.add((JobPrivilege) each);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<IColumn<JobPrivilege, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("Job Names")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getJobNames());
- }
-
- });
- }
- });
-
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
- }
-
- };
- }
-
- });
- }
-
- @Override
- public String getCssClass() {
- return "ellipsis text-right";
- }
-
- });
-
- IDataProvider<JobPrivilege> dataProvider = new ListDataProvider<JobPrivilege>() {
-
- @Override
- protected List<JobPrivilege> getData() {
- return privileges;
- }
-
- };
-
- add(new DataTable<JobPrivilege, Void>("privileges", columns, dataProvider, Integer.MAX_VALUE) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
- add(new NoRecordsBehavior());
- }
-
- });
- }
-
- private abstract class ColumnFragment extends Fragment {
-
- private final int index;
-
- public ColumnFragment(String id, int index) {
- super(id, "columnFrag", JobPrivilegeListViewPanel.this);
- this.index = index;
- }
-
- protected abstract Component newLabel(String componentId);
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, "Job Privilege");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "job-privilege"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, privileges.get(index));
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html
index 7e6cec73e6..fb8eb04a5a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="job-dependency-list">
- <table wicket:id="dependencies"></table>
+ <table wicket:id="dependencies" class="table-hover"></table>
<div class="foot">
<a wicket:id="addNew" title="Add new project dependency" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
index c363cb1d74..09d3b86fa3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="job-dependency-list">
<div class="body">
- <table wicket:id="dependencies"></table>
+ <table wicket:id="dependencies" class="table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="showDetailFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html
index 1e55028fde..692b79f0cb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="job-trigger-list">
- <table wicket:id="triggers"></table>
+ <table wicket:id="triggers" class="table-hover"></table>
<div class="foot">
<a wicket:id="addNew" title="Add new trigger" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
index 4368e50ab0..5fe7afc719 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="job-trigger-list">
<div class="body">
- <table wicket:id="triggers"></table>
+ <table wicket:id="triggers" class="table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="showDetailFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.html
index 06e7fa7654..ab7cddfbf7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="param-spec-list">
- <table wicket:id="paramSpecs"></table>
+ <table wicket:id="paramSpecs" class="table-hover"></table>
<div class="foot">
<a wicket:id="addNew" title="Add new param" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html
index 4105f5616b..58a5a86535 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="param-spec-list">
<div class="body">
- <table wicket:id="paramSpecs"></table>
+ <table wicket:id="paramSpecs" class="table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="showDetailFrag">
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 533c96bba0..2c4a847cb6 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
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="step-list">
- <table wicket:id="steps"></table>
+ <table wicket:id="steps" class="table-hover"></table>
<div class="foot">
<a wicket:id="addNew" title="Add new step" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
@@ -8,5 +8,5 @@
<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:panel>
\ No newline at end of file
diff --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.java
index a4980a7fc8..dce93fda6c 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
@@ -7,6 +7,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -32,6 +33,7 @@ import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.ParamSpecAware;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -186,6 +188,12 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
});
fragment.add(new AjaxLink<Void>("delete") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this step?"));
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
markFormDirty(target);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html
index f1de387d68..3b376a14fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="step-list">
<div class="body">
- <table wicket:id="steps"></table>
+ <table wicket:id="steps" class="table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="showDetailFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index 495d0b1113..d76ac9133e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -89,19 +89,6 @@
border-bottom-right-radius: 0.42rem;
}
-.editable table>thead>tr>th.minimum, table>tbody>tr>td.minimum {
- width: 1px;
- white-space: nowrap;
- padding-left: 0;
- padding-right: 0;
-}
-.editable table>thead>tr>th.minimum:first-child, table>tbody>tr>td.minimum:first-child {
- padding-left: 1rem;
-}
-.editable table>thead>tr>th.minimum:last-child, table>tbody>tr>td.minimum:last-child {
- padding-right: 1rem;
-}
-
.editable .polymorphic>.type-selector {
margin-bottom: 1rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java
index 3caa2f70f4..04eaff185e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.buildspec.job.privilege;
+package io.onedev.server.web.editable.jobprivilege;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.html
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.html
index 44068d94f3..8db9f1e990 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="job-privilege-list">
- <table wicket:id="privileges"></table>
+ <table wicket:id="privileges" class="table-hover"></table>
<div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
index 39dfa0138d..63925d1d04 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.buildspec.job.privilege;
+package io.onedev.server.web.editable.jobprivilege;
import java.io.Serializable;
import java.util.ArrayList;
@@ -7,6 +7,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -26,6 +27,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.model.support.role.JobPrivilege;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -128,7 +130,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
}
});
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
@@ -158,6 +160,12 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
});
fragment.add(new AjaxLink<Void>("delete") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this privilege?"));
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
markFormDirty(target);
@@ -172,7 +180,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions minimum";
+ return "actions";
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditSupport.java
similarity index 68%
rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditSupport.java
index 9f348190fc..007dba3871 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditSupport.java
@@ -1,15 +1,13 @@
-package io.onedev.server.web.editable.buildspec.job.privilege;
+package io.onedev.server.web.editable.jobprivilege;
import java.io.Serializable;
import java.util.List;
-import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import io.onedev.server.model.support.role.JobPrivilege;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -27,17 +25,7 @@ public class JobPrivilegeListEditSupport implements EditSupport {
@Override
public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
- return new PropertyViewer(componentId, descriptor) {
-
- @Override
- protected Component newContent(String componentId, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null)
- return new JobPrivilegeListViewPanel(componentId, model.getObject());
- else
- return new EmptyValueLabel(componentId, propertyDescriptor.getPropertyGetter());
- }
-
- };
+ throw new UnsupportedOperationException();
}
@Override
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 ed12ace70b..f261008fb8 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
@@ -2,16 +2,11 @@
<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>
+ <table wicket:id="scripts" class="table table-hover"></table>
</div>
</div>
- <wicket:fragment wicket:id="showDetailFrag">
- <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="scriptActionsFrag">
- <div class="d-flex">
- <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
- <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
- </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="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.java
index 373e6810bb..463d1d3fda 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
@@ -8,13 +8,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
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.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -26,9 +26,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.html.HtmlEscape;
-
-import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -39,10 +36,7 @@ import io.onedev.server.web.behavior.sortable.SortBehavior;
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.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.TextUtils;
@@ -96,13 +90,34 @@ public class GroovyScriptListPage extends AdministrationPage {
List<IColumn<GroovyScript, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Name")) {
@Override
public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
- String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(rowModel.getObject().getName()));
- cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
}
});
@@ -115,102 +130,67 @@ public class GroovyScriptListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
int scriptIndex = cellItem.findParent(LoopItem.class).getIndex();
- Fragment fragment = new Fragment(componentId, "showDetailFrag", GroovyScriptListPage.this);
- fragment.add(new AjaxLink<Void>("link") {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", GroovyScriptListPage.this);
+ fragment.add(new ModalLink("edit") {
@Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+ protected Component newContent(String id, ModalPanel modal) {
+ return new GroovyScriptEditPanel(id, scriptIndex) {
@Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, scripts.get(scriptIndex).getName());
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(scriptsTable);
+ modal.close();
}
@Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "groovy-script"));
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
}
@Override
- protected Component newBody(String componentId) {
- return BeanContext.view(componentId, scripts.get(scriptIndex), Sets.newHashSet("name"), true);
+ protected List<GroovyScript> getScripts() {
+ return scripts;
}
-
- @Override
- protected Component newFooter(String componentId) {
- Fragment fragment = new Fragment(componentId, "scriptActionsFrag", GroovyScriptListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- close();
- 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 String getModalCssClass() {
- return "modal-lg";
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this script?"));
- }
+ };
+ }
+
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
- @Override
- public void onClick(AjaxRequestTarget target) {
- scripts.remove(scriptIndex);
- OneDev.getInstance(SettingManager.class).saveGroovyScripts(scripts);
- target.add(scriptsTable);
- close();
- }
-
- });
-
- return fragment;
- }
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this script?"));
+ }
- };
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ scripts.remove(scriptIndex);
+ OneDev.getInstance(SettingManager.class).saveGroovyScripts(scripts);
+ target.add(scriptsTable);
}
- });
+ });
cellItem.add(fragment);
}
@Override
public String getCssClass() {
- return "text-right";
+ return "actions";
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
index c6062f5e61..7477d3fc29 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
@@ -7,7 +7,7 @@
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- <table wicket:id="groups" class="groups table"></table>
+ <table wicket:id="groups" class="groups table table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="nameFrag">
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 7ba20a91f5..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
@@ -4,15 +4,10 @@
A certain project can override this setting to define its own issue boards.
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add default issue board"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- <table wicket:id="issueBoards" class="table"></table>
+ <table wicket:id="issueBoards" class="table table-hover"></table>
- <wicket:fragment wicket:id="showDetailFrag">
- <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="boardActionsFrag">
- <div class="d-flex">
- <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
- <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
- </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/defaultboard/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java
index 34afceee7a..9ad1b8f127 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
@@ -8,13 +8,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
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.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -24,9 +24,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.html.HtmlEscape;
-
-import com.google.common.collect.Sets;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
@@ -39,10 +36,7 @@ import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.issue.board.BoardEditPanel;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
@SuppressWarnings("serial")
@@ -83,14 +77,34 @@ public class DefaultBoardListPage extends IssueSettingPage {
List<IColumn<BoardSpec, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Name")) {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
- BoardSpec board = rowModel.getObject();
- String html = String.format("<svg class='icon drag-indicator'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(board.getName()));
- cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
}
});
@@ -119,85 +133,48 @@ public class DefaultBoardListPage extends IssueSettingPage {
});
- columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "showDetailFrag", DefaultBoardListPage.this);
- fragment.add(new AjaxLink<Void>("link") {
+ int boardIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", DefaultBoardListPage.this);
+
+ fragment.add(new ModalLink("edit") {
@Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+ protected Component newContent(String id, ModalPanel modal) {
+ return new BoardEditPanel(id, getSetting().getBoardSpecs(), boardIndex) {
@Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, rowModel.getObject().getName());
+ protected void onSave(AjaxRequestTarget target, BoardSpec board) {
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(boardsTable);
+ modal.close();
}
@Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "board-spec"));
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
}
- @Override
- protected Component newBody(String componentId) {
- BoardSpec board = rowModel.getObject();
- board.setEditColumns(board.getDisplayColumns());
- return BeanContext.view(componentId, board, Sets.newHashSet("name"), true);
- }
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
- @Override
- protected Component newFooter(String componentId) {
- int boardIndex = cellItem.findParent(LoopItem.class).getIndex();
- Fragment fragment = new Fragment(componentId, "boardActionsFrag", DefaultBoardListPage.this);
-
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- close();
- return new BoardEditPanel(id, getSetting().getBoardSpecs(), boardIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, BoardSpec board) {
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(boardsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this board?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getBoardSpecs().remove(boardIndex);
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(boardsTable);
- close();
- }
-
- });
-
- return fragment;
- }
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this board?"));
+ }
- };
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getBoardSpecs().remove(boardIndex);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(boardsTable);
}
});
@@ -206,7 +183,7 @@ public class DefaultBoardListPage extends IssueSettingPage {
@Override
public String getCssClass() {
- return "text-right";
+ return "actions";
}
});
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 9974e875e6..a5b41fbd19 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
@@ -5,19 +5,10 @@
decide to use all or a subset of these fields via its issue transition setting.
</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>
+ <table wicket:id="issueFields" class="table table-hover"></table>
</div>
- <wicket:fragment wicket:id="showDetailFrag">
- <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="fieldDetailFrag">
- <div wicket:id="viewer1"></div>
- <div wicket:id="viewer2"></div>
- </wicket:fragment>
- <wicket:fragment wicket:id="fieldActionsFrag">
- <div class="d-flex">
- <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
- <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
- </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/fieldspec/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
index a702578e52..f08bdcea12 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
@@ -8,7 +8,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
@@ -16,6 +15,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
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.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -27,9 +27,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.html.HtmlEscape;
-
-import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -43,10 +40,7 @@ import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChanged;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
import io.onedev.server.web.util.TextUtils;
@@ -93,14 +87,34 @@ public class IssueFieldListPage extends IssueSettingPage {
List<IColumn<FieldSpec, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Name")) {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
- FieldSpec field = rowModel.getObject();
- String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(field.getName()));
- cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
}
});
@@ -128,99 +142,53 @@ public class IssueFieldListPage extends IssueSettingPage {
});
- columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "showDetailFrag", IssueFieldListPage.this);
- fragment.add(new AjaxLink<Void>("link") {
-
+ int fieldIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueFieldListPage.this);
+ fragment.add(new ModalLink("edit") {
+
@Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- FieldSpec field = rowModel.getObject();
- return new Label(componentId, field.getName() + " (type: " + EditableUtils.getDisplayName(field.getClass()) + ")");
- }
-
+ protected Component newContent(String id, ModalPanel modal) {
+ return new FieldEditPanel(id, fieldIndex) {
+
@Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "field-spec input-spec"));
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(fieldsTable);
+ modal.close();
}
-
+
@Override
- protected Component newBody(String id) {
- FieldSpec field = rowModel.getObject();
- Fragment fragment = new Fragment(id, "fieldDetailFrag", IssueFieldListPage.this);
- fragment.add(BeanContext.view("viewer1", field, Sets.newHashSet("name"), true));
- FieldBean bean = new FieldBean();
- bean.setPromptUponIssueOpen(getSetting().getPromptFieldsUponIssueOpen().contains(field.getName()));
- fragment.add(BeanContext.view("viewer2", bean, Sets.newHashSet("field"), true));
-
- fragment.setOutputMarkupId(true);
-
- return fragment;
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
}
-
+
@Override
- protected Component newFooter(String componentId) {
- int fieldIndex = cellItem.findParent(LoopItem.class).getIndex();
- Fragment fragment = new Fragment(componentId, "fieldActionsFrag", IssueFieldListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- close();
- 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(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this field?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getFieldSpecs().remove(fieldIndex);
- getSetting().setReconciled(false);
- send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(fieldsTable);
- close();
- }
-
- });
-
- return fragment;
+ protected GlobalIssueSetting getSetting() {
+ return IssueFieldListPage.this.getSetting();
}
-
+
};
-
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this field?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getFieldSpecs().remove(fieldIndex);
+ getSetting().setReconciled(false);
+ send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(fieldsTable);
}
});
@@ -230,7 +198,7 @@ public class IssueFieldListPage extends IssueSettingPage {
@Override
public String getCssClass() {
- return "text-right";
+ return "actions";
}
});
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 649be66e59..371d5e52f9 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,18 +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 template with criteria matching the issue will be used.
+ 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>
+ <table wicket:id="issueTemplates" class="table table-hover"></table>
- <wicket:fragment wicket:id="showDetailFrag">
- <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="templateActionsFrag">
- <div class="d-flex">
- <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
- <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
- </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.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java
index f330570143..a0a200f9b9 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
@@ -8,13 +8,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
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.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -28,7 +28,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
@@ -39,16 +38,12 @@ import io.onedev.server.web.behavior.sortable.SortBehavior;
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.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
-import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
@SuppressWarnings("serial")
public class IssueTemplateListPage extends IssueSettingPage {
- private static final int MAX_DESCRIPTION_LEN = 200;
-
public IssueTemplateListPage(PageParameters params) {
super(params);
}
@@ -93,6 +88,29 @@ public class IssueTemplateListPage extends IssueSettingPage {
List<IColumn<IssueTemplate, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("Applicable Issues")) {
@Override
@@ -107,109 +125,65 @@ public class IssueTemplateListPage extends IssueSettingPage {
}
});
- columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("Description Template")) {
+ columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
- cellItem.add(new Label(componentId, StringUtils.abbreviate(rowModel.getObject().getIssueDescription(), MAX_DESCRIPTION_LEN)));
- }
-
- });
-
- columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("")) {
+ int templateIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueTemplateListPage.this);
+ fragment.add(new ModalLink("edit") {
- @Override
- public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
- Fragment fragment = new Fragment(componentId, "showDetailFrag", IssueTemplateListPage.this);
- fragment.add(new AjaxLink<Void>("link") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
@Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+ protected Component newContent(String id, ModalPanel modal) {
+ return new IssueTemplateEditPanel(id, templateIndex) {
@Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, "Description Template");
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(templatesTable);
+ modal.close();
}
@Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "issue-template"));
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
}
@Override
- protected Component newBody(String componentId) {
- return BeanContext.view(componentId, rowModel.getObject());
+ protected GlobalIssueSetting getSetting() {
+ return IssueTemplateListPage.this.getSetting();
}
- @Override
- protected Component newFooter(String componentId) {
- int templateIndex = cellItem.findParent(LoopItem.class).getIndex();
- Fragment fragment = new Fragment(componentId, "templateActionsFrag", IssueTemplateListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected String getModalCssClass() {
- return "modal-lg";
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- close();
- 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(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this template?"));
- }
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getIssueTemplates().remove(templateIndex);
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(templatesTable);
- close();
- }
-
- });
-
- return fragment;
- }
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this template?"));
+ }
- };
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getIssueTemplates().remove(templateIndex);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(templatesTable);
}
- });
+ });
cellItem.add(fragment);
}
@Override
public String getCssClass() {
- return "text-right";
+ return "actions";
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html
index 2870d44e77..fdf38b4fe2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html
@@ -5,7 +5,7 @@
initial state of created issues
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue state"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- <table wicket:id="issueStates" class="table"></table>
+ <table wicket:id="issueStates" class="table table-hover"></table>
</div>
<wicket:fragment wicket:id="stateActionsFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit this state"><wicket:svg href="edit" class="icon align-middle"></wicket:svg></a>
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 4df0d8e4fd..22f8c82faa 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
@@ -16,6 +16,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
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.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -83,14 +84,35 @@ public class IssueStateListPage extends IssueSettingPage {
List<IColumn<StateSpec, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Name")) {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
StateSpec state = rowModel.getObject();
- String html = String.format("<svg class='icon drag-indicator'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(state.getName()));
-
+ String html = HtmlEscape.escapeHtml5(state.getName());
if (cellItem.findParent(LoopItem.class).getIndex() == 0)
html += " <span class='badge badge-light-info badge-sm ml-2'>Initial</span>";
cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
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 932a1c30ec..b62bb99d34 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
@@ -5,15 +5,10 @@
A certain project can override this setting to define its own issue transitions.
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue state transition"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- <table wicket:id="stateTransitions" class="table"></table>
+ <table wicket:id="stateTransitions" class="table table-hover"></table>
</div>
- <wicket:fragment wicket:id="showDetailFrag">
- <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="transitionActionsFrag">
- <div class="d-flex">
- <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
- <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
- </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>
\ 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 0dfa74fe84..796487c52e 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
@@ -8,13 +8,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
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.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -24,9 +24,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.html.HtmlEscape;
-
-import com.google.common.collect.Sets;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
@@ -34,16 +31,12 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
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.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
@SuppressWarnings("serial")
@@ -88,16 +81,37 @@ public class StateTransitionListPage extends IssueSettingPage {
List<IColumn<TransitionSpec, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("From States")) {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
TransitionSpec transition = rowModel.getObject();
- String icon = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref(IconScope.class, "grip"));
- String label = HtmlEscape.escapeHtml5(StringUtils.join(transition.getFromStates()));
- cellItem.add(new Label(componentId, icon + " " + label).setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, StringUtils.join(transition.getFromStates())));
}
+
});
columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("To State")) {
@@ -143,86 +157,51 @@ public class StateTransitionListPage extends IssueSettingPage {
});
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "showDetailFrag", StateTransitionListPage.this);
- fragment.add(new AjaxLink<Void>("link") {
-
+ int transitionIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", StateTransitionListPage.this);
+ fragment.add(new ModalLink("edit") {
+
@Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, "State Transition");
- }
-
+ protected Component newContent(String id, ModalPanel modal) {
+ return new TransitionEditPanel(id, transitionIndex) {
+
@Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "transition-spec def-detail"));
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(transitionsTable);
+ modal.close();
}
-
+
@Override
- protected Component newBody(String componentId) {
- return BeanContext.view(componentId, rowModel.getObject(), Sets.newHashSet("name"), true);
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
}
-
+
@Override
- protected Component newFooter(String componentId) {
- int transitionIndex = cellItem.findParent(LoopItem.class).getIndex();
- Fragment fragment = new Fragment(componentId, "transitionActionsFrag", StateTransitionListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- close();
- 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(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this transition?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getTransitionSpecs().remove(transitionIndex);
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(transitionsTable);
- close();
- }
-
- });
-
- return fragment;
+ protected GlobalIssueSetting getSetting() {
+ return StateTransitionListPage.this.getSetting();
}
-
- };
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this transition?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getTransitionSpecs().remove(transitionIndex);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(transitionsTable);
}
});
@@ -231,7 +210,7 @@ public class StateTransitionListPage extends IssueSettingPage {
@Override
public String getCssClass() {
- return "text-right";
+ return "actions";
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html
index 24a3f483a5..005456c5b9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html
@@ -7,7 +7,7 @@
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- <table wicket:id="roles" class="roles table"></table>
+ <table wicket:id="roles" class="roles table table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="nameFrag">
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 5ea39ae640..0b91807fd5 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
@@ -2,20 +2,15 @@
<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>
+ <table wicket:id="connectors" class="table table-hover"></table>
</div>
</div>
- <wicket:fragment wicket:id="showDetailFrag">
- <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
+ <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="connectorDetailFrag">
- <div wicket:id="additionalInfo" class="mb-4"></div>
- <div wicket:id="viewer"></div>
- </wicket:fragment>
- <wicket:fragment wicket:id="connectorActionsFrag">
- <div class="d-flex">
- <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
- <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
- </div>
+ <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/admin/sso/SsoConnectorListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
index b31c50d79b..ff1db95def 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
@@ -8,13 +8,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
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.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -24,9 +24,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.html.HtmlEscape;
-
-import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -37,13 +34,10 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.admin.AdministrationPage;
@SuppressWarnings("serial")
@@ -91,120 +85,103 @@ public class SsoConnectorListPage extends AdministrationPage {
List<IColumn<SsoConnector, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("Name")) {
@Override
public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
- String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(rowModel.getObject().getName()));
- cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
}
});
- columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("Type")) {
+ columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("Callback URL")) {
@Override
public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
- cellItem.add(new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getClass())));
+ SsoConnector connector = rowModel.getObject();
+ Fragment fragment = new Fragment(componentId, "callbackUriFrag", SsoConnectorListPage.this);
+ fragment.add(new Label("value", connector.getCallbackUri().toString()));
+ fragment.add(new CopyToClipboardLink("copy", Model.of(connector.getCallbackUri().toString())));
+ cellItem.add(fragment);
}
});
- columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<SsoConnector, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
- Fragment fragment = new Fragment(componentId, "showDetailFrag", SsoConnectorListPage.this);
int connectorIndex = cellItem.findParent(LoopItem.class).getIndex();
-
- fragment.add(new AjaxLink<Void>("link") {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", SsoConnectorListPage.this);
+ fragment.add(new ModalLink("edit") {
@Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+ protected Component newContent(String id, ModalPanel modal) {
+ return new SsoConnectorEditPanel(id, connectorIndex) {
@Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, rowModel.getObject().getName());
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(connectorsTable);
+ modal.close();
}
@Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "sso-connector"));
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
}
@Override
- protected Component newBody(String id) {
- Fragment fragment = new Fragment(id, "connectorDetailFrag", SsoConnectorListPage.this);
-
- fragment.add(connectors.get(connectorIndex).renderAdditionalInfo("additionalInfo"));
-
- fragment.add(BeanContext.view("viewer", rowModel.getObject(), Sets.newHashSet("name"), true));
- fragment.setOutputMarkupId(true);
-
- return fragment;
+ protected List<SsoConnector> getConnectors() {
+ return connectors;
}
- @Override
- protected Component newFooter(String componentId) {
- Fragment fragment = new Fragment(componentId, "connectorActionsFrag", SsoConnectorListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- close();
- return new SsoConnectorEditPanel(id, connectorIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(connectorsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected List<SsoConnector> getConnectors() {
- return connectors;
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this connector?"));
- }
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this connector?"));
+ }
- @Override
- public void onClick(AjaxRequestTarget target) {
- SsoConnector connector = connectors.remove(connectorIndex);
- OneDev.getInstance(TransactionManager.class).run(new Runnable() {
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ SsoConnector connector = connectors.remove(connectorIndex);
+ OneDev.getInstance(TransactionManager.class).run(new Runnable() {
- @Override
- public void run() {
- OneDev.getInstance(SettingManager.class).saveSsoConnectors(connectors);
- OneDev.getInstance(UserManager.class).onDeleteSsoConnector(connector.getName());
- }
-
- });
- target.add(connectorsTable);
- close();
- }
-
- });
- return fragment;
+ @Override
+ public void run() {
+ OneDev.getInstance(SettingManager.class).saveSsoConnectors(connectors);
+ OneDev.getInstance(UserManager.class).onDeleteSsoConnector(connector.getName());
}
-
- };
+
+ });
+ target.add(connectorsTable);
}
});
@@ -213,7 +190,7 @@ public class SsoConnectorListPage extends AdministrationPage {
@Override
public String getCssClass() {
- return "text-right";
+ return "actions";
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
index 11efa96b50..8d957d2b82 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
@@ -7,14 +7,14 @@
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- <table wicket:id="users" class="users table"></table>
+ <table wicket:id="users" class="users table table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a>
</wicket:fragment>
<wicket:fragment wicket:id="actionsFrag">
- <a wicket:id="impersonate" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-2" title="Impersonate this user"><wicket:svg href="user-tick" class="icon align-middle"/></a>
+ <a wicket:id="impersonate" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Impersonate this user"><wicket:svg href="user-tick" class="icon align-middle"/></a>
<a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this user"><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/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 03e6c46d65..9e6769c8ac 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -544,6 +544,18 @@ table.norecords tfoot td, div.norecords, td.norecords {
table.norecords tfoot td>div {
display: none;
}
+table>thead>tr>th.minimum, table>tbody>tr>td.minimum {
+ width: 1px;
+ white-space: nowrap;
+ padding-left: 0;
+ padding-right: 0;
+}
+table>thead>tr>th.minimum:first-child, table>tbody>tr>td.minimum:first-child {
+ padding-left: 1rem;
+}
+table>thead>tr>th.minimum:last-child, table>tbody>tr>td.minimum:last-child {
+ padding-right: 1rem;
+}
.form-group .control-label {
font-weight: 500;
@@ -575,4 +587,4 @@ table.norecords tfoot td>div {
.pressable.input-group-addon:active>*, .pressable.btn:active>* {
left: 1px;
top: 1px;
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 894780e4a3..5bad70be52 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -653,6 +653,27 @@ onedev.server = {
doSetup($(document));
},
+ setupTable: function() {
+ function doSetup($container) {
+ $container.find("table").addBack("table").each(function() {
+ $(this).find(">tbody>tr").each(function() {
+ var $moreInfoLink = $(this).find(">td.ellipsis a");
+ if ($moreInfoLink.length != 0) {
+ $(this).css("cursor", "pointer");
+ $(this).click(function(e) {
+ if ($(e.target).closest("a").length == 0)
+ $moreInfoLink.click();
+ });
+ }
+ });
+ });
+ }
+ $(document).on("afterElementReplace", function(event, componentId) {
+ doSetup($("#" + componentId));
+ });
+ doSetup($(document));
+ },
+
setupRadio: function() {
function doSetup($container) {
$container.find(".radio").addBack(".radio").each(function() {
@@ -813,6 +834,7 @@ onedev.server = {
onedev.server.setupCheckbox();
onedev.server.setupRadio();
onedev.server.setupSwitch();
+ onedev.server.setupTable();
onedev.server.history.init(popStateCallback);
onedev.server.perfectScrollbar.setup();
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index 5439c88ec9..34c0204e1c 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -10,7 +10,6 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import org.apache.shiro.authc.AuthenticationException;
-import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
@@ -289,11 +288,6 @@ public class OpenIdConnector extends SsoConnector {
return new AuthenticationException(errorMessage);
}
- @Override
- public Component renderAdditionalInfo(String componentId) {
- return new CallbackUrlPanel(componentId, getCallbackUri().toString());
- }
-
@Override
public void initiateLogin() {
try {
@@ -344,7 +338,8 @@ public class OpenIdConnector extends SsoConnector {
return metadata;
}
- protected URI getCallbackUri() {
+ @Override
+ public URI getCallbackUri() {
String serverUrl = OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();
try {
return new URI(serverUrl + "/" + SsoProcessPage.MOUNT_PATH + "/"