View | Details | Raw Unified | Return to bug 19660
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-41 / +3 lines)
Lines 510-523 Link Here
510
510
511
                            [% UNLESS hidden.defined('email') %]
511
                            [% UNLESS hidden.defined('email') %]
512
                                <li>
512
                                <li>
513
                                    [% IF mandatory.defined('email') %]
513
                                    <label for="borrower_email" class="required">Primary email:</label>
514
                                        <label for="borrower_email" class="required">Primary email:</label>
515
                                    [% ELSE %]
516
                                        <label for="borrower_email">Primary email:</label>
517
                                    [% END %]
518
519
                                    <input type="text" id="borrower_email" name="borrower_email" value="[% borrower.email %]" />
514
                                    <input type="text" id="borrower_email" name="borrower_email" value="[% borrower.email %]" />
520
                                    [% IF mandatory.defined('email') %]<span class="required">Required</span>[% END %]
515
                                    <span class="required">Required</span>
521
                                </li>
516
                                </li>
522
                            [% END %]
517
                            [% END %]
523
518
Lines 803-842 Link Here
803
                    </fieldset>
798
                    </fieldset>
804
                [% END %]
799
                [% END %]
805
800
806
                [% UNLESS action == 'edit' || hidden.defined('password') %]
807
                    <fieldset class="rows" id="memberentry_password">
808
                        <legend id="contact_legend">Password</legend>
809
                        <div class="alert alert-info">
810
                            <p>Your password must be at least [% Koha.Preference('minPasswordLength') %] characters long.</p>
811
                            [% UNLESS mandatory.defined('password') %]
812
                                <div>If you do not enter a password a system generated password will be created.</div>
813
                            [% END %]
814
                        </div>
815
816
                        [% IF mandatory.defined('password') %]
817
                            <ol>
818
                                <li><label for="borrower_password" class="required">Password</label>
819
                                    <input type="password" name="borrower_password" id="password" />
820
                                    <span class="required">Required</span>
821
                                </li>
822
                                <li><label for="borrower_password2" class="required">Confirm password</label>
823
                                    <input type="password" name="borrower_password2" id="password2" />
824
                                    <span class="required">Required</span>
825
                                </li>
826
                            </ol>
827
                        [% ELSE %]
828
                            <ol>
829
                                <li><label for="borrower_password">Password</label>
830
                                    <input type="password" name="borrower_password" id="password" />
831
                                </li>
832
                                <li><label for="borrower_password2">Confirm password</label>
833
                                    <input type="password" name="borrower_password2" id="password2" />
834
                                </li>
835
                            </ol>
836
                        [% END %]
837
                    </fieldset>
838
               [% END %]
839
840
                [% IF ( Koha.Preference('ExtendedPatronAttributes') && patron_attribute_classes.size && !Koha.Preference('PatronSelfRegistrationVerifyByEmail') ) %]
801
                [% IF ( Koha.Preference('ExtendedPatronAttributes') && patron_attribute_classes.size && !Koha.Preference('PatronSelfRegistrationVerifyByEmail') ) %]
841
                    [% FOREACH pa_class IN patron_attribute_classes %]
802
                    [% FOREACH pa_class IN patron_attribute_classes %]
842
                        [% IF pa_class.class %]
803
                        [% IF pa_class.class %]
Lines 893-898 Link Here
893
                [% END %]
854
                [% END %]
894
855
895
                [% UNLESS action == 'edit' %]
856
                [% UNLESS action == 'edit' %]
857
                <legend id="vertification_legend">Confirm:</legend>
896
                    <fieldset class="rows" id="memberentry_captcha">
858
                    <fieldset class="rows" id="memberentry_captcha">
897
                        <ol>
859
                        <ol>
898
860
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (-1 / +1 lines)
Lines 122-128 Link Here
122
                            <br/>Please click the link in this email to finish the process of resetting your password.
122
                            <br/>Please click the link in this email to finish the process of resetting your password.
123
                            <br/>This link is valid for 2 days starting now.
123
                            <br/>This link is valid for 2 days starting now.
124
                        </p>
124
                        </p>
125
                        <a href="/cgi-bin/koha/opac-main.pl"">Return to the main page</a>
125
                        <a href="/cgi-bin/koha/opac-main.pl">Return to the main page</a>
126
                    </div>
126
                    </div>
127
[% ELSIF (password_reset_done) %]
127
[% ELSIF (password_reset_done) %]
128
                    <div class="alert alert-success">
128
                    <div class="alert alert-success">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt (-14 / +95 lines)
Lines 40-49 Link Here
40
                                <span id="patron-userid-label">Username:</span>
40
                                <span id="patron-userid-label">Username:</span>
41
                                <span id="patron-userid">[% borrower.userid %]</span>
41
                                <span id="patron-userid">[% borrower.userid %]</span>
42
                            </p>
42
                            </p>
43
                            <p id="patron-password-p">
43
                           [% IF (hasError) %]
44
                                <span id="patron-password-label">Password:</span>
44
                                <div class="alert alert-warning">
45
                                <span id="patron-password">[% password_cleartext | html %]</span>
45
                                <h3>Error</h3>
46
                            </p>
46
                                <p>
47
                                   [% IF (sendmailError) %]
48
                                         An error has occurred while sending you the password recovery link.
49
                                         <br/>Please try again later.
50
                                    [% ELSIF (errNoBorrowerFound) %]
51
                                        No account was found with the provided information.
52
                                    [% ELSIF (errMultipleAccountsForEmail) %]
53
                                        Account identification with this email address only is ambiguous.
54
                                       <br />Please use the field 'Login' as well.
55
                                    [% ELSIF (errAlreadyStartRecovery) %]
56
                                        The process of changing passwords has already been started for this account
57
                                        [% IF username %]
58
                                          ("<strong>[% username %]</strong>")
59
                                       [% ELSIF email %]
60
                                            ("<strong>[% email %]</strong>")
61
                                        [% END %]
62
                                    <br/>You should have received an email with a link to reset your password.
63
                                    <br/>If you did not receive this email, you can request a new one: <a href="/cgi-bin/koha/opac-password-recovery.pl    ?resendEmail=true&email=[% email %]&username=[% username %]">Get new password link</a>
64
                                    [% ELSIF (errPassNotMatch) %]
65
                                        The passwords do not match.
66
                                     [% ELSIF password_too_short %]
67
                                        <li>Password must be at least [% minPasswordLength %] characters long.</li>
68
                                    [% ELSIF password_too_weak %]
69
                                        <li>Password must contain at least one digit, one lowercase and one uppercase.</li>
70
                                    [% ELSIF password_has_whitespaces %]
71
                                       <li>Password must not contain leading or trailing whitespaces.</li>
72
                                    [% ELSIF (errLinkNotValid) %]
73
                                         The link you clicked is either invalid, or expired.
74
                                         <br/>Be sure you used the link from the email, or contact library staff for assistance.
75
                                    [% END %]
76
                                    </p>
77
                                    <p>Please contact the library if you need further assistance.</p>
78
                                </div>
79
                                [% END %]
80
81
82
                                <div id="password-recovery">
83
                                    <form action="/cgi-bin/koha/opac-password-recovery.pl" method="post" autocomplete="off">
84
                                       <input type="hidden" name="koha_login_context" value="opac" />
85
                                       <fieldset>
86
                                            <p>You have been assigned a randomly generated password. To change your password, enter your email address.</p>
87
                                            <label for="email">Email:</label>
88
                                            <input type="text" id="email" size="40" name="email" value="[% email %]" />
89
                                            <fieldset class="action">
90
                                                  <input type="submit" value="Submit" class="btn" name="sendEmail" />
91
                                             </fieldset>
92
                                        </fieldset>
93
                                     </form>
94
                                    [% ELSIF (new_password) %]
95
                                        <form action="/cgi-bin/koha/opac-password-recovery.pl" method="post" autocomplete="off">
96
                                            <input type="hidden" name="koha_login_context" value="opac" />
97
                                            <fieldset>
98
                                                <div class="alert alert-info">The password must contain at least [% minPasswordLength %] characters.</div>
99
                                                <label for="password">New password:</label>
100
                                                 <input type="password" id="password" size="40" name="password" />
101
                                                <label for="repeatPassword">Confirm new password:</label>
102
                                                <input type="password" id="repeatPassword" size="40" name="repeatPassword" />
103
                                                 <fieldset class="action">
104
                                                    <input type="hidden" name="username" value="[% username %]" />
105
                                                    <input type="hidden" name="uniqueKey" value="[% uniqueKey %]" />
106
                                                    <input type="submit" value="Submit" class="btn" name="passwordReset" />
107
                                                  </fieldset>
108
                                            </fieldset>
109
                                        </form>
110
                                    [% ELSIF (mail_sent) %]
111
                                       <div class="alert alert-info">
112
                                           <p>
113
                                                You will receive an email shortly.
114
                                                <br/>Please click the link in this email to finish the process of resetting your password.
115
                                                <br/>This link is valid for 2 days starting now.
116
                                            </p>
117
                                            <a href="/cgi-bin/koha/opac-main.pl">Return to the main page</a>
118
                                        </div>
119
                                    [% ELSIF (password_reset_done) %]
120
                                        <div class="alert alert-success">
121
                                            <p>The password has been changed for user "[% username %]".</p>
122
                                            <a href="/cgi-bin/koha/opac-user.pl">Click here to login.</a>
123
                                        </div>
124
                                    [% END %]
125
                            </div><!-- / #password-recovery -->
126
47
127
48
                            [% IF borrower.cardnumber %]
128
                            [% IF borrower.cardnumber %]
49
                                <p id="patron-cardnumber-p">
129
                                <p id="patron-cardnumber-p">
Lines 53-59 Link Here
53
                            [% END %]
133
                            [% END %]
54
134
55
                            <p id="patron-instructions">For your convenience, the login box on this page has been pre-filled with this data. Please log in[% IF OpacPasswordChange %] and change your password[% END %].</p>
135
                            <p id="patron-instructions">For your convenience, the login box on this page has been pre-filled with this data. Please log in[% IF OpacPasswordChange %] and change your password[% END %].</p>
56
                        [% END %]
57
136
58
                        <div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions %]</div>
137
                        <div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions %]</div>
59
                    </div>
138
                    </div>
Lines 76-91 Link Here
76
                                                    [% ELSE %]
155
                                                    [% ELSE %]
77
                                                        <input type="text" id="userid" size="10" name="userid" value="" />
156
                                                        <input type="text" id="userid" size="10" name="userid" value="" />
78
                                                    [% END %]
157
                                                    [% END %]
79
                                                    <label for="password">Password:</label>
158
                                                    <p id="patron-password-p">
80
                                                    [% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]
159
                                                        <span id="patron-password-label">Password:</span>
81
                                                        <input type="password" id="password" size="10" name="password" value="[% password_cleartext | html %]" />
160
                                                        <span id="patron-password">[% password_cleartext | html %]</span>
82
                                                    [% ELSE %]
161
                                                    </p>
83
                                                        <input type="password" id="password" size="10" name="password" value="" />
162
84
                                                    [% END %]
163
                                                    <fieldset class="action">
85
                                                <fieldset class="action">
86
                                                    <input type="submit" value="Log in" class="btn" />
164
                                                    <input type="submit" value="Log in" class="btn" />
87
                                                </fieldset>
165
                                                </fieldset>
88
                                                [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="patronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
166
                                                [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
167
                                                    <div id="patronregistration">
168
                                                        <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
169
                                                    </div>
170
                                                [% END %]
89
                                                </fieldset>
171
                                                </fieldset>
90
                                            </form>
172
                                            </form>
91
                                        </div> <!-- /#login -->
173
                                        </div> <!-- /#login -->
92
- 

Return to bug 19660