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

(-)a/C4/Auth.pm (+1 lines)
Lines 1247-1252 sub checkauth { Link Here
1247
        opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
1247
        opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
1248
    );
1248
    );
1249
1249
1250
    $template->param( SCO_login => 1 ) if ( $query->param('sco_user_login') );
1250
    $template->param( OpacPublic => C4::Context->preference("OpacPublic") );
1251
    $template->param( OpacPublic => C4::Context->preference("OpacPublic") );
1251
    $template->param( loginprompt => 1 ) unless $info{'nopermission'};
1252
    $template->param( loginprompt => 1 ) unless $info{'nopermission'};
1252
1253
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc (-1 / +8 lines)
Lines 51-57 Link Here
51
[% IF ( bidi ) %]
51
[% IF ( bidi ) %]
52
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />
52
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />
53
[% END %]
53
[% END %]
54
[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
54
[% IF SCO_login %]
55
    [% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %]
56
    [% IF SCOUserCSS %]
57
        <style type="text/css">[% SCOUserCSS %]</style>
58
    [% END %]
59
[% ELSE %]
60
    [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
61
[% END %]
55
<link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" />
62
<link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" />
56
[% PROCESS cssinclude %]
63
[% PROCESS cssinclude %]
57
<!-- Respond.js brings responsive layout behavior to IE < v.9 -->
64
<!-- Respond.js brings responsive layout behavior to IE < v.9 -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-7 / +17 lines)
Lines 266-278 $(document).ready(function() { Link Here
266
});
266
});
267
</script>
267
</script>
268
[% PROCESS jsinclude %]
268
[% PROCESS jsinclude %]
269
269
[% IF SCO_login %]
270
[% IF ( OPACUserJS ) %]
270
    [% SET SCOUserJS = Koha.Preference('SCOUserJS') %]
271
    <script type="text/javascript">
271
    [% IF ( SCOUserJS ) %]
272
        //<![CDATA[
272
        <script type="text/javascript">
273
        [% OPACUserJS %]
273
            //<![CDATA[
274
        //]]>
274
            [% SCOUserJS %]
275
    </script>
275
            //]]>
276
        </script>
277
    [% END %]
278
[% ELSE %]
279
    [% IF ( OPACUserJS ) %]
280
        <script type="text/javascript">
281
            //<![CDATA[
282
            [% OPACUserJS %]
283
            //]]>
284
        </script>
285
    [% END %]
276
[% END %]
286
[% END %]
277
</body>
287
</body>
278
</html>
288
</html>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-1 / +8 lines)
Lines 29-34 Link Here
29
                            <div class="alert">
29
                            <div class="alert">
30
                                <h3>Access denied</h3>
30
                                <h3>Access denied</h3>
31
                                <p>Sorry, the system doesn't think you have permission to access this page. </p>
31
                                <p>Sorry, the system doesn't think you have permission to access this page. </p>
32
                                [% IF SCO_login %]
33
                                    <p><a href="/cgi-bin/koha/sco/sco-main.pl?logout.x=1">Logout</a> and try again with a different user</p>
34
                                [% END %]
32
                            </div>
35
                            </div>
33
                        [% END %]
36
                        [% END %]
34
37
Lines 149-155 Link Here
149
                              <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
152
                              <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
150
                                [% END %]
153
                                [% END %]
151
154
152
                            <form action="/cgi-bin/koha/opac-user.pl" name="auth" id="auth" method="post">
155
                            [% IF SCO_login %]
156
                                <form action="/cgi-bin/koha/sco/sco-main.pl" name="auth" id="auth" method="post">
157
                            [% ELSE %]
158
                                <form action="/cgi-bin/koha/opac-user.pl" name="auth" id="auth" method="post">
159
                            [% END %]
153
                                <input type="hidden" name="koha_login_context" value="opac" />
160
                                <input type="hidden" name="koha_login_context" value="opac" />
154
                                <fieldset class="brief">
161
                                <fieldset class="brief">
155
                                    [% FOREACH INPUT IN INPUTS %]
162
                                    [% FOREACH INPUT IN INPUTS %]
(-)a/opac/sco/sco-main.pl (-1 / +1 lines)
Lines 64-69 if (C4::Context->preference('AutoSelfCheckAllowed')) Link Here
64
    $query->param(-name=>'password',-values=>[$AutoSelfCheckPass]);
64
    $query->param(-name=>'password',-values=>[$AutoSelfCheckPass]);
65
    $query->param(-name=>'koha_login_context',-values=>['sco']);
65
    $query->param(-name=>'koha_login_context',-values=>['sco']);
66
}
66
}
67
$query->param(-name=>'sco_user_login',-values=>[1]);
67
my ($template, $loggedinuser, $cookie) = get_template_and_user({
68
my ($template, $loggedinuser, $cookie) = get_template_and_user({
68
    template_name   => "sco/sco-main.tt",
69
    template_name   => "sco/sco-main.tt",
69
    authnotrequired => 0,
70
    authnotrequired => 0,
70
- 

Return to bug 12663