Skip to content

The Unified and Autonomous Development Platform

Minor UI improvements

Robin Shenbb3f70ac1c72
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
index 0b1106c63d..927ecd6ace 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
@@ -33,8 +33,8 @@
</div>
</div>
<wicket:fragment wicket:id="buildFrag">
- <a wicket:id="link" class="d-flex align-items-center flex-nowrap">
- <svg wicket:id="icon" class="icon mr-2 flex-shrink-0"></svg>
+ <a wicket:id="link" class="flex-nowrap">
+ <svg wicket:id="icon" class="icon mr-1"></svg>
<span wicket:id="label"></span>
</a>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
index 07c01275c7..1d247d61fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
@@ -6,3 +6,7 @@
.group-authorizations .bean-list td.property-projectName {
width: 50%;
}
+
+.job-executor>.card-header .badge {
+ font-size: 0.9rem;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
index 25f91f6e51..aca2a91c14 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
@@ -10,6 +10,7 @@
<a wicket:id="delete" title="Delete this executor" class="btn btn-light btn-xs btn-icon btn-hover-danger text-muted mr-4">
<wicket:svg href="trash" class="icon"/>
</a>
+ <span wicket:id="disabled" class="badge badge-warning">Disabled</span>
</div>
<div class="card-toolbar">
<span class="switch switch-sm switch-primary mb-n2">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
index 3480d9035e..8355a927fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
@@ -8,6 +8,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -96,6 +97,16 @@ abstract class JobExecutorPanel extends Panel {
});
+ add(new WebMarkupContainer("disabled") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getExecutor().isEnabled());
+ }
+
+ });
+
add(new AjaxCheckBox("enable", Model.of(getExecutor().isEnabled())) {
@Override