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

[JENKINS-68952] Wrong location of email form validation on setup wizard #6966

Merged
merged 4 commits into from
Sep 2, 2022
Merged

[JENKINS-68952] Wrong location of email form validation on setup wizard #6966

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4389418
[JENKINS-68952] Wrong location of email form validation on setup wizard
Langer0416 Aug 4, 2022
20db906
move the error messages below the input field
Langer0416 Aug 8, 2022
958d825
Merge branch 'master' into JENKINS-68952
basil Aug 25, 2022
97be26a
Merge branch 'master' into JENKINS-68952
basil Aug 26, 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
101 changes: 58 additions & 43 deletions core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,53 +45,68 @@ THE SOFTWARE.

<h1>${title}</h1>
<div class="form-content">
<j:if test="${data.errorMessage!=null}">
<div class="error">
${data.errorMessage}
</div>
</j:if>
<j:forEach var="error" items="${data.errors}">
<div class="error">
${error.value}
</div>
</j:forEach>
<table>
<tr>
<f:entry title="${%Username}:">
<input class="jenkins-input" type="text" name="username" id="username" value="${data.username}" autofocus="autofocus" />
</f:entry>
</tr>
<tr>
<f:entry title="${%Password}:">
<input class="jenkins-input" type="password" name="password1" value="${data.password1}" />
</f:entry>
</tr>
<table>
<tr>
<f:entry title="${%Username}:" class="${data.errors.containsKey('username') ? 'jenkins-!-margin-bottom-2' : ''}">
<input class="jenkins-input" type="text" name="username" id="username" value="${data.username}" autofocus="autofocus" />
</f:entry>
<j:if test="${data.errors.containsKey('username')}">
<div class="error jenkins-!-margin-bottom-2">
${data.errors.get('username')}
</div>
</j:if>
</tr>
<tr>
<f:entry title="${%Password}:" class="${data.errors.containsKey('password1') ? 'jenkins-!-margin-bottom-2' : ''}">
<input class="jenkins-input" type="password" name="password1" value="${data.password1}" />
</f:entry>
<j:if test="${data.errors.containsKey('password1')}">
<div class="error jenkins-!-margin-bottom-2">
${data.errors.get('password1')}
</div>
</j:if>
</tr>
<tr>
<f:entry title="${%Confirm password}:" class="${data.errors.containsKey('password1') ? 'jenkins-!-margin-bottom-2' : ''}">
<input class="jenkins-input" type="password" name="password2" value="${data.password2}" />
</f:entry>
<j:if test="${data.errors.containsKey('password1')}">
<div class="error jenkins-!-margin-bottom-2">
${data.errors.get('password1')}
</div>
</j:if>
</tr>
<tr>
<f:entry title="${%Full name}:" class="${data.errors.containsKey('fullname') ? 'jenkins-!-margin-bottom-2' : ''}">
<input class="jenkins-input" type="text" name="fullname" value="${data.fullname}" />
</f:entry>
<j:if test="${data.errors.containsKey('fullname')}">
<div class="error jenkins-!-margin-bottom-2">
${data.errors.get('fullname')}
</div>
</j:if>
</tr>
<j:if test="${it.mailerPluginPresent}">
<tr>
<f:entry title="${%Confirm password}:">
<input class="jenkins-input" type="password" name="password2" value="${data.password2}" />
<f:entry title="${%E-mail address}:" class="${data.errors.containsKey('email') ? 'jenkins-!-margin-bottom-2' : ''}">
<input class="jenkins-input" type="text" name="email" value="${data.email}" />
</f:entry>
<j:if test="${data.errors.containsKey('email')}">
<div class="error jenkins-!-margin-bottom-2">
${data.errors.get('email')}
</div>
</j:if>
</tr>
</j:if>
<j:if test="${captcha}">
<tr>
<f:entry title="${%Full name}:">
<input class="jenkins-input" type="text" name="fullname" value="${data.fullname}" />
</f:entry>
<td>${%Enter text as shown}:</td>
<td>
<input class="jenkins-input" type="text" name="captcha" autocomplete="off" /><br />
<img src="${rootURL}/securityRealm/captcha" alt="[${%captcha}]" />
</td>
</tr>
<j:if test="${it.mailerPluginPresent}">
<tr>
<f:entry title="${%E-mail address}:">
<input class="jenkins-input" type="text" name="email" value="${data.email}" />
</f:entry>
</tr>
</j:if>
<j:if test="${captcha}">
<tr>
<td>${%Enter text as shown}:</td>
<td>
<input class="jenkins-input" type="text" name="captcha" autocomplete="off" /><br />
<img src="${rootURL}/securityRealm/captcha" alt="[${%captcha}]" />
</td>
</tr>
</j:if>
</table>
</j:if>
</table>
</div>
</j:jelly>