Skip to content

Commit d61b1d3

Browse files
authored
Merge pull request #227 from lewisbirks/spacing
Update the look and feel of the input form
2 parents 947b946 + 5643cae commit d61b1d3

File tree

1 file changed

+18
-12
lines changed
  • src/main/resources/org/jenkinsci/plugins/workflow/support/steps/input/InputStepExecution

1 file changed

+18
-12
lines changed

src/main/resources/org/jenkinsci/plugins/workflow/support/steps/input/InputStepExecution/index.jelly

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,34 @@
77
<h1>${it.input.message}</h1>
88
<j:if test="${!it.completed}">
99
<j:new var="u" className="hudson.Util" />
10-
<f:form method="post" action="${u.rawEncode(it.id)}/submit" name="${it.id}">
10+
<f:form method="post" action="${u.rawEncode(it.id)}/submit" name="${it.id}" class="jenkins-form">
1111
<j:if test="${it.hasUnsafeParameters}">
12-
<div class="alert alert-warning">
13-
Support for <code>FileParameter</code>s will be removed in a future release.
14-
Details on how to migrate your pipeline can be found
15-
<a rel="noopener noreferrer" href="https://jenkins.io/redirect/plugin/pipeline-input-step/file-parameters">online</a>.
12+
<div class="jenkins-form-item--medium">
13+
<div class="alert alert-warning">
14+
Support for <code>FileParameter</code>s will be removed in a future release.
15+
Details on how to migrate your pipeline can be found
16+
<a rel="noopener noreferrer" href="https://jenkins.io/redirect/plugin/pipeline-input-step/file-parameters">online</a>.
17+
</div>
1618
</div>
1719
</j:if>
1820
<j:if test="${it.hasUnsafeId}">
19-
<div class="alert alert-warning">
20-
The input is using a URL unsafe id ("<code>${it.id}</code>").<br/>
21-
Ids should be restricted to characters that are URL safe that do not need encoding such as ASCII alpha numeric and a limited set of punctuation.
21+
<div class="jenkins-form-item--medium">
22+
<div class="alert alert-warning">
23+
The input is using a URL unsafe id ("<code>${it.id}</code>").<br/>
24+
Ids should be restricted to characters that are URL safe that do not need encoding such as ASCII alpha numeric and a limited set of punctuation.
25+
</div>
2226
</div>
2327
</j:if>
2428
<j:forEach var="param" items="${it.input.parameters}">
2529
<j:set var="escapeEntryTitleAndDescription" value="true"/>
26-
<st:include page="index.jelly" it="${param}"/>
30+
<div class="jenkins-form-item--medium">
31+
<st:include page="index.jelly" it="${param}"/>
32+
</div>
2733
</j:forEach>
28-
<f:block>
34+
<f:bottomButtonBar>
2935
<f:submit value="${it.input.ok}" name="proceed"/>
30-
<f:submit value="${it.input.cancel}" name="abort"/>
31-
</f:block>
36+
<f:submit value="${it.input.cancel}" name="abort" primary="false"/>
37+
</f:bottomButtonBar>
3238
</f:form>
3339
</j:if>
3440
</j:jelly>

0 commit comments

Comments
 (0)