Skip to content
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

Jump to bottom

Simplify jelly pages by removing divBasedFormLayout logic #1346

Merged
merged 4 commits into from
Nov 5, 2022
Merged

Simplify jelly pages by removing divBasedFormLayout logic #1346

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
948b886
Simplify pages by removing divBasedFormLayout logic
MarkEWaite Oct 19, 2022
51686de
Merge branch 'master' into remove-divBasedFormLayout
MarkEWaite Oct 20, 2022
37254ac
Merge branch 'master' into remove-divBasedFormLayout
MarkEWaite Oct 31, 2022
497d68b
Merge branch 'master' into remove-divBasedFormLayout
MarkEWaite Nov 5, 2022
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
31 changes: 7 additions & 24 deletions src/main/resources/com/dabsquared/gitlabjenkins/GitLabPushTrigger/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core"
xmlns:f="/lib/form"
xmlns:d="jelly:define"
xmlns:local="local">
<d:taglib uri="local">
<d:tag name="blockWrapperTable">
<j:choose>
<j:when test="${divBasedFormLayout}">
<div>
<d:invokeBody/>
</div>
</j:when>
<j:otherwise>
<table>
<d:invokeBody/>
</table>
</j:otherwise>
</j:choose>
</d:tag>
</d:taglib>
xmlns:d="jelly:define">
<f:entry title="Enabled GitLab triggers">
<local:blockWrapperTable>
<div>
<f:entry title="Push Events" field="triggerOnPush">
<f:checkbox default="true"/>
</f:entry>
Expand Down Expand Up @@ -52,7 +35,7 @@
<f:entry title="Comment (regex) for triggering a build" help="/plugin/gitlab-plugin/help/help-noteRegex.html">
<f:textbox field="noteRegex" default="Jenkins please retry a build"/>
</f:entry>
</local:blockWrapperTable>
</div>
</f:entry>
<f:advanced>
<f:entry title="Enable [ci-skip]" field="ciSkip">
Expand All @@ -78,7 +61,7 @@
</f:entry>

<f:entry title="Allowed branches">
<local:blockWrapperTable>
<div>
<!--<f:section title="">-->
<f:radioBlock name="branchFilterType" value="All" title="Allow all branches to trigger this job"
checked="${instance.branchFilterType == null || instance.branchFilterType == 'All'}"
Expand Down Expand Up @@ -116,14 +99,14 @@
autoCompleteDelimChar=","/>
</f:entry>
</f:optionalBlock>
</local:blockWrapperTable>
</div>
</f:entry>
<f:entry title="${%Secret token}" help="/plugin/gitlab-plugin/help/help-secretToken.html">
<local:blockWrapperTable>
<div>
<f:readOnlyTextbox field="secretToken" id="secretToken"/>
<f:validateButton title="${%Generate}" method="generateSecretToken"/>
<f:validateButton title="${%Clear}" method="clearSecretToken"/>
</local:blockWrapperTable>
</div>
</f:entry>
</f:advanced>
</j:jelly>