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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 521-526 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
521
('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),
521
('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),
522
('ShelfBrowserUsesHomeBranch','1','1','Use the item home branch when finding items for the shelf browser.','YesNo'),
522
('ShelfBrowserUsesHomeBranch','1','1','Use the item home branch when finding items for the shelf browser.','YesNo'),
523
('ShelfBrowserUsesLocation','1','1','Use the item location when finding items for the shelf browser.','YesNo'),
523
('ShelfBrowserUsesLocation','1','1','Use the item location when finding items for the shelf browser.','YesNo'),
524
('shibbolethName','',NULL,'Specify the name for Shibboleth accounts, "Shibboleth" will be used if blank','Free'),
524
('ShowAllCheckins', '0', '', 'Show all checkins', 'YesNo'),
525
('ShowAllCheckins', '0', '', 'Show all checkins', 'YesNo'),
525
('showLastPatron','0','','If ON, enables the last patron feature in the intranet','YesNo'),
526
('showLastPatron','0','','If ON, enables the last patron feature in the intranet','YesNo'),
526
('ShowPatronImageInWebBasedSelfCheck','0','','If ON, displays patron image when a patron uses web-based self-checkout','YesNo'),
527
('ShowPatronImageInWebBasedSelfCheck','0','','If ON, displays patron image when a patron uses web-based self-checkout','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (+4 lines)
Lines 111-116 Administration: Link Here
111
              choices:
111
              choices:
112
                  yes: "Yes"
112
                  yes: "Yes"
113
                  no: "No"
113
                  no: "No"
114
        -
115
            - Refer to Shibboleth accounts as
116
            - pref: shibbolethName
117
            - "accounts. 'Shibboleth' will be used if left blank."
114
    CAS authentication:
118
    CAS authentication:
115
        -
119
        -
116
            - "Use CAS for login authentication: "
120
            - "Use CAS for login authentication: "
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-2 / +3 lines)
Lines 2-7 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% SET shibbolethName = Koha.Preference('shibbolethName') || 'Shibboleth' | html %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; 
7
<title>Koha &rsaquo; 
7
    [% IF ( nopermission ) %]Access denied[% END %]
8
    [% IF ( nopermission ) %]Access denied[% END %]
Lines 52-60 Link Here
52
[% IF (shibbolethAuthentication) %]
53
[% IF (shibbolethAuthentication) %]
53
<!-- This is what is displayed if shib login has failed -->
54
<!-- This is what is displayed if shib login has failed -->
54
[% IF (invalidShibLogin ) %]
55
[% IF (invalidShibLogin ) %]
55
<div id="login_error"><Strong>Error: </strong>Shibboleth login failed</div>
56
<div id="login_error"><Strong>Error: </strong>[% shibbolethName %] login failed</div>
56
[% END %]
57
[% END %]
57
<p>If you have a shibboleth account, please <a href="[% shibbolethLoginUrl | url %]">click here</a> to login.</p>
58
<p>To use your [% shibbolethName %] account, please <a href="[% shibbolethLoginUrl | url %]">click here</a> to login.</p>
58
[% END %]
59
[% END %]
59
60
60
<!-- login prompt time-->
61
<!-- login prompt time-->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-3 / +4 lines)
Lines 2-7 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
4
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
5
[% SET shibbolethName = Koha.Preference('shibbolethName') || 'Shibboleth' | html %]
5
<div id="wrap">
6
<div id="wrap">
6
    <div id="header-region" class="noprint">
7
    <div id="header-region" class="noprint">
7
        <div class="navbar navbar-inverse navbar-static-top">
8
        <div class="navbar navbar-inverse navbar-static-top">
Lines 307-317 Link Here
307
                    [% IF ( invalidShibLogin ) %]
308
                    [% IF ( invalidShibLogin ) %]
308
                        <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
309
                        <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
309
                        <div class="alert alert-info">
310
                        <div class="alert alert-info">
310
                            <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
311
                            <p>Sorry, your [% shibbolethName %] identity does not match a valid library identity. If you have a local login, you may use that below.</p>
311
                        </div>
312
                        </div>
312
                    [% ELSE %]
313
                    [% ELSE %]
313
                        <h4>Shibboleth login</h4>
314
                        <h4>[% shibbolethName %] login</h4>
314
                        <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | url %]">click here to login</a>.</p>
315
                        <p>To use your [% shibbolethName %] account, please <a href="[% shibbolethLoginUrl | url %]">click here to login</a>.</p>
315
                        <h4>Local Login</h4>
316
                        <h4>Local Login</h4>
316
                    [% END %]
317
                    [% END %]
317
                [% END %]
318
                [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-6 / +6 lines)
Lines 1-5 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% SET shibbolethName = Koha.Preference('shibbolethName') || 'Shibboleth' | html %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;
5
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;
5
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
6
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
Lines 68-74 Link Here
68
                                [% IF ( invalidShibLogin ) %]
69
                                [% IF ( invalidShibLogin ) %]
69
                                    <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
70
                                    <!-- This is what is displayed if shibboleth login has failed to match a koha user -->
70
                                    <div class="alert alert-info">
71
                                    <div class="alert alert-info">
71
                                    <p>Sorry, your Shibboleth identity does not match a valid library identity.</p>
72
                                    <p>Sorry, your [% shibbolethName %] identity does not match a valid library identity.</p>
72
                                    [% IF ( casAuthentication ) %]
73
                                    [% IF ( casAuthentication ) %]
73
                                        [% IF ( invalidCasLogin ) %]
74
                                        [% IF ( invalidCasLogin ) %]
74
                                            <!-- This is what is displayed if cas login has failed -->
75
                                            <!-- This is what is displayed if cas login has failed -->
Lines 81-95 Link Here
81
                                    [% END %]
82
                                    [% END %]
82
                                    </div>
83
                                    </div>
83
                            [% ELSE %]
84
                            [% ELSE %]
84
                                <h4>Shibboleth Login</h4>
85
                                <h4>[% shibbolethName %] Login</h4>
85
                                <p><a href="[% shibbolethLoginUrl | url %]">If you have a Shibboleth account, please click here to log in.</a></p>
86
                                <p><a href="[% shibbolethLoginUrl | url %]">To use your [% shibbolethName %] account, please click here to log in.</a></p>
86
                            [% END %]
87
                            [% END %]
87
                            [% IF ( casAuthentication ) %]
88
                            [% IF ( casAuthentication ) %]
88
                                <h4>CAS login</h4>
89
                                <h4>CAS login</h4>
89
                                <p>If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.</p>
90
                                <p>If you do not have a [% shibbolethName %] account, but you do have a CAS account, you can use CAS.</p>
90
                            [% ELSE %]
91
                            [% ELSE %]
91
                                <h4>Local login</h4>
92
                                <h4>Local login</h4>
92
                                <p>If you do not have a Shibboleth account, but you do have a local login, then you may login below.</p>
93
                                <p>If you do not have a [% shibbolethName %] account, but you do have a local login, then you may login below.</p>
93
                            [% END %]
94
                            [% END %]
94
95
95
                        [% END %]
96
                        [% END %]
96
- 

Return to bug 21934