diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java index d8f6a8d48bcb..e2a59af5729f 100644 --- a/core/src/main/java/hudson/model/ListView.java +++ b/core/src/main/java/hudson/model/ListView.java @@ -442,14 +442,14 @@ public HttpResponse doRemoveJobFromView(@QueryParameter String name) throws IOEx protected void submit(StaplerRequest req) throws ServletException, FormException, IOException { JSONObject json = req.getSubmittedForm(); synchronized (this) { - recurse = json.optBoolean("recurse", true); +// recurse = json.optBoolean("recurse", true); jobNames.clear(); Iterable items; - if (recurse) { +// if (recurse) { items = getOwner().getItemGroup().getAllItems(TopLevelItem.class); - } else { - items = getOwner().getItemGroup().getItems(); - } +// } else { +// items = getOwner().getItemGroup().getItems(); +// } for (TopLevelItem item : items) { String relativeNameFrom = item.getRelativeNameFrom(getOwner().getItemGroup()); if (req.getParameter("item_" + relativeNameFrom) != null) { 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..39e348114f46 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,8 +1,8 @@ -Behaviour.specify("#recurse", "ListView", 0, function (e) { - var nestedElements = document.querySelectorAll("SPAN.nested"); - e.onclick = function () { - nestedElements.forEach(function (el) { - el.style.display = e.checked ? "" : "none"; - }); - }; -}); +// Behaviour.specify("#recurse", "ListView", 0, function (e) { +// var nestedElements = document.querySelectorAll("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 4850efae5ba7..2a52d6493107 100644 --- a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly +++ b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly @@ -27,24 +27,16 @@ THE SOFTWARE. - - - - - - +
- - - + -
@@ -56,11 +48,13 @@ THE SOFTWARE.
+
- + + + -
diff --git a/core/src/main/resources/hudson/model/View/configure.jelly b/core/src/main/resources/hudson/model/View/configure.jelly index 9b4c38a0a61e..2abe8c73f090 100644 --- a/core/src/main/resources/hudson/model/View/configure.jelly +++ b/core/src/main/resources/hudson/model/View/configure.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. --> - + @@ -40,21 +40,21 @@ THE SOFTWARE. - + - + - + + description="If checked, only those build executors will be shown that could execute the jobs in this view" /> diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss index e586248d18a8..6c6cd3b07b09 100644 --- a/war/src/main/scss/base/_style.scss +++ b/war/src/main/scss/base/_style.scss @@ -408,10 +408,18 @@ 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; + border: 2px solid red; + //max-height: 300px; + //overflow: auto; + //margin-left: -15px; + //padding-left: 15px; + + .nested { + border-left: 2px solid green; + margin-left: 10px; + } } /* ============================ health report hover ========================== */ diff --git a/war/src/main/scss/form/_checkbox.scss b/war/src/main/scss/form/_checkbox.scss index d9cd5f18c951..ff756788ff6e 100644 --- a/war/src/main/scss/form/_checkbox.scss +++ b/war/src/main/scss/form/_checkbox.scss @@ -187,9 +187,9 @@ } .jenkins-checkbox__description { - margin-top: 0.3rem; + //margin-top: 0.3rem; margin-left: 34px; - margin-bottom: 1rem; + //margin-bottom: 1rem; color: var(--text-color-secondary); line-height: 1.66; }