diff --git a/Jenkinsfile b/Jenkinsfile
index 1c41ce25..16fed629 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,5 @@
buildPlugin(useContainerAgent: true,
configurations: [
- [platform: 'linux', jdk: '8'],
[platform: 'linux', jdk: '11'],
[platform: 'windows', jdk: '11'],
])
diff --git a/pom.xml b/pom.xml
index 1ca24a58..5d0f0a9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
999999-SNAPSHOTjenkinsci/${project.artifactId}-plugin
- 2.319.1
+ 2.359false5.2
@@ -57,8 +57,8 @@
io.jenkins.tools.bom
- bom-2.319.x
- 1210.vcd41f6657f03
+ bom-2.346.x
+ 1382.v7d694476f340importpom
diff --git a/src/images/move.svg b/src/images/move.svg
deleted file mode 100644
index 537d3569..00000000
--- a/src/images/move.svg
+++ /dev/null
@@ -1,2268 +0,0 @@
-
-
-
-
diff --git a/src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java b/src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java
index da7a9acb..4311efda 100644
--- a/src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java
+++ b/src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java
@@ -1362,7 +1362,7 @@ public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOExc
icon.setOwner(this);
submit(req, rsp);
- makeDisabled(json.optBoolean("disabled"));
+ makeDisabled(!json.optBoolean("enable"));
save();
bc.commit();
diff --git a/src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java b/src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java
index 46c563d5..64493e3a 100644
--- a/src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java
+++ b/src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java
@@ -375,10 +375,6 @@ public TopLevelItem newInstance(ItemGroup parent, String name) {
}
static {
- IconSet.icons.addIcon(new Icon("icon-item-move-folder icon-sm", "plugin/cloudbees-folder/images/svgs/move.svg", Icon.ICON_SMALL_STYLE));
- IconSet.icons.addIcon(new Icon("icon-item-move-folder icon-md", "plugin/cloudbees-folder/images/svgs/move.svg", Icon.ICON_MEDIUM_STYLE));
- IconSet.icons.addIcon(new Icon("icon-item-move-folder icon-lg", "plugin/cloudbees-folder/images/svgs/move.svg", Icon.ICON_LARGE_STYLE));
- IconSet.icons.addIcon(new Icon("icon-item-move-folder icon-xlg", "plugin/cloudbees-folder/images/svgs/move.svg", Icon.ICON_XLARGE_STYLE));
// fix the IconSet defaults because some of them are .gif files and icon-folder should really be here and not in core
IconSet.icons.addIcon(new Icon("icon-folder icon-sm", "plugin/cloudbees-folder/images/svgs/folder.svg", Icon.ICON_SMALL_STYLE));
IconSet.icons.addIcon(new Icon("icon-folder icon-md", "plugin/cloudbees-folder/images/svgs/folder.svg", Icon.ICON_MEDIUM_STYLE));
diff --git a/src/main/java/com/cloudbees/hudson/plugins/folder/relocate/RelocationUI.java b/src/main/java/com/cloudbees/hudson/plugins/folder/relocate/RelocationUI.java
index b88589a9..1d16c703 100644
--- a/src/main/java/com/cloudbees/hudson/plugins/folder/relocate/RelocationUI.java
+++ b/src/main/java/com/cloudbees/hudson/plugins/folder/relocate/RelocationUI.java
@@ -72,7 +72,7 @@ public String getUrlName() {
*/
@NonNull
public String getIconFileName() {
- return "/plugin/cloudbees-folder/images/svgs/move.svg";
+ return "symbol-move plugin-cloudbees-folder";
}
/**
@@ -80,7 +80,7 @@ public String getIconFileName() {
*/
@Override
public String getIconClassName() {
- return "icon-item-move-folder";
+ return "symbol-move plugin-cloudbees-folder";
}
/**
diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
index aab8f568..6eef9143 100644
--- a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
+++ b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
@@ -22,48 +22,72 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
${%Configuration}
+
+
+
+
+
-
-
-
${%LOADING}
-
+
-
-
-
-
+ Having this forces application of the 2.x UI but it is glitchy if no f:optionalBlock or f:radioBlock
+ elements are in the form (such is the case for the standard Folder implementation).
+
+ The save/apply buttons are out of place until the DOM is modified by expanding config elements or by
+ resizing the browser window.
+ -->
+
+
+