Skip to content

UI fixes #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mawinter69 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UI fixes #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

<f:entry title="${%Maximum Total Concurrent Builds}"
field="maxConcurrentTotal">
<f:textbox />
<f:number min="0"/>
</f:entry>
<f:entry title="${%Maximum Concurrent Builds Per Node}"
field="maxConcurrentPerNode">
<f:textbox />
<f:number min="0"/>
</f:entry>


Expand All @@ -34,11 +34,12 @@

<j:if test="${!empty(descriptor.categories)}">
<f:entry title="${%Multi-Project Throttle Category}">
<j:forEach var="cat" items="${descriptor.categories}">
<f:checkbox name="categories" json="${cat.categoryName}" title="${cat.categoryName}"
checked="${instance.categories.contains(cat.categoryName)}" />
<st:nbsp/>
</j:forEach>
<div style="display: flex; gap: 1rem; flex-wrap: wrap;">
<j:forEach var="cat" items="${descriptor.categories}">
<f:checkbox name="categories" json="${cat.categoryName}" title="${cat.categoryName}"
checked="${instance.categories.contains(cat.categoryName)}" />
</j:forEach>
</div>
</f:entry>
</j:if>
<!--Specific options for Matrix projects-->
Expand Down
40 changes: 16 additions & 24 deletions src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/global.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,28 @@
<?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" xmlns:tc="/lib/throttleconcurrents">
xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:section title="Throttle Concurrent Builds">
<f:entry title="Multi-Project Throttle Categories" field="categories">
<f:repeatable field="categories" add="${%Add Category}" minimum="0">
<tc:blockWrapper>
<f:entry title="Category Name" field="categoryName">
<f:textbox />
</f:entry>
<f:entry title="${%Maximum Total Concurrent Builds}" field="maxConcurrentTotal">
<f:entry title="Category Name" field="categoryName">
<f:textbox clazz="required" checkMessage="${%Category Name is required}"/>
</f:entry>
<f:entry title="${%Maximum Total Concurrent Builds}" field="maxConcurrentTotal">
<f:number min="0"/>
</f:entry>
<f:entry title="${%Maximum Concurrent Builds Per Node}" field="maxConcurrentPerNode">
<f:number min="0"/>
</f:entry>
<f:repeatable field="nodeLabeledPairs" add="${%Add Maximum Per Labeled Node}" minimum="0" header="${%Maximum Per Labeled Node}">
<f:entry title="${%Throttled Node Label}" field="throttledNodeLabel">
<f:textbox />
</f:entry>
<f:entry title="${%Maximum Concurrent Builds Per Node}" field="maxConcurrentPerNode">
<f:textbox />
<f:entry title="${%Maximum Concurrent Builds Per Node Labeled As Above}" field="maxConcurrentPerNodeLabeled">
<f:number min="0"/>
</f:entry>
</tc:blockWrapper>
<f:repeatable field="nodeLabeledPairs" add="${%Add Maximum Per Labeled Node}" minimum="0" header="${%Maximum Per Labeled Node}">
<tc:blockWrapper>
<f:entry title="${%Throttled Node Label}" field="throttledNodeLabel">
<f:textbox />
</f:entry>
<f:entry title="${%Maximum Concurrent Builds Per Node Labeled As Above}" field="maxConcurrentPerNodeLabeled">
<f:textbox />
</f:entry>
</tc:blockWrapper>
<div align="right">
<f:repeatableDeleteButton/>
</div>
</f:repeatable>
<div align="right">
<f:repeatableDeleteButton/>
</div>
</f:repeatable>
<f:repeatableDeleteButton/>
</f:repeatable>
</f:entry>
</f:section>
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/hudson/plugins/throttleconcurrents/pipeline/ThrottleStep/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<j:choose>
<j:when test="${!empty(descriptor.categories)}">
<f:entry title="${%Categories}">
<j:forEach var="cat" items="${descriptor.categories}">
<f:checkbox name="categories" json="${cat.categoryName}" checked="${instance.categories.contains(cat.categoryName)}" />
<label class="attach-previous">${cat.categoryName}</label>
<st:nbsp/>
</j:forEach>
<div style="display: flex; gap: 1rem; flex-wrap: wrap;">
<j:forEach var="cat" items="${descriptor.categories}">
<f:checkbox name="categories" json="${cat.categoryName}" checked="${instance.categories.contains(cat.categoryName)}" title="${cat.categoryName}" />
</j:forEach>
</div>
</f:entry>
</j:when>
<j:otherwise>
Expand Down
16 changes: 0 additions & 16 deletions src/main/resources/lib/throttleconcurrents/blockWrapper.jelly
View file
Open in desktop

This file was deleted.

Empty file removed src/main/resources/lib/throttleconcurrents/taglib
View file
Open in desktop
Empty file.
Loading