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

(-)a/installer/data/mysql/atomicupdate/bug_20291_add_StaffLoginInstructions_preference.perl (+1 lines)
Lines 1-6 Link Here
1
$DBversion = 'XXX';  # will be replaced by the RM
1
$DBversion = 'XXX';  # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('StaffLoginInstructions','','HTML to go into the login box for the staff client',NULL,'Free')");
3
    $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('StaffLoginInstructions','','HTML to go into the login box for the staff client',NULL,'Free')");
4
    $dbh->do("UPDATE systempreferences SET variable = 'OpacLoginInstructions' WHERE variable = 'NoLoginInstructions'");
4
5
5
    # Always end with this (adjust the bug info)
6
    # Always end with this (adjust the bug info)
6
    SetVersion( $DBversion );
7
    SetVersion( $DBversion );
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 279-285 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
279
('noissuescharge','5','','Define maximum amount withstanding before check outs are blocked','Integer'),
279
('noissuescharge','5','','Define maximum amount withstanding before check outs are blocked','Integer'),
280
('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before check outs are blocked','Integer'),
280
('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before check outs are blocked','Integer'),
281
('noItemTypeImages','0',NULL,'If ON, disables item-type images','YesNo'),
281
('noItemTypeImages','0',NULL,'If ON, disables item-type images','YesNo'),
282
('NoLoginInstructions', '', '60|10', 'Instructions to display on the OPAC login form when a patron is not logged in', 'Textarea'),
283
('NorwegianPatronDBEnable','0',NULL,'Enable communication with the Norwegian national patron database.', 'YesNo'),
282
('NorwegianPatronDBEnable','0',NULL,'Enable communication with the Norwegian national patron database.', 'YesNo'),
284
('NorwegianPatronDBEndpoint','',NULL,'Which NL endpoint to use.', 'Free'),
283
('NorwegianPatronDBEndpoint','',NULL,'Which NL endpoint to use.', 'Free'),
285
('NorwegianPatronDBUsername','',NULL,'Username for communication with the Norwegian national patron database.','Free'),
284
('NorwegianPatronDBUsername','',NULL,'Username for communication with the Norwegian national patron database.','Free'),
Lines 353-358 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
353
('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'),
352
('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'),
354
('OpacLocationBranchToDisplay','holding','holding|home|both','In the OPAC, under location show which branch for Location in the record details.','Choice'),
353
('OpacLocationBranchToDisplay','holding','holding|home|both','In the OPAC, under location show which branch for Location in the record details.','Choice'),
355
('OpacLocationOnDetail','holding','holding|home|both|column','In the OPAC detail, display the shelving location on its own column or under a library columns.',  'Choice'),
354
('OpacLocationOnDetail','holding','holding|home|both|column','In the OPAC detail, display the shelving location on its own column or under a library columns.',  'Choice'),
355
('OpacLoginInstructions', '', '60|10', 'Instructions to display on the OPAC login form when a patron is not logged in', 'Textarea'),
356
('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'),
356
('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'),
357
('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea'),
357
('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea'),
358
('OpacMainUserBlock','Welcome to Koha...\r\n<hr>','70|10','A user-defined block of HTML  in the main content area of the opac main page','Textarea'),
358
('OpacMainUserBlock','Welcome to Koha...\r\n<hr>','70|10','A user-defined block of HTML  in the main content area of the opac main page','Textarea'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +1 lines)
Lines 329-335 OPAC: Link Here
329
            - items on the biblio detail page (if the biblio has more items than this, a link is displayed instead that allows the user to choose to display all items).
329
            - items on the biblio detail page (if the biblio has more items than this, a link is displayed instead that allows the user to choose to display all items).
330
        -
330
        -
331
            - "Show the following HTML on the OPAC login form when a patron is not logged in:"
331
            - "Show the following HTML on the OPAC login form when a patron is not logged in:"
332
            - pref: NoLoginInstructions
332
            - pref: OpacLoginInstructions
333
              type: htmlarea
333
              type: htmlarea
334
              class: code
334
              class: code
335
        -
335
        -
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-2 / +2 lines)
Lines 323-331 Link Here
323
                <fieldset class="brief">
323
                <fieldset class="brief">
324
                    <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
324
                    <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
325
                    <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
325
                    <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
326
                    [% IF Koha.Preference( 'NoLoginInstructions' ) %]
326
                    [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
327
                        <div id="nologininstructions-modal" class="nologininstructions">
327
                        <div id="nologininstructions-modal" class="nologininstructions">
328
                            [% Koha.Preference( 'NoLoginInstructions' ) %]
328
                            [% Koha.Preference( 'OpacLoginInstructions' ) %]
329
                        </div>
329
                        </div>
330
                    [% END %]
330
                    [% END %]
331
                    [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
331
                    [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-3 / +3 lines)
Lines 182-195 Link Here
182
                                </div>
182
                                </div>
183
                            [% END %]
183
                            [% END %]
184
                            <div id="nologininstructions">
184
                            <div id="nologininstructions">
185
                            [% IF Koha.Preference('NoLoginInstructions') %]
185
                            [% IF Koha.Preference('OpacLoginInstructions') %]
186
                                [% Koha.Preference('NoLoginInstructions') %]
186
                                [% Koha.Preference('OpacLoginInstructions') %]
187
                            [% ELSE %]
187
                            [% ELSE %]
188
                                <h5>Don't have a password yet?</h5>
188
                                <h5>Don't have a password yet?</h5>
189
                                <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
189
                                <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
190
                                <h5>Don't have a library card?</h5>
190
                                <h5>Don't have a library card?</h5>
191
                                <p>If you don't have a library card, stop by your local library to sign up.</p>
191
                                <p>If you don't have a library card, stop by your local library to sign up.</p>
192
                            [% END # / IF Koha.Preference('NoLoginInstructions') %]
192
                            [% END # / IF Koha.Preference('OpacLoginInstructions') %]
193
193
194
                            [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<span id="registrationinstructions"><a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a></span>
194
                            [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<span id="registrationinstructions"><a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a></span>
195
                            [% END %]
195
                            [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-3 / +2 lines)
Lines 119-127 Link Here
119
                                        <fieldset class="action">
119
                                        <fieldset class="action">
120
                                            <input type="submit" value="Log in" class="btn" />
120
                                            <input type="submit" value="Log in" class="btn" />
121
                                        </fieldset>
121
                                        </fieldset>
122
                                        [% IF Koha.Preference( 'NoLoginInstructions' ) %]
122
                                        [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
123
                                            <div id="nologininstructions-main" class="nologininstructions">
123
                                            <div id="nologininstructions-main" class="nologininstructions">
124
                                                [% Koha.Preference( 'NoLoginInstructions' ) %]
124
                                                [% Koha.Preference( 'OpacLoginInstructions' ) %]
125
                                            </div>
125
                                            </div>
126
                                        [% END %]
126
                                        [% END %]
127
                                        [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
127
                                        [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
128
- 

Return to bug 20291