Skip to content

Commit 1ae68e5

Browse files
mawinter69mawinter69
authored
apply propery styling to selects (#468)
all selects now use the correct styling
1 parent 088331b commit 1ae68e5

8 files changed

Lines changed: 81 additions & 63 deletions

File tree

‎src/main/resources/jenkins/advancedqueue/PriorityConfiguration/index.jelly‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,18 @@
2525
<f:dropdownDescriptorSelector title="${%Jobs_to_include}" field="jobGroupStrategy" descriptors="${it.jobInclusionStrategyDescriptors}"/>
2626
</f:entry>
2727
<f:entry title="${%Priority}">
28-
<select name="priority">
29-
<j:forEach var="priority" items="${it.priorities}">
30-
<j:if test="${priority.value == jobGroup.priority}">
31-
<f:option value="${priority.value}" selected="true">${priority.name}</f:option>
32-
</j:if>
33-
<j:if test="${priority.value != jobGroup.priority}">
34-
<f:option value="${priority.value}">${priority.name}</f:option>
35-
</j:if>
36-
</j:forEach>
37-
</select>
28+
<div class="jenkins-select">
29+
<select name="priority" class="jenkins-select__input">
30+
<j:forEach var="priority" items="${it.priorities}">
31+
<j:if test="${priority.value == jobGroup.priority}">
32+
<f:option value="${priority.value}" selected="true">${priority.name}</f:option>
33+
</j:if>
34+
<j:if test="${priority.value != jobGroup.priority}">
35+
<f:option value="${priority.value}">${priority.name}</f:option>
36+
</j:if>
37+
</j:forEach>
38+
</select>
39+
</div>
3840
</f:entry>
3941
<f:entry title="${%Run_exclusive}" help="/descriptor/jenkins.advancedqueue.PriorityConfiguration/help/runExclusive">
4042
<f:checkbox name="runExclusive" value="${jobGroup.runExclusive}" checked="${jobGroup.runExclusive}"/>

‎src/main/resources/jenkins/advancedqueue/jobinclusion/strategy/FolderBasedJobInclusionStrategy/config.jelly‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
33
<f:entry title="${%Apply_to_Jobs_in_Folder}">
4-
<select name="folderName">
5-
<j:forEach var="folder" items="${descriptor.listFolderItems}">
6-
<f:option value="${folder.value}" selected="${folder.value==instance.folderName}">${folder.name}</f:option>
7-
</j:forEach>
8-
</select>
4+
<div class="jenkins-select">
5+
<select name="folderName" class="jenkins-select__input">
6+
<j:forEach var="folder" items="${descriptor.listFolderItems}">
7+
<f:option value="${folder.value}" selected="${folder.value==instance.folderName}">${folder.name}</f:option>
8+
</j:forEach>
9+
</select>
10+
</div>
911
</f:entry>
1012
</j:jelly>

‎src/main/resources/jenkins/advancedqueue/jobinclusion/strategy/JobInclusionCloudbeesFolderProperty/config.jelly‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
<j:if test="${descriptor.isUsed()}">
1111
<f:optionalBlock name="useJobGroup" inline="true" checked="${instance.useJobGroup}" title="${%Include_jobs_from_this_folder_in_a_job_group}">
1212
<f:entry title="${%Job_Group}" field="jobGroupName">
13-
<select name="jobGroupName">
14-
<j:forEach var="jobGroup" items="${descriptor.getJobGroups()}">
15-
<f:option value="${jobGroup.value}" selected="${jobGroup.value == instance.jobGroupName}">${jobGroup.name}</f:option>
16-
</j:forEach>
17-
</select>
13+
<div class="jenkins-select">
14+
<select name="jobGroupName" class="jenkins-select__input">
15+
<j:forEach var="jobGroup" items="${descriptor.getJobGroups()}">
16+
<f:option value="${jobGroup.value}" selected="${jobGroup.value == instance.jobGroupName}">${jobGroup.name}</f:option>
17+
</j:forEach>
18+
</select>
19+
</div>
1820
</f:entry>
1921
</f:optionalBlock>
2022
</j:if>

‎src/main/resources/jenkins/advancedqueue/jobinclusion/strategy/JobInclusionJobProperty/config.jelly‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
<j:if test="${descriptor.isUsed()}">
1111
<f:optionalBlock name="useJobGroup" inline="true" checked="${instance.useJobGroup}" title="${%Include_this_job_in_a_job_group}">
1212
<f:entry title="${%Job_Group}" field="jobGroupName">
13-
<select name="jobGroupName">
14-
<j:forEach var="jobGroup" items="${descriptor.getJobGroups()}">
15-
<f:option value="${jobGroup.value}" selected="${jobGroup.value == instance.jobGroupName}">${jobGroup.name}</f:option>
16-
</j:forEach>
17-
</select>
13+
<div class="jenkins-select">
14+
<select name="jobGroupName" class="jenkins-select__input">
15+
<j:forEach var="jobGroup" items="${descriptor.getJobGroups()}">
16+
<f:option value="${jobGroup.value}" selected="${jobGroup.value == instance.jobGroupName}">${jobGroup.name}</f:option>
17+
</j:forEach>
18+
</select>
19+
</div>
1820
</f:entry>
1921
</f:optionalBlock>
2022
</j:if>

‎src/main/resources/jenkins/advancedqueue/jobinclusion/strategy/ViewBasedJobInclusionStrategy/config.jelly‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
33
<f:entry title="${%Apply_to_Jobs_in_View}">
4-
<select name="viewName">
5-
<j:forEach var="view" items="${descriptor.listViewItems}">
6-
<f:option value="${view.value}" selected="${view.value==instance.viewName}">${view.name}</f:option>
7-
</j:forEach>
8-
</select>
4+
<div class="jenkins-select">
5+
<select name="viewName" class="jenkins-select__input jenkins-!-margin-bottom-2">
6+
<j:forEach var="view" items="${descriptor.listViewItems}">
7+
<f:option value="${view.value}" selected="${view.value==instance.viewName}">${view.name}</f:option>
8+
</j:forEach>
9+
</select>
10+
</div>
911
<f:optionalBlock name="jobFilter" checked="${instance.useJobFilter}" title="${%Use_a_regular_expression_to_only_include_a_subset_of_the_included_jobs}">
1012
<f:entry title="${%Regular_Expression}">
1113
<f:textbox name="jobPattern" field="jobPattern" value="${instance.jobPattern}" />

‎src/main/resources/jenkins/advancedqueue/priority/strategy/AbstractStaticPriorityStrategy/config.jelly‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
33
<f:entry title="${%Priority}">
4-
<select name="priority">
5-
<j:forEach var="priority" items="${descriptor.priorities}">
6-
<j:if test="${priority.value == instance.priority}">
7-
<f:option value="${priority.value}" selected="true">${priority.name}</f:option>
8-
</j:if>
9-
<j:if test="${priority.value != instance.priority}">
10-
<f:option value="${priority.value}">${priority.name}</f:option>
11-
</j:if>
12-
</j:forEach>
13-
</select>
4+
<div class="jenkins-select">
5+
<select name="priority" class="jenkins-select__input">
6+
<j:forEach var="priority" items="${descriptor.priorities}">
7+
<j:if test="${priority.value == instance.priority}">
8+
<f:option value="${priority.value}" selected="true">${priority.name}</f:option>
9+
</j:if>
10+
<j:if test="${priority.value != instance.priority}">
11+
<f:option value="${priority.value}">${priority.name}</f:option>
12+
</j:if>
13+
</j:forEach>
14+
</select>
15+
</div>
1416
</f:entry>
1517
</j:jelly>

‎src/main/resources/jenkins/advancedqueue/priority/strategy/HealthStrategy/config.jelly‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
33
<st:include page="config.jelly" class="jenkins.advancedqueue.priority.strategy.AbstractStaticPriorityStrategy" />
44
<f:entry title="${%Scope}">
5-
<select name="selection">
6-
<f:option value="BETTER" selected="${instance.selection=='BETTER'}">${%Health_is_equal_or_better_than}</f:option>
7-
<f:option value="SAME" selected="${instance.selection=='SAME'}">${%Health_is_exactly}</f:option>
8-
<f:option value="WORSE" selected="${instance.selection=='WORSE'}">${%Health_is_equal_or_worse_than}</f:option>
9-
</select>
10-
<select name="health">
11-
<!-- Using same naming and conventions as in HealthReport -->
12-
<f:option value="HEALTH_OVER_80" selected="${instance.health=='HEALTH_OVER_80'}">${%No_recent_builds_failed}</f:option>
13-
<f:option value="HEALTH_61_TO_80" selected="${instance.health=='HEALTH_61_TO_80'}">${%HEALTH_61_TO_80}</f:option>
14-
<f:option value="HEALTH_41_TO_60" selected="${instance.health=='HEALTH_41_TO_60'}">${%HEALTH_41_TO_60}</f:option>
15-
<f:option value="HEALTH_21_TO_40" selected="${instance.health=='HEALTH_21_TO_40'}">${%HEALTH_21_TO_40}</f:option>
16-
<f:option value="HEALTH_0_TO_20" selected="${instance.health=='HEALTH_0_TO_20'}">${%All_recent_builds_failed}</f:option>
17-
</select>
5+
<div class="jenkins-select jenkins-!-margin-bottom-2">
6+
<select name="selection" class="jenkins-select__input">
7+
<f:option value="BETTER" selected="${instance.selection=='BETTER'}">${%Health_is_equal_or_better_than}</f:option>
8+
<f:option value="SAME" selected="${instance.selection=='SAME'}">${%Health_is_exactly}</f:option>
9+
<f:option value="WORSE" selected="${instance.selection=='WORSE'}">${%Health_is_equal_or_worse_than}</f:option>
10+
</select>
11+
</div>
12+
<div class="jenkins-select">
13+
<select name="health" class="jenkins-select__input">
14+
<!-- Using same naming and conventions as in HealthReport -->
15+
<f:option value="HEALTH_OVER_80" selected="${instance.health=='HEALTH_OVER_80'}">${%No_recent_builds_failed}</f:option>
16+
<f:option value="HEALTH_61_TO_80" selected="${instance.health=='HEALTH_61_TO_80'}">${%HEALTH_61_TO_80}</f:option>
17+
<f:option value="HEALTH_41_TO_60" selected="${instance.health=='HEALTH_41_TO_60'}">${%HEALTH_41_TO_60}</f:option>
18+
<f:option value="HEALTH_21_TO_40" selected="${instance.health=='HEALTH_21_TO_40'}">${%HEALTH_21_TO_40}</f:option>
19+
<f:option value="HEALTH_0_TO_20" selected="${instance.health=='HEALTH_0_TO_20'}">${%All_recent_builds_failed}</f:option>
20+
</select>
21+
</div>
1822
</f:entry>
1923

2024
</j:jelly>

‎src/main/resources/jenkins/advancedqueue/priority/strategy/PriorityJobProperty/config.jelly‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@
1010
<j:if test="${descriptor.isUsed(it)}">
1111
<f:optionalBlock name="useJobPriority" inline="true" checked="${instance.useJobPriority}" title="${%Use_specific_priority_for_this_job}">
1212
<f:entry title="${%Job_Priority}" field="priority">
13-
<select name="priority">
14-
<j:forEach var="priority" items="${descriptor.getPriorities()}">
15-
<j:if test="${priority.value == instance.priority}">
16-
<f:option value="${priority.value}" selected="true">${priority.name}</f:option>
17-
</j:if>
18-
<j:if test="${priority.value != instance.priority}">
19-
<f:option value="${priority.value}">${priority.name}</f:option>
20-
</j:if>
21-
</j:forEach>
22-
</select>
13+
<div class="jenkins-select">
14+
<select name="priority" class="jenkins-select__input">
15+
<j:forEach var="priority" items="${descriptor.getPriorities()}">
16+
<j:if test="${priority.value == instance.priority}">
17+
<f:option value="${priority.value}" selected="true">${priority.name}</f:option>
18+
</j:if>
19+
<j:if test="${priority.value != instance.priority}">
20+
<f:option value="${priority.value}">${priority.name}</f:option>
21+
</j:if>
22+
</j:forEach>
23+
</select>
24+
</div>
2325
</f:entry>
2426
</f:optionalBlock>
2527
</j:if>

0 commit comments

Comments
 (0)