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

(-)a/Koha/Manual.pm (-1 / +1 lines)
Lines 28-34 sub _get_base_url { Link Here
28
    } @available_languages;
28
    } @available_languages;
29
29
30
    my $KohaManualLanguage = $language || C4::Context->preference('KohaManualLanguage') || 'en';
30
    my $KohaManualLanguage = $language || C4::Context->preference('KohaManualLanguage') || 'en';
31
    my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'http://koha-community.org/manual';
31
    my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'https://koha-community.org/manual';
32
    if ( $KohaManualBaseURL =~ m|^/| ) {
32
    if ( $KohaManualBaseURL =~ m|^/| ) {
33
        $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL;
33
        $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL;
34
    }
34
    }
(-)a/installer/data/mysql/atomicupdate/bug_19817.sql (-1 / +1 lines)
Lines 1-5 Link Here
1
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
1
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
2
VALUES ('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free');
2
VALUES ('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free');
3
3
4
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
4
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
5
VALUES ('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice');
5
VALUES ('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice');
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 240-246 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
240
('itemBarcodeInputFilter','','whitespace|T-prefix|cuecat|libsuite8|EAN13','If set, allows specification of a item barcode input filter','Choice'),
240
('itemBarcodeInputFilter','','whitespace|T-prefix|cuecat|libsuite8|EAN13','If set, allows specification of a item barcode input filter','Choice'),
241
('itemcallnumber','082ab',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),
241
('itemcallnumber','082ab',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),
242
('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),
242
('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),
243
('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
243
('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
244
('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
244
('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
245
('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
245
('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
246
('language','en',NULL,'Set the default language in the staff client.','Languages'),
246
('language','en',NULL,'Set the default language in the staff client.','Languages'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref (-2 / +1 lines)
Lines 401-407 Enhanced Content: Link Here
401
        -
401
        -
402
            - Location of the Koha manual
402
            - Location of the Koha manual
403
            - pref: KohaManualBaseURL
403
            - pref: KohaManualBaseURL
404
            - You can specify the location of the Koha manual to use. By default it is http://koha-community.org/manual/
404
            - You can specify the location of the Koha manual to use. By default it is https://koha-community.org/manual/
405
            - If starts with '/',  the value of staffClientBaseURL will be used as a prefix.
405
            - If starts with '/',  the value of staffClientBaseURL will be used as a prefix.
406
            - Note that it will be suffixed by the version / the language / the format (/17.11/en/html)
406
            - Note that it will be suffixed by the version / the language / the format (/17.11/en/html)
407
        -
407
        -
408
- 

Return to bug 19817