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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-2 / +25 lines)
Lines 92-98 Link Here
92
                                            [%# CAS authentication is too complicated for modal window %]
92
                                            [%# CAS authentication is too complicated for modal window %]
93
                                            <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
93
                                            <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
94
                                        [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
94
                                        [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
95
                                            <li><a href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal">Log in to your account</a></li>
95
                                            <li><a href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button">Log in to your account</a></li>
96
                                        [% ELSE %]
96
                                        [% ELSE %]
97
                                            <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
97
                                            <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
98
                                        [% END %]
98
                                        [% END %]
Lines 109-116 Link Here
109
                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
109
                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
110
                                    [% IF ( loggedinusername ) %]
110
                                    [% IF ( loggedinusername ) %]
111
                                        <li><p class="navbar-text">
111
                                        <li><p class="navbar-text">
112
                                        [% IF Koha.Preference('GoogleOpenIDConnect') == 1 %]
113
                                            <a class="logout logoutOAuthModal-trigger" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
114
                                        [% ELSE %]
112
                                            <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
115
                                            <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
113
                                            Log out</a></p></li>
116
                                        [% END %]
117
                                        Log out</a></p></li>
114
                                    [% END %]
118
                                    [% END %]
115
                                [% END %]
119
                                [% END %]
116
                            </ul>
120
                            </ul>
Lines 337-339 Link Here
337
            </div>
341
            </div>
338
        </form> <!-- /#auth -->
342
        </form> <!-- /#auth -->
339
    </div>  <!-- /#modalAuth  -->
343
    </div>  <!-- /#modalAuth  -->
344
345
    <!-- Google OAuth Logout form hidden by default, used for modal window -->
346
    <div id="logoutOAuthModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="modalLogoutLabel" aria-hidden="true">
347
        <div class="modal-header">
348
            <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
349
            <h3 id="modalLogoutLabel">Log out from your account</h3>
350
        </div>
351
        <div class="modal-body">
352
            <p>There are two ways to log out. If you have other Google tabs or
353
               windows open, logging out of Koha and Google may affect them.
354
               In this case, choose the Koha only log out option.  If you only
355
               have this OPAC open, then choosing Koha and Google is the more
356
               secure choice.<p>
357
            <a class="btn btn-primary" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Koha only</a>
358
            <a class="btn btn-primary"
359
href="https://www.google.com/accounts/Logout?continue=https://appengine.google.com/_ah/logout?continue=[% Koha.Preference('OPACBaseURL') %]/cgi-bin/koha/opac-main.pl?logout.x=1"
360
            >Koha and Google</a>
361
        </div>
362
    </div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/script.js (-2 / +5 lines)
Lines 58-66 $(document).ready(function(){ Link Here
58
        $("#loginModal").modal("show");
58
        $("#loginModal").modal("show");
59
        $("#members").removeAttr("style");
59
        $("#members").removeAttr("style");
60
    });
60
    });
61
    $(".logoutOAuthModal-trigger").on("click",function(e){
62
        e.preventDefault();
63
        $("#logoutOAuthModal").modal("show");
64
    });
61
    $("#loginModal").on("hide",function(){
65
    $("#loginModal").on("hide",function(){
62
        if($("#user-menu-trigger").is(":hidden")){
66
        if($("#user-menu-trigger").is(":hidden")){
63
            $("#members").removeAttr("style");
67
            $("#members").removeAttr("style");
64
        }
68
        }
65
    });
69
    });
66
});
70
});
67
- 

Return to bug 18549