From 3238e2d9fcd532807847556514c0519fa0869b14 Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@mozilla.com>
Date: Wed, 4 Nov 2015 17:51:25 -0500
Subject: Bug 1177911 - Determine and implement better password requirements
 for BMO

---
 .../en/default/account/email/confirm-new.html.tmpl | 69 +++++++++++-----------
 1 file changed, 34 insertions(+), 35 deletions(-)

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

diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 3241030e8..f505268f5 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -21,8 +21,10 @@
 
 [% title = BLOCK %]Create a new user account for '[% email FILTER html %]'[% END %]
 [% PROCESS "global/header.html.tmpl"
-           title = title
-           onload = "document.forms['confirm_account_form'].realname.focus();" %]
+   title = title
+   style_urls      = ['skins/standard/admin.css']
+   javascript_urls = ['js/account.js']
+   onload = "document.forms['confirm_account_form'].realname.focus();" %]
 
 [% password_complexity = Param('password_complexity') %]
 
@@ -35,39 +37,36 @@
 <form id="confirm_account_form" method="post" action="token.cgi">
   <input type="hidden" name="t" value="[% token FILTER html %]">
   <input type="hidden" name="a" value="confirm_new_account">
-  <table>
-    <tr>
-      <th align="right">Email Address:</th>
-      <td>[% email FILTER html %]</td>
-    </tr>
-    <tr>
-      <th align="right"><small><i>(OPTIONAL)</i></small> <label for="realname">Real Name</label>:</th>
-      <td><input type="text" id="realname" name="realname" value=""></td>
-    </tr>
-    <tr>
-      <th align="right"><label for="passwd1">Type your password</label>:</th>
-      <td>
-        <input type="password" id="passwd1" name="passwd1" value="">
-        (Password should be a minimum of [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long
-        [% IF password_complexity == "mixed_letters" %]
-          and must contain at least one UPPER and one lowercase letter
-        [% ELSIF password_complexity == "letters_numbers" %]
-          and must contain at least one UPPER and one lowercase letter and a number
-        [% ELSIF password_complexity == "letters_numbers_specialchars" %]
-          and must contain at least one letter, a number and a special character
-        [% END ~%]
-        .)
-      </td>
-    </tr>
-    <tr>
-      <th align="right"><label for="passwd2">Confirm your password</label>:</th>
-      <td><input type="password" id="passwd2" name="passwd2" value=""></td>
-    </tr>
-    <tr>
-      <th align="right">&nbsp;</th>
-      <td><input type="submit" id="confirm" value="Create"></td>
-    </tr>
-  </table>
+  <div class="flex">
+    <div class="flex-left">
+      <table>
+        <tr>
+          <th align="right">Email Address:</th>
+          <td>[% email FILTER html %]</td>
+        </tr>
+        <tr>
+          <th align="right"><small><i>(OPTIONAL)</i></small> <label for="realname">Real Name</label>:</th>
+          <td><input type="text" id="realname" name="realname" value=""></td>
+        </tr>
+        <tr>
+          <th align="right"><label for="passwd1">Type your password</label>:</th>
+          <td>
+            <input type="password" id="passwd1" name="passwd1" value="" required>
+          </td>
+        </tr>
+        <tr>
+          <th align="right"><label for="passwd2">Confirm your password</label>:</th>
+          <td><input type="password" id="passwd2" name="passwd2" value="" required"></td>
+        </tr>
+        <tr>
+          <th align="right">&nbsp;</th>
+          <td><input type="submit" id="confirm" value="Create"></td>
+        </tr>
+      </table>
+    </div>
+
+    [% INCLUDE "global/password-features.html.tmpl" class="flex-right" password_page="confirm" %]
+  </div>
 </form>
 
 <p>
-- 
cgit v1.2.3-24-g4f1b