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

Make layout compatible with upcoming jenkins core #266

Merged
merged 6 commits into from
May 3, 2020
Merged

Make layout compatible with upcoming jenkins core #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d1f879
Make layout compatible with upcoming jenkins core
timja Mar 19, 2020
c298eca
Update src/main/resources/org/jfrog/hudson/ArtifactoryBuilder/global.…
timja Mar 20, 2020
93535d6
Restore IDs
jsoref Apr 30, 2020
ed7540f
Merge pull request #1 from jsoref/add-divs-with-ids
timja Apr 30, 2020
f2139f1
Add missing ID
timja May 2, 2020
0fdce97
Fix credentials layout
timja May 3, 2020
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
25 changes: 25 additions & 0 deletions src/main/resources/lib/jfrog/blockWrapper.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?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">
<st:documentation>
This adds a wrapper allowing adding an ID to a field or group of fields that can be targeted by JavaScript
The wrapper will be a `table` tag on Jenkins Core less than 2.236, and a `div` tag after that

<st:attribute name="id">
ID to add to the wrapper
</st:attribute>
</st:documentation>

<j:choose>
<j:when test="${divBasedFormLayout}">
<div id="${attrs.id}">
<d:invokeBody/>
</div>
</j:when>
<j:otherwise>
<table id="${attrs.id}">
<d:invokeBody/>
</table>
</j:otherwise>
</j:choose>

</j:jelly>
91 changes: 44 additions & 47 deletions src/main/resources/org/jfrog/hudson/ArtifactoryBuilder/global.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@

<f:entry
help="/plugin/artifactory/help/ArtifactoryBuilder/help-useCredentialsPlugin.html">
<input id="useCredentialsPlugin" type="checkbox" onclick="updateViewForCredentialsMethod(this.checked)"
name="useCredentialsPlugin" value="${descriptor.useCredentialsPlugin}"
field="useCredentialsPlugin">Use the Credentials Plugin
</input>
<f:checkbox id="useCredentialsPlugin"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't strictly related but it's an accessibility bug I noticed while testing out the UI

onclick="updateViewForCredentialsMethod(this.checked)"
name="useCredentialsPlugin"
value="${descriptor.useCredentialsPlugin}"
field="useCredentialsPlugin"
title="${%Use the Credentials Plugin}"/>
</f:entry>
<f:entry title="Artifactory servers"
description="List of Artifactory servers that projects will want to deploy artifacts and build info to">


<f:repeatable name="artifactoryServer" var="server" items="${descriptor.artifactoryServers}"
header="Artifactory" add="${%Add Artifactory Server}">
<input type="hidden" name="stapler-class" value="org.jfrog.hudson.ArtifactoryServer"/>
Expand All @@ -31,50 +32,46 @@
</f:entry>

<f:advanced>
<f:entry>
<table style="width:100%">
<f:entry title="Connection Timeout" field="artifactory.timeout"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-timeout.html">
<f:textbox clazz="number" value="${server.timeout}"/>
</f:entry>
<f:entry field="connectionRetry" title="Number of retries"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-connectionRetry.html">
<select class="setting-input" name="connectionRetry">
<j:forEach var="r" items="${server.connectionRetries}">
<f:option selected="${r==server.connectionRetry}"
value="${r}">${r}
</f:option>
</j:forEach>
</select>
</f:entry>
<f:entry field="deploymentThreads" title="Number of threads for Generic uploads"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-deploymentThreads.html">
<select class="setting-input" name="deploymentThreads">
<j:forEach var="r" items="${server.deploymentsThreads}">
<f:option selected="${r==server.deploymentThreads}"
value="${r}">${r}
</f:option>
</j:forEach>
</select>
</f:entry>
<f:optionalBlock name="artifactory.bypassProxy" title="Bypass HTTP Proxy" checked="${server.bypassProxy}" inline="true"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-bypassproxy.html">
</f:optionalBlock>
</table>
<f:entry title="Connection Timeout" field="artifactory.timeout"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-timeout.html">
<f:textbox clazz="number" value="${server.timeout}"/>
</f:entry>
<f:entry field="connectionRetry" title="Number of retries"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-connectionRetry.html">
<select class="setting-input" name="connectionRetry">
<j:forEach var="r" items="${server.connectionRetries}">
<f:option selected="${r==server.connectionRetry}"
value="${r}">${r}
</f:option>
</j:forEach>
</select>
</f:entry>
<f:entry field="deploymentThreads" title="Number of threads for Generic uploads"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-deploymentThreads.html">
<select class="setting-input" name="deploymentThreads">
<j:forEach var="r" items="${server.deploymentsThreads}">
<f:option selected="${r==server.deploymentThreads}"
value="${r}">${r}
</f:option>
</j:forEach>
</select>
</f:entry>
<f:optionalBlock name="artifactory.bypassProxy" title="Bypass HTTP Proxy" checked="${server.bypassProxy}" inline="true"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-bypassproxy.html">
</f:optionalBlock>
</f:advanced>

<f:section title="Default Deployer Credentials" field="deployerCredentialsConfig"
name="deployerCredentialsConfig">
<f:block>
<input type="hidden" name="stapler-class" value="org.jfrog.hudson.CredentialsConfig"/>
<table style="width: 100%" id="deployerCredentialsId${server.url}">
<r:blockWrapper id="deployerCredentialsId${server.url}">
<f:entry title="${%Credentials}" name="credentialsId" field="credentialsId">
<c:select default="${server.deployerCredentialsConfig.credentialsId}"/>
</f:entry>
</table>
</r:blockWrapper>

<table style="width: 100%" id="legacyDeployerCredentials${server.url}">
<r:blockWrapper id="legacyDeployerCredentials${server.url}">
<f:entry title="Username"
help="/plugin/artifactory/help/common/help-deployerUserName.html">
<f:textbox name="username" field="username"
Expand All @@ -85,7 +82,7 @@
<f:password name="password" field="password"
value="${server.deployerCredentialsConfig.password}"/>
</f:entry>
</table>
</r:blockWrapper>
</f:block>
</f:section>
<f:validateButton
Expand All @@ -102,14 +99,14 @@
<input type="hidden" name="overridingCredentials" value="true"/>
<input type="hidden" name="stapler-class"
value="org.jfrog.hudson.CredentialsConfig"/>
<table style="width: 100%" id="resolverCredentialsId${server.url}">
<r:blockWrapper id="resolverCredentialsId${server.url}">
<f:entry title="${%Credentials}" field="credentialsId">
<c:select default="${server.resolverCredentialsConfig.credentialsId}"/>
</f:entry>
</table>
</r:blockWrapper>

<table style="width: 100%" id="legacyResolverCredentials${server.url}">
<f:entry title="Username"
<r:blockWrapper id="legacyResolverCredentials${server.url}">
<f:entry title="Username"
help="/plugin/artifactory/help/ArtifactoryBuilder/help-resolverUserName.html">
<f:textbox field="username"
value="${server.resolverCredentialsConfig.username}"/>
Expand All @@ -119,16 +116,16 @@
<f:password field="password"
value="${server.resolverCredentialsConfig.password}"/>
</f:entry>
</table>
</r:blockWrapper>
</f:nested>
</f:block>
</f:optionalBlock>

<f:entry title="">
<f:block>
<div align="right">
<f:repeatableDeleteButton/>
<f:repeatableDeleteButton />
</div>
</f:entry>
</f:block>

</table>
</f:repeatable>
Expand Down