merging branch updates for NIHVIVO-2992 and NIHVIVO-2995

This commit is contained in:
tworrall 2011-07-20 19:19:58 +00:00
parent 10d59d339e
commit c1d5f4aac3
2 changed files with 3 additions and 3 deletions

View file

@ -83,7 +83,7 @@
<label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
<input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
<p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
<p class="note" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.</p>
<label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
</div>

View file

@ -90,8 +90,8 @@
<label for="new-password">New password</label>
<input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
<p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
<p class="explanatoryText">Leaving this blank means that the password will not be changed.</p>
<p class="note" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.<br />
Leaving this blank means that the password will not be changed.</p>
<label for="confirm-password">Confirm new password</label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
</div>