Skip to content

Commit fe7bfc7

Browse files
author
whitej
committed
Merge remote-tracking branch 'FarmGeek4Life/tables-to-divs'
2 parents c2f7ca5 + 4d9313d commit fe7bfc7

File tree

11 files changed

+67
-45
lines changed

11 files changed

+67
-45
lines changed

‎src/main/resources/lib/managed_scripts/blockWrapper.jelly

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?jelly escape-by-default='true'?>
2+
<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">
3+
<st:documentation>
4+
This adds a wrapper allowing adding an ID to a field or group of fields that can be targeted by JavaScript
5+
The wrapper will be a `table` tag before 2.264, and a `div` tag after that.
6+
7+
</st:documentation>
8+
9+
<j:choose>
10+
<j:when test="${divBasedFormLayout}">
11+
<div>
12+
<d:invokeBody/>
13+
</div>
14+
</j:when>
15+
<j:otherwise>
16+
<table>
17+
<d:invokeBody/>
18+
</table>
19+
</j:otherwise>
20+
</j:choose>
21+
22+
</j:jelly>

‎src/main/resources/lib/managed_scripts/taglib

Whitespace-only changes.

‎src/main/resources/org/jenkinsci/plugins/managedscripts/PowerShellBuildStep/config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?jelly escape-by-default='true'?>
2-
<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">
2+
<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:ms="/lib/managed_scripts">
33

44
<f:entry title="${%Script}" field="buildStepContent">
55

@@ -14,22 +14,22 @@
1414
</tr>
1515

1616
<f:block>
17-
<table name="scriptBuildStepArgs" id="scriptBuildStepArgs">
17+
<ms:blockWrapper name="scriptBuildStepArgs" id="scriptBuildStepArgs">
1818
<f:optionalBlock name="defineArgs" inline="true" title="${%Define arguments}" checked="${!empty(instance.buildStepArgs)}" help="/plugin/managed-scripts/help-defineArgs_powershell.html">
1919
<f:entry>
2020
<f:repeatable var="arg" items="${instance.buildStepArgs}" name="buildStepArgs" noAddButton="true" minimum="1">
21-
<table width="100%">
21+
<ms:blockWrapper width="100%">
2222
<f:entry>
2323
<div name="argName"><st:nbsp/></div>
2424
<input type="text" name="arg" value="${arg}" size="80"/>
2525
<input type="button" name="delete_button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
2626
<input type="button" name="add_button" onClick="ms_labelArgs()" value="${%Add argument}" class="repeatable-add show-if-last" />
2727
</f:entry>
28-
</table>
28+
</ms:blockWrapper>
2929
</f:repeatable>
3030
</f:entry>
3131
</f:optionalBlock>
32-
</table>
32+
</ms:blockWrapper>
3333
</f:block>
3434
</f:entry>
3535

‎src/main/resources/org/jenkinsci/plugins/managedscripts/PowerShellConfig/edit-config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ THE SOFTWARE.
2626

2727
<?jelly escape-by-default='true'?>
2828
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
29-
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
29+
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:ms="/lib/managed_scripts">
3030

3131
<p>
3232
${%description}
@@ -35,19 +35,19 @@ THE SOFTWARE.
3535
<j:set var="descriptor" value="${config.descriptor}"/>
3636
<st:include page="id-name-and-comment" class="${descriptor.clazz}"/>
3737
<f:block>
38-
<table>
38+
<ms:blockWrapper>
3939
<f:entry title="${%Argument list}" field="config.args">
4040
<f:repeatable var="arg" items="${config.args}" name="args" noAddButton="true" minimum="1">
41-
<table width="100%">
41+
<ms:blockWrapper width="100%">
4242
<f:entry>
4343
<input type="text" name="name" value="${arg.name}" size="40" />
4444
<input type="button" name="delete_button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
4545
<input type="button" name="add_button" value="${%Add argument}" class="repeatable-add show-if-last" />
4646
</f:entry>
47-
</table>
47+
</ms:blockWrapper>
4848
</f:repeatable>
4949
</f:entry>
50-
</table>
50+
</ms:blockWrapper>
5151
</f:block>
5252
<f:entry title="${%Content}">
5353
<f:textarea id="config.content" name="config.content" value="${config.content}" />

‎src/main/resources/org/jenkinsci/plugins/managedscripts/PowerShellConfig/show-config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
<?jelly escape-by-default='true'?>
12-
<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">
12+
<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:ms="/lib/managed_scripts">
1313

1414
<f:entry title="${%ID}">
1515
<f:textbox readonly="readonly" name="config.id" value="${config.id}" />
@@ -21,17 +21,17 @@
2121
<f:textbox readonly="readonly" name="config.comment" value="${config.comment}" />
2222
</f:entry>
2323
<f:block>
24-
<table>
24+
<ms:blockWrapper>
2525
<f:entry title="${%Argument list}" field="config.args">
2626
<f:repeatable var="arg" items="${config.args}" name="args" noAddButton="true" minimum="1">
27-
<table width="100%">
27+
<ms:blockWrapper width="100%">
2828
<f:entry>
2929
<input type="text" readonly="readonly" name="name" value="${arg.name}" />
3030
</f:entry>
31-
</table>
31+
</ms:blockWrapper>
3232
</f:repeatable>
3333
</f:entry>
34-
</table>
34+
</ms:blockWrapper>
3535
</f:block>
3636
<f:entry title="${%Content}">
3737
<f:textarea readonly="readonly" id="config.content" name="config.content" value="${config.content}" />

‎src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptBuildStep/config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?jelly escape-by-default='true'?>
2-
<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">
2+
<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:ms="/lib/managed_scripts">
33

44
<f:entry title="${%Script}" field="buildStepContent">
55
<f:entry field="buildStepId">
@@ -13,25 +13,25 @@
1313
</tr>
1414

1515
<f:block>
16-
<table name="scriptBuildStepArgs" id="scriptBuildStepArgs">
16+
<ms:blockWrapper name="scriptBuildStepArgs" id="scriptBuildStepArgs">
1717
<f:optionalBlock name="defineArgs" inline="true" title="${%Define arguments}" checked="${!empty(instance.buildStepArgs)}" help="/plugin/managed-scripts/help-defineArgs.html">
1818
<f:entry field="tokenized">
1919
<f:checkbox title="${%Tokenized}" checked="${instance.isTokenized()}" />
2020
</f:entry>
2121
<f:entry>
2222
<f:repeatable var="arg" items="${instance.buildStepArgs}" name="buildStepArgs" noAddButton="true" minimum="1">
23-
<table width="100%">
23+
<ms:blockWrapper width="100%">
2424
<f:entry>
2525
<div name="argName"><st:nbsp/></div>
2626
<input type="text" name="arg" value="${arg}" size="80"/>
2727
<input type="button" name="delete_button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
2828
<input type="button" name="add_button" onClick="ms_labelArgs()" value="${%Add argument}" class="repeatable-add show-if-last" />
2929
</f:entry>
30-
</table>
30+
</ms:blockWrapper>
3131
</f:repeatable>
3232
</f:entry>
3333
</f:optionalBlock>
34-
</table>
34+
</ms:blockWrapper>
3535
</f:block>
3636
</f:entry>
3737
</j:jelly>

‎src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptConfig/edit-config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ THE SOFTWARE.
2626

2727
<?jelly escape-by-default='true'?>
2828
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
29-
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
29+
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:ms="/lib/managed_scripts">
3030

3131
<p>
3232
${%description}
@@ -35,19 +35,19 @@ THE SOFTWARE.
3535
<j:set var="descriptor" value="${config.descriptor}"/>
3636
<st:include page="id-name-and-comment" class="${descriptor.clazz}"/>
3737
<f:block>
38-
<table>
38+
<ms:blockWrapper>
3939
<f:entry title="${%Argument list}" field="config.args">
4040
<f:repeatable var="arg" items="${config.args}" name="args" noAddButton="true" minimum="1">
41-
<table width="100%">
41+
<ms:blockWrapper width="100%">
4242
<f:entry>
4343
<input type="text" name="name" value="${arg.name}" size="40" />
4444
<input type="button" name="delete_button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
4545
<input type="button" name="add_button" value="${%Add argument}" class="repeatable-add show-if-last" />
4646
</f:entry>
47-
</table>
47+
</ms:blockWrapper>
4848
</f:repeatable>
4949
</f:entry>
50-
</table>
50+
</ms:blockWrapper>
5151
</f:block>
5252
<f:entry title="${%Content}">
5353
<f:textarea id="config.content" name="config.content" value="${config.content}" />

‎src/main/resources/org/jenkinsci/plugins/managedscripts/ScriptConfig/show-config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
<?jelly escape-by-default='true'?>
12-
<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">
12+
<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:ms="/lib/managed_scripts">
1313

1414
<f:entry title="${%ID}">
1515
<f:textbox readonly="readonly" name="config.id" value="${config.id}" />
@@ -21,17 +21,17 @@
2121
<f:textbox readonly="readonly" name="config.comment" value="${config.comment}" />
2222
</f:entry>
2323
<f:block>
24-
<table>
24+
<ms:blockWrapper>
2525
<f:entry title="${%Argument list}" field="config.args">
2626
<f:repeatable var="arg" items="${config.args}" name="args" noAddButton="true" minimum="1">
27-
<table width="100%">
27+
<ms:blockWrapper width="100%">
2828
<f:entry>
2929
<input type="text" readonly="readonly" name="name" value="${arg.name}" />
3030
</f:entry>
31-
</table>
31+
</ms:blockWrapper>
3232
</f:repeatable>
3333
</f:entry>
34-
</table>
34+
</ms:blockWrapper>
3535
</f:block>
3636
<f:entry title="${%Content}">
3737
<f:textarea readonly="readonly" id="config.content" name="config.content" value="${config.content}" />

‎src/main/resources/org/jenkinsci/plugins/managedscripts/WinBatchBuildStep/config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?jelly escape-by-default='true'?>
2-
<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">
2+
<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:ms="/lib/managed_scripts">
33

44
<f:entry title="${%Script}" field="buildStepContent">
55
<f:entry field="buildStepId">
@@ -13,22 +13,22 @@
1313
</tr>
1414

1515
<f:block>
16-
<table name="scriptBuildStepArgs" id="scriptBuildStepArgs">
16+
<ms:blockWrapper name="scriptBuildStepArgs" id="scriptBuildStepArgs">
1717
<f:optionalBlock name="defineArgs" inline="true" title="${%Define arguments}" checked="${!empty(instance.buildStepArgs)}" help="/plugin/managed-scripts/help-defineArgs_win.html">
1818
<f:entry>
1919
<f:repeatable var="arg" items="${instance.buildStepArgs}" name="buildStepArgs" noAddButton="true" minimum="1">
20-
<table width="100%">
20+
<ms:blockWrapper width="100%">
2121
<f:entry>
2222
<div name="argName"><st:nbsp/></div>
2323
<input type="text" name="arg" value="${arg}" size="80"/>
2424
<input type="button" name="delete_button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
2525
<input type="button" name="add_button" onClick="ms_labelArgs()" value="${%Add argument}" class="repeatable-add show-if-last" />
2626
</f:entry>
27-
</table>
27+
</ms:blockWrapper>
2828
</f:repeatable>
2929
</f:entry>
3030
</f:optionalBlock>
31-
</table>
31+
</ms:blockWrapper>
3232
</f:block>
3333
</f:entry>
3434

‎src/main/resources/org/jenkinsci/plugins/managedscripts/WinBatchConfig/edit-config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ THE SOFTWARE.
2626

2727
<?jelly escape-by-default='true'?>
2828
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
29-
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
29+
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:ms="/lib/managed_scripts">
3030

3131
<p>
3232
${%description}
@@ -35,19 +35,19 @@ THE SOFTWARE.
3535
<j:set var="descriptor" value="${config.descriptor}"/>
3636
<st:include page="id-name-and-comment" class="${descriptor.clazz}"/>
3737
<f:block>
38-
<table>
38+
<ms:blockWrapper>
3939
<f:entry title="${%Argument list}" field="config.args">
4040
<f:repeatable var="arg" items="${config.args}" name="args" noAddButton="true" minimum="1">
41-
<table width="100%">
41+
<ms:blockWrapper width="100%">
4242
<f:entry>
4343
<input type="text" name="name" value="${arg.name}" size="40" />
4444
<input type="button" name="delete_button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
4545
<input type="button" name="add_button" value="${%Add argument}" class="repeatable-add show-if-last" />
4646
</f:entry>
47-
</table>
47+
</ms:blockWrapper>
4848
</f:repeatable>
4949
</f:entry>
50-
</table>
50+
</ms:blockWrapper>
5151
</f:block>
5252
<f:entry title="${%Content}">
5353
<f:textarea id="config.content" name="config.content" value="${config.content}" />

‎src/main/resources/org/jenkinsci/plugins/managedscripts/WinBatchConfig/show-config.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
<?jelly escape-by-default='true'?>
12-
<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">
12+
<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:ms="/lib/managed_scripts">
1313

1414
<f:entry title="${%ID}">
1515
<f:textbox readonly="readonly" name="config.id" value="${config.id}" />
@@ -21,17 +21,17 @@
2121
<f:textbox readonly="readonly" name="config.comment" value="${config.comment}" />
2222
</f:entry>
2323
<f:block>
24-
<table>
24+
<ms:blockWrapper>
2525
<f:entry title="${%Argument list}" field="config.args">
2626
<f:repeatable var="arg" items="${config.args}" name="args" noAddButton="true" minimum="1">
27-
<table width="100%">
27+
<ms:blockWrapper width="100%">
2828
<f:entry>
2929
<input type="text" readonly="readonly" name="name" value="${arg.name}" />
3030
</f:entry>
31-
</table>
31+
</ms:blockWrapper>
3232
</f:repeatable>
3333
</f:entry>
34-
</table>
34+
</ms:blockWrapper>
3535
</f:block>
3636
<f:entry title="${%Content}">
3737
<f:textarea readonly="readonly" id="config.content" name="config.content" value="${config.content}" />

0 commit comments

Comments
 (0)