Bug 21476: Fix HTML5 media from playing in the OPAC - incorrect filters

[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-passwd.tt

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index baa083b..264f1e9 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -1,6 +1,8 @@
+[% USE raw %]
+[% USE Asset %]
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Change your password</title>
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Change your password</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %][% END %]
 </head>
@@ -10,7 +12,7 @@
 <div class="main">
     <ul class="breadcrumb">
         <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
-        <li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">&rsaquo;</span></li>
+        <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
         <li><a href="#">Change your password</a></li>
     </ul>
 
@@ -29,18 +31,22 @@
                         <div class="alert">
                             <h3>There was a problem with your submission</h3>
                             <p>
-                                [% IF ( PassMismatch ) %]
+                                [% IF ( passwords_mismatch ) %]
                                 Passwords do not match.  Please re-type your new password.
                                 [% END %]
-                                [% IF ( ShortPass ) %]
-                                Your new password must be at least [% minpasslen %] characters long.
+                                [% IF password_too_short %]
+                                    Password must be at least [% minPasswordLength | html %] characters long.
                                 [% END %]
+                                [% IF password_too_weak %]
+                                    Password must contain at least one digit, one lowercase and one uppercase.
+                                [% END %]
+                                [% IF password_has_whitespaces %]
+                                    Password must not contain leading or trailing whitespaces.
+                                [% END %]
+
                                 [% IF ( WrongPass ) %]
                                 Your current password was entered incorrectly.  If this problem persists, please ask a librarian to reset your password for you.
                                 [% END %]
-                                [% IF PasswordContainsTrailingSpaces %]
-                                    Your password contains leading and/or trailing spaces.
-                                [% END %]
                             </p>
                         </div>
                     [% END # /IF Error_messages %]
@@ -48,9 +54,9 @@
                     [% IF ( OpacPasswordChange ) %]
                         [% IF ( Ask_data ) %]
 
-                            <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="post">
+                            <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="post" autocomplete="off">
                                 <fieldset>
-                                    [% UNLESS ( ShortPass ) %]<div class="alert alert-info">Your password must be at least [% minpasslen %] characters long.</div>[% END %]
+                                    [% UNLESS ( ShortPass ) %]<div class="alert alert-info">Your password must be at least [% minPasswordLength | html %] characters long.</div>[% END %]
                                     <label for="Oldkey">Current password:</label> <input type="password" id="Oldkey" size="25"  name="Oldkey" />
                                     <label for="Newkey">New password:</label> <input type="password" id="Newkey"  size="25"  name="Newkey" />
                                     <label for="Confirm">Re-type new password:</label> <input type="password"  id="Confirm" size="25" name="Confirm" />
@@ -67,8 +73,8 @@
                             <h1>Password updated</h1>
                             Your password has been changed
                         </div>
-                        <form action="/cgi-bin/koha/opac-user.pl" method="post">
-                            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+                        <form action="/cgi-bin/koha/opac-user.pl" method="post" autocomplete="off">
+                            <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
                             <p><input type="submit" class="btn" value="Return to your record" /></p>
                         </form>
                     [% END # /IF password_updated %]
@@ -82,10 +88,10 @@
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-    <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.validate.min.js"></script>
+    [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
     [% PROCESS 'password_check.inc' %]
     [% PROCESS 'add_password_check' new_password => 'Newkey' %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $("#mainform").validate({
                 rules: {