Merge branch 'finc' into instance/fid

themes/finc-accessibility/templates/Auth/AbstractBase/newpassword.phtml

@@ -8,9 +8,9 @@
 <?php endif; ?>
 <?php if (isset($this->verifyold) && $this->verifyold || isset($this->oldpwd)): ?>
   <div class="form-group">
-    <label class="control-label"><?=$this->transEsc('old_password') ?>:</label>
-    <input id="current-password" type="password" name="oldpwd" class="form-control" autocomplete="current-password"/>
-    <div class="help-block with-errors"></div>
+    <label for="current-password" class="control-label"><?=$this->transEsc('old_password') ?>:</label>
+    <input id="current-password" type="password" name="oldpwd" class="form-control" aria-describedby="current-password-error" autocomplete="current-password" required aria-required="true" />
+    <div id="current-password-error" class="help-block with-errors"></div>
   </div>
 <?php endif; ?>
 <?php
@@ -26,21 +26,22 @@
   }
 ?>
 <div class="form-group">
-  <label class="control-label"><?=$this->transEsc('new_password') ?>:</label>
+  <label for="password" class="control-label"><?=$this->transEsc('new_password') ?>:</label>
   <input type="password" id="password" name="password" class="form-control" required aria-required="true"
     <?=isset($this->passwordPolicy['minLength']) ? ' data-minlength="' . $this->passwordPolicy['minLength'] . '" data-minlength-error="' . $this->escapeHtmlAttr($this->translate('password_minimum_length', ['%%minlength%%' => $this->passwordPolicy['minLength']])) . '"' : ''  ?>
     <?=isset($this->passwordPolicy['maxLength']) ? ' maxlength="' . $this->passwordPolicy['maxLength'] . '"' : '' ?>
     <?=$pattern ? ' pattern="' . $pattern . '"' : '' ?>
     autocomplete="new-password"
+    aria-describedby="password-error"
   />
   <?php if ($this->passwordPolicy['hint']): ?>
     <div class="help-block"><?=$this->transEsc($this->passwordPolicy['hint']) ?></div>
   <?php endif; ?>
-  <div class="help-block with-errors"></div>
+  <div id="password-error" class="help-block with-errors"></div>
 </div>
 <div class="form-group">
-  <label class="control-label"><?=$this->transEsc('confirm_new_password') ?>:</label>
-  <input type="password" name="password2" class="form-control" required aria-required="true" data-match="#password" data-match-error="<?=$this->escapeHtmlAttr($this->translate('Passwords do not match'))?>" autocomplete="new-password"/>
-  <div class="help-block with-errors"></div>
+  <label for="password2" class="control-label"><?=$this->transEsc('confirm_new_password') ?>:</label>
+  <input id="password2" type="password" name="password2" class="form-control" required aria-required="true" data-match="#password" data-match-error="<?=$this->escapeHtmlAttr($this->translate('Passwords do not match'))?>" autocomplete="new-password" aria-describedby="password2-error"/>
+  <div id="password2-error" class="help-block with-errors"></div>
 </div>
 <!-- finc-accessibility: Auth - AbstractBase - newpassword - END -->
\ No newline at end of file