diff --git a/core/src/main/resources/hudson/model/View/configure.properties b/core/src/main/resources/hudson/model/View/configure.properties
new file mode 100644
index 000000000000..f5883d65a59e
--- /dev/null
+++ b/core/src/main/resources/hudson/model/View/configure.properties
@@ -0,0 +1,4 @@
+description.description=Describe the purpose of this view.
+widgets.description=Customize the widgets that show in this view.
+widgets.filterqueue.description=If checked, only jobs in this view will be shown in the queue.
+widgets.filterexecutors.description=If checked, only those build executors will be shown that could execute the jobs in this view.
diff --git a/core/src/main/resources/lib/form/checkbox.jelly b/core/src/main/resources/lib/form/checkbox.jelly
index 60c8c11f4c52..de831954cafc 100644
--- a/core/src/main/resources/lib/form/checkbox.jelly
+++ b/core/src/main/resources/lib/form/checkbox.jelly
@@ -69,6 +69,9 @@ THE SOFTWARE.
Used as tooltip of the checkbox, and, if a title is specified, of the title
+
+ Optional description for the checkbox
+
@@ -87,6 +90,11 @@ THE SOFTWARE.
${attrs.title}
+
+
+ ${attrs.description}
+
+
${customizedFields.add(name)}
diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
index e586248d18a8..c8fe6756b7c8 100644
--- a/war/src/main/scss/base/_style.scss
+++ b/war/src/main/scss/base/_style.scss
@@ -408,10 +408,24 @@ img.icon-help {
/* ============================ list view entries ======================== */
div.listview-jobs {
- max-height: 300px;
- overflow: auto;
- margin-left: -15px;
- padding-left: 15px;
+ display: flex;
+ flex-direction: column;
+ gap: 0.3rem;
+
+ .nested, .notnested {
+ display: flex;
+ }
+
+ .nested {
+ border-left: 2px solid color-mix(in srgb, var(--input-border), transparent);
+ margin-left: 10px;
+ padding-left: 22px;
+
+ & + .nested {
+ margin-top: -0.3rem;
+ padding-top: 0.3rem;
+ }
+ }
}
/* ============================ health report hover ========================== */
diff --git a/war/src/main/webapp/help/view-config/description.html b/war/src/main/webapp/help/view-config/description.html
deleted file mode 100644
index 116a5d17ed7c..000000000000
--- a/war/src/main/webapp/help/view-config/description.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- This message will be displayed on
-
the view page
- . Useful for describing what this view does or linking to relevant resources.
- Can contain HTML tags or whatever markup language is defined for the system.
-
diff --git a/war/src/main/webapp/help/view-config/description_bg.html b/war/src/main/webapp/help/view-config/description_bg.html
deleted file mode 100644
index 2f9a0c920697..000000000000
--- a/war/src/main/webapp/help/view-config/description_bg.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Това съобщение ще се показва на
-
страницата за изгледа
- . Това е удобно да обясните за какво служи изгледа или да дадете подходящи
- връзки към полезни ресурси. Може да съдържа форматиране чрез етикети на HTML
- или произволен маркиращ език, който се поддържа от Jenkins.
-
diff --git a/war/src/main/webapp/help/view-config/description_de.html b/war/src/main/webapp/help/view-config/description_de.html
deleted file mode 100644
index 63eecbf510c6..000000000000
--- a/war/src/main/webapp/help/view-config/description_de.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Diese Beschreibung wird auf der
-
Ansichtsseite
- angezeigt. Sie beschreibt, um was es in der Ansicht geht oder enthält Links zu
- weiteren relevanten Ressourcen. Die Beschreibung darf HTML-Auszeichnungen
- enthalten.
-
diff --git a/war/src/main/webapp/help/view-config/description_fr.html b/war/src/main/webapp/help/view-config/description_fr.html
deleted file mode 100644
index e2276e50a88c..000000000000
--- a/war/src/main/webapp/help/view-config/description_fr.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Ce message s'affichera sur la
-
page de visualisation
- . Utile pour décrire l'objectif de cette vue ou pour donner des liens vers des
- ressources supplémentaires. Supporte les tags HTML.
-
diff --git a/war/src/main/webapp/help/view-config/description_it.html b/war/src/main/webapp/help/view-config/description_it.html
deleted file mode 100644
index 562324afca80..000000000000
--- a/war/src/main/webapp/help/view-config/description_it.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Questo messaggio sarà visualizzato sulla
-
pagina della vista
- . Quest'opzione è utile per descrivere lo scopo di questa vista o per inserire
- collegamenti a risorse rilevanti. Può contenere marcatori HTML o del
- linguaggio a marcatori definito per il sistema.
-
diff --git a/war/src/main/webapp/help/view-config/description_ja.html b/war/src/main/webapp/help/view-config/description_ja.html
deleted file mode 100644
index f45f11ad4084..000000000000
--- a/war/src/main/webapp/help/view-config/description_ja.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- この説明は、
-
ビュー
- に表示されます。
- このビューについて説明したり、関連するリソースにリンクするのに便利です。HTMLタグを使用できます。
-
diff --git a/war/src/main/webapp/help/view-config/description_nl.html b/war/src/main/webapp/help/view-config/description_nl.html
deleted file mode 100644
index ebb5e3686899..000000000000
--- a/war/src/main/webapp/help/view-config/description_nl.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- Deze boodschap zal getoond worden op
-
uw specifieke overzichtspagina
- . Het kan nuttig zijn om te omschrijven wat uw overzichtspagina specifiek
- omvat. De boodschap mag HTML bevatten. U kunt dus ook, op eenvoudige wijze,
- referenties toevoegen naar relevante artefacten, zoals webpaginas, documenten,
- e-mail adressen, ...
-
diff --git a/war/src/main/webapp/help/view-config/description_pt_BR.html b/war/src/main/webapp/help/view-config/description_pt_BR.html
deleted file mode 100644
index df7732115bb6..000000000000
--- a/war/src/main/webapp/help/view-config/description_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Esta mensagem será mostrada na
-
página de visualização
- . Útil para descrever sobre o que é esta visualização, ou
- ligá-la a recursos relevantes. Pode conter marcações HTML.
-
diff --git a/war/src/main/webapp/help/view-config/description_ru.html b/war/src/main/webapp/help/view-config/description_ru.html
deleted file mode 100644
index 7303f0d6adf3..000000000000
--- a/war/src/main/webapp/help/view-config/description_ru.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Это сообщение будет показываться на
-
странице Пользовательского списка
- . Удобно для описания Пользовательского списка или ссылок на имеющие отношение
- ресурсы. Может содержать HTML.
-
diff --git a/war/src/main/webapp/help/view-config/description_tr.html b/war/src/main/webapp/help/view-config/description_tr.html
deleted file mode 100644
index 08c2a592ada8..000000000000
--- a/war/src/main/webapp/help/view-config/description_tr.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Bu mesaj,
-
görüntü ana sayfasında
- gösterilecektir. Bu görüntünün ne ile ilgili
- olduğunu anlatmak, veya ilgili kaynaklara bağlantılar
- yapabilmek için kullanılabilir. HTML tag'leri kullanabilirsiniz.
-
diff --git a/war/src/main/webapp/help/view-config/description_zh_TW.html b/war/src/main/webapp/help/view-config/description_zh_TW.html
deleted file mode 100644
index 2f38a3d86281..000000000000
--- a/war/src/main/webapp/help/view-config/description_zh_TW.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- 訊息會顯示在
-
視景頁
- 。 能用來說明這個視景的用途,或是提供相關資源的連結。 可以使用 HTML 標籤。
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors.html b/war/src/main/webapp/help/view-config/filter-executors.html
deleted file mode 100644
index 034420bb5917..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- If checked, only those build executors will be shown that could execute the
- jobs in this view.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_bg.html b/war/src/main/webapp/help/view-config/filter-executors_bg.html
deleted file mode 100644
index 6b36c6989ca7..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_bg.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- Когато е избрано, ще се показват само компютрите, които могат да изпълняват
- задачите в този изглед.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_de.html b/war/src/main/webapp/help/view-config/filter-executors_de.html
deleted file mode 100644
index 52e6465c770c..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_de.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Wenn angewählt, werden nur diejenigen Build-Prozessoren angezeigt, welche Jobs
- in dieser Ansicht ausführen könnten.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_it.html b/war/src/main/webapp/help/view-config/filter-executors_it.html
deleted file mode 100644
index 44fb82b5bea2..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_it.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Se quest'opzione è selezionata, solo gli esecutori in grado di eseguire i
- processi qui elencati saranno visualizzati in questa vista.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_ja.html b/war/src/main/webapp/help/view-config/filter-executors_ja.html
deleted file mode 100644
index efe9214b79d3..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_ja.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-このビューのジョブを実行可能なエグゼキューターのみ表示します。
diff --git a/war/src/main/webapp/help/view-config/filter-executors_pt_BR.html b/war/src/main/webapp/help/view-config/filter-executors_pt_BR.html
deleted file mode 100644
index 053df68e3154..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_pt_BR.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Caso selecionado, apenas executores de build que podem executar jobs nessa
- view aparecerão.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_zh_TW.html b/war/src/main/webapp/help/view-config/filter-executors_zh_TW.html
deleted file mode 100644
index ff504373040c..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_zh_TW.html
+++ /dev/null
@@ -1 +0,0 @@
-啟用後,就只會顯示能建置視景中作業的那些執行程式。
diff --git a/war/src/main/webapp/help/view-config/filter-queue.html b/war/src/main/webapp/help/view-config/filter-queue.html
deleted file mode 100644
index e658f998232a..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-If checked, only jobs in this view will be shown in the queue.
diff --git a/war/src/main/webapp/help/view-config/filter-queue_bg.html b/war/src/main/webapp/help/view-config/filter-queue_bg.html
deleted file mode 100644
index 7b22a78abde0..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_bg.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- Когато е избрано, ще се показват само тези задачи в опашката, които са също и
- в изгледа.
-
diff --git a/war/src/main/webapp/help/view-config/filter-queue_de.html b/war/src/main/webapp/help/view-config/filter-queue_de.html
deleted file mode 100644
index 2c2ec446239c..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_de.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Wenn angewählt, werden in der Build-Warteschlange nur Jobs dieser Ansicht
- angezeigt.
-
diff --git a/war/src/main/webapp/help/view-config/filter-queue_it.html b/war/src/main/webapp/help/view-config/filter-queue_it.html
deleted file mode 100644
index e7258892a005..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_it.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Se quest'opzione è selezionata solo i processi che compaiono in questa vista
- saranno visualizzati nella coda.
-
diff --git a/war/src/main/webapp/help/view-config/filter-queue_ja.html b/war/src/main/webapp/help/view-config/filter-queue_ja.html
deleted file mode 100644
index 26da33be36a1..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_ja.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-このビューのジョブのみキューに表示されます。
diff --git a/war/src/main/webapp/help/view-config/filter-queue_pt_BR.html b/war/src/main/webapp/help/view-config/filter-queue_pt_BR.html
deleted file mode 100644
index f92dd00bb380..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_pt_BR.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Caso selecionado, apenas jobs nessa view aparecerão na fila.
diff --git a/war/src/main/webapp/help/view-config/filter-queue_zh_TW.html b/war/src/main/webapp/help/view-config/filter-queue_zh_TW.html
deleted file mode 100644
index 717957f1529e..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_zh_TW.html
+++ /dev/null
@@ -1 +0,0 @@
-選用後,佇列中只會顯示視景裡的作業。
From d3863897d39371791ba128db9b1589c55b08282f Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 6 Oct 2024 15:39:09 +0100
Subject: [PATCH 2/5] Update _style.scss
---
war/src/main/scss/base/_style.scss | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
index c8fe6756b7c8..44b9e62f513a 100644
--- a/war/src/main/scss/base/_style.scss
+++ b/war/src/main/scss/base/_style.scss
@@ -412,12 +412,13 @@ div.listview-jobs {
flex-direction: column;
gap: 0.3rem;
- .nested, .notnested {
+ .nested,
+ .notnested {
display: flex;
}
.nested {
- border-left: 2px solid color-mix(in srgb, var(--input-border), transparent);
+ border-left: 2px solid color-mix(in sRGB, var(--input-border), transparent);
margin-left: 10px;
padding-left: 22px;
From 952873d23bfe858d232d0a25e787ea509e52b080 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 7 Oct 2024 09:10:28 +0100
Subject: [PATCH 3/5] Update configure-entries.jelly
---
.../resources/hudson/model/ListView/configure-entries.jelly | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
index a26f78a71364..af806d42c882 100644
--- a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
@@ -48,7 +48,7 @@ THE SOFTWARE.
-
From 440b71b7168415f995f4400e27e08f469fbbb4e4 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sat, 12 Oct 2024 11:30:18 +0100
Subject: [PATCH 4/5] Fix nesting
---
.../ListView/configure-entries-resources.js | 3 +-
.../model/ListView/configure-entries.jelly | 31 ++++++++++++-------
war/src/main/scss/base/_style.scss | 23 --------------
war/src/main/scss/pages/_dashboard.scss | 14 +++++++++
4 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js b/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
index 86ccbb6447a7..93333bf0552d 100644
--- a/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
@@ -1,5 +1,6 @@
Behaviour.specify("#recurse", "ListView", 0, function (e) {
- var nestedElements = document.querySelectorAll("SPAN.nested");
+ // SPAN.nested is kept for backwards compatability
+ var nestedElements = document.querySelectorAll(".listview-jobs--nested, SPAN.nested");
e.onclick = function () {
nestedElements.forEach(function (el) {
el.style.display = e.checked ? "" : "none";
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
index af806d42c882..350235870b01 100644
--- a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
@@ -32,18 +32,27 @@ THE SOFTWARE.
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
index 44b9e62f513a..273d583d4ca9 100644
--- a/war/src/main/scss/base/_style.scss
+++ b/war/src/main/scss/base/_style.scss
@@ -406,29 +406,6 @@ img.icon-help {
vertical-align: text-top;
}
-/* ============================ list view entries ======================== */
-div.listview-jobs {
- display: flex;
- flex-direction: column;
- gap: 0.3rem;
-
- .nested,
- .notnested {
- display: flex;
- }
-
- .nested {
- border-left: 2px solid color-mix(in sRGB, var(--input-border), transparent);
- margin-left: 10px;
- padding-left: 22px;
-
- & + .nested {
- margin-top: -0.3rem;
- padding-top: 0.3rem;
- }
- }
-}
-
/* ============================ health report hover ========================== */
.healthReport a {
diff --git a/war/src/main/scss/pages/_dashboard.scss b/war/src/main/scss/pages/_dashboard.scss
index 3ace60fac309..4d6f49017566 100644
--- a/war/src/main/scss/pages/_dashboard.scss
+++ b/war/src/main/scss/pages/_dashboard.scss
@@ -180,3 +180,17 @@ $min-button-size: 36px;
height: 1rem;
}
}
+
+div.listview-jobs {
+ display: flex;
+ flex-direction: column;
+ gap: 0.3rem;
+
+ &--nested {
+ display: flex;
+ flex-direction: column;
+ border-left: 2px solid color-mix(in sRGB, var(--input-border), transparent);
+ margin-left: 10px;
+ padding-left: 22px;
+ }
+}
From 8c0ca4eda134367ff36cdafb7fd9cbcfe1c842fa Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sat, 12 Oct 2024 11:31:32 +0100
Subject: [PATCH 5/5] Update configure-entries-resources.js
---
.../hudson/model/ListView/configure-entries-resources.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js b/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
index 93333bf0552d..f9db2d067478 100644
--- a/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
@@ -1,6 +1,8 @@
Behaviour.specify("#recurse", "ListView", 0, function (e) {
// SPAN.nested is kept for backwards compatability
- var nestedElements = document.querySelectorAll(".listview-jobs--nested, SPAN.nested");
+ var nestedElements = document.querySelectorAll(
+ ".listview-jobs--nested, SPAN.nested",
+ );
e.onclick = function () {
nestedElements.forEach(function (el) {
el.style.display = e.checked ? "" : "none";