[JENKINS-64147] Forwards compat with table-to-div (#528)

* Forwards compat with table-to-div * Add missing taglib file Co-authored-by: res0nance <[email protected]> Co-authored-by: Tim Jacomb <[email protected]>
jenkinsci · Nov 6, 2020 · dac2e7e · dac2e7e
1 parent f21a54f
commit dac2e7e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/src/main/resources/hudson/plugins/ec2/EC2Tag/config.jelly b/src/main/resources/hudson/plugins/ec2/EC2Tag/config.jelly
@@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-   <table width="100%">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:ec="/lib/ec2">
+   <ec:blockWrapper>
       <f:entry title="${%Name}" field="name">
          <f:textbox />
       </f:entry>
@@ -37,5 +37,5 @@ THE SOFTWARE.
             <f:repeatableDeleteButton />
          </div>
       </f:entry>
-   </table>
+   </ec:blockWrapper>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/ec2/SlaveTemplate/config.jelly b/src/main/resources/hudson/plugins/ec2/SlaveTemplate/config.jelly
@@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" >
-  <table width="100%">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:ec="/lib/ec2">
+  <ec:blockWrapper>
 
   <f:entry title="${%Description}" field="description">
     <f:textbox />
@@ -214,5 +214,5 @@ THE SOFTWARE.
     </div>
   </f:entry>
 
-</table>
+</ec:blockWrapper>
 </j:jelly>
diff --git a/src/main/resources/lib/ec2/blockWrapper.jelly b/src/main/resources/lib/ec2/blockWrapper.jelly
@@ -0,0 +1,16 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define">
+  <!-- TODO remove and switch to div after baseline is 2.264 or newer -->
+  <j:choose>
+    <j:when test="${divBasedFormLayout}">
+      <div>
+        <d:invokeBody/>
+      </div>
+    </j:when>
+    <j:otherwise>
+      <table style="width:100%">
+        <d:invokeBody/>
+      </table>
+    </j:otherwise>
+  </j:choose>
+</j:jelly>
diff --git a/src/main/resources/lib/ec2/taglib b/src/main/resources/lib/ec2/taglib