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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-21 / +24 lines)
Lines 66-103 Link Here
66
                        [% END # / IF virtualshelves %]
66
                        [% END # / IF virtualshelves %]
67
                    </ul> <!-- / .nav -->
67
                    </ul> <!-- / .nav -->
68
                    [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %]
68
                    [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %]
69
                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
69
                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 || EnableOpacSearchHistory %]
70
                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
70
                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
71
                        <div id="members">
71
                        <div id="members">
72
                            <ul class="nav pull-right">
72
                            <ul class="nav pull-right">
73
                                [% UNLESS ( loggedinusername ) %]
73
                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
74
                                    [% IF Koha.Preference('casAuthentication') %]
74
                                    [% UNLESS ( loggedinusername ) %]
75
                                        [%# CAS authentication is too complicated for modal window %]
75
                                        [% IF Koha.Preference('casAuthentication') %]
76
                                        <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
76
                                            [%# CAS authentication is too complicated for modal window %]
77
                                    [% ELSE %]
77
                                            <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
78
                                        <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
78
                                        [% ELSE %]
79
                                            <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
80
                                        [% END %]
81
                                    [% END %]
82
                                    [% IF ( loggedinusername ) %]
83
                                        <li><p class="members navbar-text">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></p></li>
84
                                        <li class="divider-vertical"></li>
79
                                    [% END %]
85
                                    [% END %]
80
                                [% END %]
81
                                [% IF ( loggedinusername ) %]
82
                                    <li><p class="members navbar-text">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></p></li>
83
                                    <li class="divider-vertical"></li>
84
                                [% END %]
86
                                [% END %]
85
                                [% IF EnableOpacSearchHistory %]
87
                                [% IF EnableOpacSearchHistory %]
86
                                    <li><p class="navbar-text"><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="return confirm(MSG_DELETE_SEARCH_HISTORY);">x</a>]</p></li>
88
                                    <li><p class="navbar-text"><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="return confirm(MSG_DELETE_SEARCH_HISTORY);">x</a>]</p></li>
87
                                    <li class="divider-vertical"></li>
89
                                    <li class="divider-vertical"></li>
88
                                [% END %]
90
                                [% END %]
89
                                [% IF ( loggedinusername ) %]
91
                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
90
                                    <li><p class="navbar-text">
92
                                    [% IF ( loggedinusername ) %]
91
                                        [% IF persona %]
93
                                        <li><p class="navbar-text">
92
                                            <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'>
94
                                            [% IF persona %]
93
                                        [% ELSE %]
95
                                                <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'>
94
                                            <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
96
                                            [% ELSE %]
95
                                        [% END %]
97
                                                <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
96
                                        Log out</a></p></li>
98
                                            [% END %]
99
                                            Log out</a></p></li>
100
                                    [% END %]
97
                                [% END %]
101
                                [% END %]
98
                            </ul>
102
                            </ul>
99
                        </div> <!-- /members -->
103
                        </div> <!-- /members -->
100
                    [% END %]
104
                    [% END # IF opacuserlogin %]
101
                </div> <!-- /container-fluid -->
105
                </div> <!-- /container-fluid -->
102
            </div> <!-- /navbar-inner -->
106
            </div> <!-- /navbar-inner -->
103
        </div> <!-- /navbar -->
107
        </div> <!-- /navbar -->
104
- 

Return to bug 12485