From 64edd1e8659406d638ec44bf6bc2e69ff7e31ef0 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 19 Sep 2017 11:48:11 -0400
Subject: Bug 1400949 - Password requirements not stated

---
 template/en/default/account/email/confirm-new.html.tmpl             | 5 +++--
 .../en/default/account/password/set-forgotten-password.html.tmpl    | 5 ++++-
 template/en/default/account/prefs/account.html.tmpl                 | 6 ++++++
 template/en/default/account/reset-password.html.tmpl                | 4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'template/en/default/account')

diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index f505268f5..41c2b09a9 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -26,13 +26,14 @@
    javascript_urls = ['js/account.js']
    onload = "document.forms['confirm_account_form'].realname.focus();" %]
 
-[% password_complexity = Param('password_complexity') %]
-
 <p>
   To create your account, you must enter a password in the form below.
   Your email address and Real Name (if provided) will be shown with
   changes you make.
 </p>
+<p>
+  [% Param('passwdqc_desc') FILTER html_light %]
+</p>
 
 <form id="confirm_account_form" method="post" action="token.cgi">
   <input type="hidden" name="t" value="[% token FILTER html %]">
diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl
index 68119252e..b17bd510d 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -25,7 +25,10 @@
  %]
 
 <p>
-  To change your password, enter a new password twice:
+  To change your password, enter a new password twice.
+</p>
+<p>
+  [% Param('passwdqc_desc') FILTER html_light %]
 </p>
 
 <div class="flex">
diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl
index c41ea116f..1e7bc25db 100644
--- a/template/en/default/account/prefs/account.html.tmpl
+++ b/template/en/default/account/prefs/account.html.tmpl
@@ -70,6 +70,12 @@
           </td>
         </tr>
         [% IF user.authorizer.can_change_password %]
+          <tr>
+          <td>&nbsp;</td>
+          <td>
+            [% Param('passwdqc_desc') FILTER html_light %]
+          </td>
+          </tr>
           <tr>
             <th align="right">New password:</th>
             <td>
diff --git a/template/en/default/account/reset-password.html.tmpl b/template/en/default/account/reset-password.html.tmpl
index ec57f19dd..ca60c5772 100644
--- a/template/en/default/account/reset-password.html.tmpl
+++ b/template/en/default/account/reset-password.html.tmpl
@@ -75,6 +75,10 @@ $(function() {
   [% user.password_change_reason || "You are required to update your password." FILTER html %]
 </p>
 
+<p>
+  [% Param('passwdqc_desc') FILTER html_light %]
+</p>
+
 <form method="POST" action="reset_password.cgi">
 <input type="hidden" name="token" value="[% token FILTER html %]">
 <input type="hidden" name="do_save" value="1">
-- 
cgit v1.2.3-24-g4f1b