Skip to content

Commit 91269f4

Browse files
mawinter69mawinter69
committed
apply jenkins styling to move select
also remove the obsolete blockwrapper
1 parent af16350 commit 91269f4

File tree

7 files changed

+34
-64
lines changed

7 files changed

+34
-64
lines changed

‎src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ THE SOFTWARE.
2323
-->
2424
<?jelly escape-by-default='true'?>
2525
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
26-
xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt"
27-
xmlns:fo="/lib/folder" xmlns:p="/lib/hudson/project">
26+
xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
2827
<l:layout title="${it.displayName} Config" permission="${it.EXTENDED_READ}">
2928
<j:set var="readOnlyMode" value="${!it.hasPermission(it.CONFIGURE)}" />
3029
<l:breadcrumb title="${%Configuration}" />
@@ -100,9 +99,7 @@ THE SOFTWARE.
10099
</j:when>
101100
<j:otherwise>
102101
<f:invisibleEntry>
103-
<fo:blockWrapper>
104102
<f:dropdownDescriptorSelector title="${%Views Tab Bar}" field="viewsTabBar"/>
105-
</fo:blockWrapper>
106103
</f:invisibleEntry>
107104
</j:otherwise>
108105
</j:choose>
@@ -114,9 +111,7 @@ THE SOFTWARE.
114111
</j:when>
115112
<j:otherwise>
116113
<f:invisibleEntry>
117-
<fo:blockWrapper>
118114
<f:dropdownDescriptorSelector title="${%Icon}" field="icon"/>
119-
</fo:blockWrapper>
120115
</f:invisibleEntry>
121116
</j:otherwise>
122117
</j:choose>
@@ -125,9 +120,7 @@ THE SOFTWARE.
125120
</j:when>
126121
<j:otherwise>
127122
<f:invisibleEntry>
128-
<fo:blockWrapper>
129123
<f:dropdownDescriptorSelector title="${%Icon}" field="icon"/>
130-
</fo:blockWrapper>
131124
</f:invisibleEntry>
132125
</j:otherwise>
133126
</j:choose>

‎src/main/resources/com/cloudbees/hudson/plugins/folder/computed/ComputedFolder/configure-details.jelly‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424
-->
2525

2626
<?jelly escape-by-default='true'?>
27-
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project" xmlns:fo="/lib/folder">
27+
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
2828
<st:include page="configure-entries" optional="true"/>
2929
<f:descriptorList title="${%triggers(it.computation.displayName)}"
3030
descriptors="${it.triggerDescriptors}"
@@ -38,12 +38,12 @@ THE SOFTWARE.
3838
<j:choose>
3939
<j:when test="${orphanedItemStrategyDescriptors.size() == 1}">
4040
<j:scope>
41-
<fo:blockWrapper name="orphanedItemStrategy">
41+
<div name="orphanedItemStrategy">
4242
<j:set var="descriptor" value="${orphanedItemStrategyDescriptors.get(0)}"/>
4343
<j:set var="instance" value="${it.orphanedItemStrategy}"/>
4444
<f:class-entry descriptor="${descriptor}"/>
4545
<st:include from="${descriptor}" page="${descriptor.configPage}" optional="true"/>
46-
</fo:blockWrapper>
46+
</div>
4747
</j:scope>
4848
</j:when>
4949
<j:otherwise>

‎src/main/resources/com/cloudbees/hudson/plugins/folder/computed/FolderComputation/index.jelly‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ THE SOFTWARE.
2323
-->
2424

2525
<?jelly escape-by-default='true'?>
26-
<st:compress 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:i="jelly:fmt"
27-
xmlns:fo="/lib/folder">
26+
<st:compress 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:i="jelly:fmt">
2827
<l:layout title="${it.parent.displayName} ${it.displayName} Log">
2928
<st:include page="sidepanel.jelly" it="${it.parent}" />
3029
<l:main-panel>
@@ -34,7 +33,7 @@ xmlns:fo="/lib/folder">
3433
(<i:formatDate value="${it.timestamp.time}" type="both" dateStyle="medium" timeStyle="medium"/>)
3534
</j:if>
3635
</t:buildCaption>
37-
<fo:blockWrapper>
36+
<table style="margin-top: 1em; margin-left:1em;">
3837
<t:summary icon="icon-notepad">
3938
<j:choose>
4039
<j:when test="${it.result==null}">
@@ -49,7 +48,7 @@ xmlns:fo="/lib/folder">
4948
</j:otherwise>
5049
</j:choose>
5150
</t:summary>
52-
</fo:blockWrapper>
51+
</table>
5352
</l:main-panel>
5453
</l:layout>
5554
</st:compress>

‎src/main/resources/com/cloudbees/hudson/plugins/folder/config/AbstractFolderConfiguration/config.jelly‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<f:section title="${%Folder}">
44
<f:entry title="${%Health Metrics}"
55
description="${%List of default health metrics for Folders}">
6-
<f:repeatableHeteroProperty field="healthMetrics" oneEach="true" honorOrder="true" hasHeader="true">
7-
<f:entry title="">
8-
<div align="right">
9-
<f:repeatableDeleteButton/>
10-
</div>
11-
</f:entry>
12-
</f:repeatableHeteroProperty>
6+
<f:repeatableHeteroProperty field="healthMetrics" oneEach="true" honorOrder="true" hasHeader="true"/>
137
</f:entry>
148
</f:section>
159
</j:jelly>

‎src/main/resources/com/cloudbees/hudson/plugins/folder/relocate/DefaultRelocationUI/main.jelly‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,32 @@
33
xmlns:t="/lib/hudson" xmlns:f="/lib/form">
44
<h1>${%Move}</h1>
55
<form method="post" action="move">
6-
${%blurb(item.pronoun, item.displayName)}
7-
<select name="destination" class="select setting-input">
8-
<j:forEach var="destination" items="${it.listDestinations(item)}">
9-
<j:choose>
10-
<j:when test="${destination == itemParent and destination == app}">
11-
<option selected="yes" value="/${destination.fullName}">${app.displayName}</option>
12-
</j:when>
13-
<j:when test="${destination == itemParent and destination != app}">
14-
<option selected="yes" value="/${destination.fullName}">
15-
${app.displayName} &#187; ${destination.fullDisplayName}
16-
</option>
17-
</j:when>
18-
<j:when test="${destination != itemParent and destination == app}">
19-
<option value="/${destination.fullName}">${app.displayName}</option>
20-
</j:when>
21-
<j:otherwise>
22-
<option value="/${destination.fullName}">
23-
${app.displayName} &#187; ${destination.fullDisplayName}
24-
</option>
25-
</j:otherwise>
26-
</j:choose>
27-
</j:forEach>
28-
</select>
6+
<f:entry title="${%blurb(item.pronoun, item.displayName)}">
7+
<div class="jenkins-select">
8+
<select name="destination" class="jenkins-select__input">
9+
<j:forEach var="destination" items="${it.listDestinations(item)}">
10+
<j:choose>
11+
<j:when test="${destination == itemParent and destination == app}">
12+
<option selected="yes" value="/${destination.fullName}">${app.displayName}</option>
13+
</j:when>
14+
<j:when test="${destination == itemParent and destination != app}">
15+
<option selected="yes" value="/${destination.fullName}">
16+
${app.displayName} &#187; ${destination.fullDisplayName}
17+
</option>
18+
</j:when>
19+
<j:when test="${destination != itemParent and destination == app}">
20+
<option value="/${destination.fullName}">${app.displayName}</option>
21+
</j:when>
22+
<j:otherwise>
23+
<option value="/${destination.fullName}">
24+
${app.displayName} &#187; ${destination.fullDisplayName}
25+
</option>
26+
</j:otherwise>
27+
</j:choose>
28+
</j:forEach>
29+
</select>
30+
</div>
31+
</f:entry>
2932
<f:submit value="${%Move}"/>
3033
</form>
3134
</j:jelly>

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/main/resources/lib/folder/taglib‎

Whitespace-only changes.

0 commit comments

Comments
 (0)