From b7f9359ca8c7924cafb8a6c16936145403625e72 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sun, 5 Jan 2025 20:43:22 +0000
Subject: [PATCH 1/3] Minor fixes on Dialogs page (#383)

---
 .../plugins/designlibrary/Dialogs/form.jelly    | 15 +++++++--------
 .../plugins/designlibrary/Dialogs/index.jelly   | 17 +++--------------
 src/main/webapp/Dialogs/form.jelly              |  2 +-
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/form.jelly b/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/form.jelly
index 8eeac19c..89be90fe 100644
--- a/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/form.jelly
+++ b/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/form.jelly
@@ -1,15 +1,14 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:s="/lib/samples">
-  <l:layout title="Forms">
-    <l:side-panel>
-      <s:sidepanel />
-    </l:side-panel>
-    <l:main-panel>
-
+  <s:layout>
+    <h1>Form submission result</h1>
+    <s:preview>
+      <div>
       <h2>Hello ${request.getParameter("name")}</h2>
       <b>Here are your order details</b><br/>
       Quantity: ${request.getParameter("quantity")}<br/>
       Flavor: ${request.getParameter("_.flavor")}<br/>
-    </l:main-panel>
-  </l:layout>
+      </div>
+    </s:preview>
+  </s:layout>
 </j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly b/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly
index 769ccea5..dfd4c7b0 100644
--- a/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly
+++ b/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly
@@ -107,8 +107,6 @@
                 <div class="jenkins-form-item tr ">
                   <div class="jenkins-form-label help-sibling">Name</div>
                   <div class="setting-main">
-
-
                     <input name="name" placeholder="" type="text" class="jenkins-input   " value=""/>
                   </div>
                   <div class="validation-error-area"></div>
@@ -116,26 +114,17 @@
                 <div class="jenkins-form-item tr ">
                   <div class="jenkins-form-label help-sibling">Quantity</div>
                   <div class="setting-main">
-                    <input min="1" max="9" name="quantity" type="number" class="jenkins-input  " value=""/>
+                    <input min="1" max="9" name="quantity" type="number" class="jenkins-input  " value="1"/>
                   </div>
                   <div class="validation-error-area"></div>
                 </div>
                 <div class="jenkins-form-item tr ">
                   <div class="jenkins-form-label help-sibling">Choose flavor</div>
                   <div class="setting-main">
-                    <script src="/jenkins/adjuncts/c0f0c004/lib/form/select/select.js"
-                            type="text/javascript"></script>
-
-
                     <div class="jenkins-select">
                       <select
-                        fillurl="/jenkins/descriptorByName/io.jenkins.plugins.designlibrary.Dialogs/fillFlavorItems"
+                        fillurl="${rootURL}/descriptorByName/io.jenkins.plugins.designlibrary.Dialogs/fillFlavorItems"
                         name="_.flavor" class="jenkins-select__input select" value="">
-                        <option value="Apple">Apple</option>
-                        <option value="Acai">Acai</option>
-                        <option value="Banana">Banana</option>
-                        <option value="Strawberry">Strawberry</option>
-                        <option value="Vanilla">Vanilla</option>
                       </select>
                     </div>
                   </div>
@@ -181,7 +170,7 @@
           <f:textbox name="name"/>
         </f:entry>
         <f:entry title="${%Quantity}">
-          <f:number name="quantity" min="1" max="9"/>
+          <f:number name="quantity" min="1" max="9" default="1"/>
         </f:entry>
         <f:entry title="${%Choose flavor}">
           <f:select field="flavor"/>
diff --git a/src/main/webapp/Dialogs/form.jelly b/src/main/webapp/Dialogs/form.jelly
index f7352945..7d89830f 100644
--- a/src/main/webapp/Dialogs/form.jelly
+++ b/src/main/webapp/Dialogs/form.jelly
@@ -4,7 +4,7 @@
       <f:textbox name="name"/>
     </f:entry>
     <f:entry title="${%Quantity}">
-      <f:number name="quantity" min="1" max="9"/>
+      <f:number name="quantity" min="1" max="9" default="1"/>
     </f:entry>
     <f:entry title="${%Choose flavor}">
       <f:select field="flavor"/>

From 46b646eafdf370b4f065e164fd46b1f8eeee37f9 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 6 Jan 2025 09:21:03 +0000
Subject: [PATCH 2/3] Fix 'Bottom app bar' sample to not have two
 'jenkins-buttons-row' containers (#382)

---
 .../jenkins/plugins/designlibrary/AppBar/index.jelly   | 10 ++++------
 src/main/webapp/AppBar/bottomAppBar.jelly              | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/io/jenkins/plugins/designlibrary/AppBar/index.jelly b/src/main/resources/io/jenkins/plugins/designlibrary/AppBar/index.jelly
index de9e104a..71b22e69 100644
--- a/src/main/resources/io/jenkins/plugins/designlibrary/AppBar/index.jelly
+++ b/src/main/resources/io/jenkins/plugins/designlibrary/AppBar/index.jelly
@@ -43,12 +43,10 @@
               <div />
             </div>
             <f:bottomButtonBar>
-              <div class="jenkins-buttons-row">
-                <button class="jenkins-button jenkins-button--primary">
-                  Save
-                </button>
-                <button class="jenkins-button">Apply</button>
-              </div>
+              <button class="jenkins-button jenkins-button--primary">
+                Save
+              </button>
+              <button class="jenkins-button">Apply</button>
             </f:bottomButtonBar>
           </div>
         </s:preview>
diff --git a/src/main/webapp/AppBar/bottomAppBar.jelly b/src/main/webapp/AppBar/bottomAppBar.jelly
index 3c905dc4..9f49cb43 100644
--- a/src/main/webapp/AppBar/bottomAppBar.jelly
+++ b/src/main/webapp/AppBar/bottomAppBar.jelly
@@ -1,10 +1,8 @@
 <div>
   <f:bottomButtonBar>
-    <div class="jenkins-buttons-row">
-      <button class="jenkins-button jenkins-button--primary">
-        Save
-      </button>
-      <button class="jenkins-button">Apply</button>
-    </div>
+    <button class="jenkins-button jenkins-button--primary">
+      Save
+    </button>
+    <button class="jenkins-button">Apply</button>
   </f:bottomButtonBar>
 </div>

From bf374bfffe6213461f39d58ec0488f56c565c263 Mon Sep 17 00:00:00 2001
From: Valentin Delaye <jonesbusy@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:22:54 +0100
Subject: [PATCH 3/3] Update pom.xml to match archetype and use
 `jenkins.baseline` property to keep bom in sync (#387)

---
 pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f059c960..37f348f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,9 @@ THE SOFTWARE.
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/design-library-plugin</gitHubRepo>
-    <jenkins.version>2.479.1</jenkins.version>
+    <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <node.version>20.18.1</node.version>
     <npm.version>10.9.2</npm.version>
     <spotless.check.skip>false</spotless.check.skip>
@@ -68,7 +70,7 @@ THE SOFTWARE.
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.479.x</artifactId>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
         <version>3482.vc10d4f6da_28a_</version>
         <type>pom</type>
         <scope>import</scope>