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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss (+2 lines)
Lines 346-351 Link Here
346
@media only screen and ( max-width: 800px ) {
346
@media only screen and ( max-width: 800px ) {
347
    /* Screens below 800 pixels wide */
347
    /* Screens below 800 pixels wide */
348
    .cartlabel,
348
    .cartlabel,
349
    .cookieconsentlabel,
349
    .listslabel,
350
    .listslabel,
350
    .langlabel,
351
    .langlabel,
351
    .userlabel {
352
    .userlabel {
Lines 531-536 Link Here
531
532
532
@media only screen and ( max-width: 1100px ) {
533
@media only screen and ( max-width: 1100px ) {
533
    .cartlabel,
534
    .cartlabel,
535
    .cookieconsentlabel,
534
    .listslabel,
536
    .listslabel,
535
    .langlabel,
537
    .langlabel,
536
    .userlabel {
538
    .userlabel {
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+3 lines)
Lines 338-343 th { Link Here
338
}
338
}
339
339
340
#members {
340
#members {
341
    flex-grow: 1;
342
    justify-content: flex-end;
343
341
    p {
344
    p {
342
        color: #727272;
345
        color: #727272;
343
    }
346
    }
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-70 / +73 lines)
Lines 29-109 Link Here
29
                [% END %]
29
                [% END %]
30
            </a>
30
            </a>
31
            </div>
31
            </div>
32
            [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
32
            [% IF ( OpacPublic ) %]
33
                <div id="cartDetails" class="cart-message">Your cart is empty.</div>
34
            [% END %]
35
            <ul id="cart-list-nav" class="navbar-nav">
36
                [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
33
                [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
37
                    <li class="nav-item js-show">
34
                    <div id="cartDetails" class="cart-message">Your cart is empty.</div>
38
                        <a href="#" class="nav-link" title="Collect items you are interested in" id="cartmenulink" role="button">
39
                            <i id="carticon" class="fa fa-shopping-cart fa-icon-black" aria-hidden="true"></i> <span class="cartlabel">Cart</span> <span id="basketcount"></span>
40
                        </a>
41
                    </li>
42
                [% END %]
35
                [% END %]
43
                <li class="divider-vertical"></li>
36
                <ul id="cart-list-nav" class="navbar-nav">
44
                [% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
37
                    [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
45
                    <li class="nav-item dropdown">
38
                        <li class="nav-item js-show">
46
                        <a href="/cgi-bin/koha/opac-shelves.pl" title="Show lists" class="nav-link dropdown-toggle" id="listsmenu" data-toggle="dropdown" role="button" aria-label="Show dropdown with detailed list information" aria-haspopup="true" aria-expanded="false"
39
                            <a href="#" class="nav-link" title="Collect items you are interested in" id="cartmenulink" role="button">
47
                            ><i class="fa fa-list fa-icon-black" aria-hidden="true"></i> <span class="listslabel">Lists</span>
40
                                <i id="carticon" class="fa fa-shopping-cart fa-icon-black" aria-hidden="true"></i> <span class="cartlabel">Cart</span> <span id="basketcount"></span>
48
                        </a>
41
                            </a>
49
                        <div aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
42
                        </li>
50
                            [% IF some_public_shelves.count %]
43
                    [% END %]
51
                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem"><strong>Public lists</strong></a>
44
                    <li class="divider-vertical"></li>
52
                                [% SET number_of_public_shelves = 0 %]
45
                    [% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
53
                                [% FOREACH s IN some_public_shelves %]
46
                        <li class="nav-item dropdown">
54
                                    <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a>
47
                            <a href="/cgi-bin/koha/opac-shelves.pl" title="Show lists" class="nav-link dropdown-toggle" id="listsmenu" data-toggle="dropdown" role="button" aria-label="Show dropdown with detailed list information" aria-haspopup="true" aria-expanded="false"
55
                                    [% SET number_of_public_shelves = number_of_public_shelves + 1 %]
48
                                ><i class="fa fa-list fa-icon-black" aria-hidden="true"></i> <span class="listslabel">Lists</span>
56
                                    [% IF number_of_public_shelves >= 10 %][% LAST %][% END %]
49
                            </a>
50
                            <div aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
51
                                [% IF some_public_shelves.count %]
52
                                    <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem"><strong>Public lists</strong></a>
53
                                    [% SET number_of_public_shelves = 0 %]
54
                                    [% FOREACH s IN some_public_shelves %]
55
                                        <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a>
56
                                        [% SET number_of_public_shelves = number_of_public_shelves + 1 %]
57
                                        [% IF number_of_public_shelves >= 10 %][% LAST %][% END %]
58
                                    [% END %]
59
                                    [% IF some_public_shelves > 10 %]
60
                                        <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem">View all</a>
61
                                    [% END %]
57
                                [% END %]
62
                                [% END %]
58
                                [% IF some_public_shelves > 10 %]
63
                                [% IF some_public_shelves.count > 0 %]
59
                                    <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem">View all</a>
64
                                    <div class="dropdown-divider"></div>
60
                                [% END %]
65
                                [% END %]
61
                            [% END %]
66
                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
62
                            [% IF some_public_shelves.count > 0 %]
67
                                    <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem"><strong>Your lists</strong></a>
63
                                <div class="dropdown-divider"></div>
68
                                    [% IF loggedinusername %]
64
                            [% END %]
69
                                        [% IF some_private_shelves.count %]
65
                            [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
70
                                            [% SET number_of_private_shelves = 0 %]
66
                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem"><strong>Your lists</strong></a>
71
                                            [% FOREACH s IN some_private_shelves %]
67
                                [% IF loggedinusername %]
72
                                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a>
68
                                    [% IF some_private_shelves.count %]
73
                                                [% SET number_of_private_shelves = number_of_private_shelves + 1 %]
69
                                        [% SET number_of_private_shelves = 0 %]
74
                                                [% IF number_of_private_shelves >= 10 %][% LAST %][% END %]
70
                                        [% FOREACH s IN some_private_shelves %]
75
                                            [% END %]
71
                                            <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a>
76
                                            [% IF some_private_shelves > 10 %]
72
                                            [% SET number_of_private_shelves = number_of_private_shelves + 1 %]
77
                                                <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem">View all</a>
73
                                            [% IF number_of_private_shelves >= 10 %][% LAST %][% END %]
78
                                            [% END %]
74
                                        [% END %]
79
                                        [% ELSE %]
75
                                        [% IF some_private_shelves > 10 %]
80
                                            <a class="dropdown-item disabled" href="#" tabindex="-1" role="menuitem">No private lists</a>
76
                                            <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem">View all</a>
77
                                        [% END %]
81
                                        [% END %]
82
                                            <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=add_form" tabindex="-1" role="menuitem">New list</a>
78
                                    [% ELSE %]
83
                                    [% ELSE %]
79
                                        <a class="dropdown-item disabled" href="#" tabindex="-1" role="menuitem">No private lists</a>
84
                                        <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=add_form" tabindex="-1" role="menuitem">Log in to create your own lists</a>
80
                                    [% END %]
85
                                    [% END # / IF loggedinusername %]
81
                                        <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=add_form" tabindex="-1" role="menuitem">New list</a>
86
                                [% END # / IF opacuserlogin %]
82
                                [% ELSE %]
87
                            </div> <!-- / .dropdown-menu -->
83
                                    <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=add_form" tabindex="-1" role="menuitem">Log in to create your own lists</a>
88
                        </li> <!-- / .nav-item.dropdown -->
84
                                [% END # / IF loggedinusername %]
89
                    [% END # / IF virtualshelves %]
85
                            [% END # / IF opacuserlogin %]
90
                    [% IF Koha.Preference( 'OpacTrustedCheckout' ) %]
86
                        </div> <!-- / .dropdown-menu -->
91
                        <li class="nav-item">
87
                    </li> <!-- / .nav-item.dropdown -->
92
                            <a href="#" class="nav-link" title="Self check out" id="comenulink" role="button" data-toggle="modal" data-target="#checkoutModal">
88
                [% END # / IF virtualshelves %]
93
                                <i id="checkout-icon" class="fa fa-barcode fa-icon-black" aria-hidden="true"></i> <span class="checkout-label">Self checkout</span>
89
                [% IF Koha.Preference( 'OpacTrustedCheckout' ) %]
94
                            </a>
90
                    <li class="nav-item">
95
                        </li>
91
                        <a href="#" class="nav-link" title="Self check out" id="comenulink" role="button" data-toggle="modal" data-target="#checkoutModal">
96
                    [% END %]
92
                            <i id="checkout-icon" class="fa fa-barcode fa-icon-black" aria-hidden="true"></i> <span class="checkout-label">Self checkout</span>
93
                        </a>
94
                    </li>
95
                [% END %]
96
                <!-- Cookie consent button for non logged-in users -->
97
                [% IF !loggedinusername %]
98
                    <li style="display:none" id="cookieConsentDivider" class="divider-vertical" aria-hidden="true"></li>
99
                    <li style="display:none" id="cookieConsentLi" class="nav-item" aria-hidden="true">
100
                        <a id="cookieConsentButton" href="#" name="Your cookies" class="nav-link" title="View and amend cookies you have consented to" role="button">
101
                            <span class="cookieconsentlabel">Your cookies</span>
102
                        </a>
103
                    </li>
104
                [% END %]
105
            </ul> <!-- / .navbar-nav -->
106
97
98
                </ul> <!-- / .navbar-nav -->
99
            [% END # /IF OpacPublic %]
107
            [% IF Koha.Preference( 'opacuserlogin' ) == 1 ||  Koha.Preference( 'EnableOpacSearchHistory') || Koha.Preference( 'opaclanguagesdisplay' ) %]
100
            [% IF Koha.Preference( 'opacuserlogin' ) == 1 ||  Koha.Preference( 'EnableOpacSearchHistory') || Koha.Preference( 'opaclanguagesdisplay' ) %]
108
                [% IF ( Koha.Preference( 'opaclanguagesdisplay' ) ) %]
101
                [% IF ( Koha.Preference( 'opaclanguagesdisplay' ) ) %]
109
                    [% INCLUDE 'masthead-langmenu.inc' %]
102
                    [% INCLUDE 'masthead-langmenu.inc' %]
Lines 147-154 Link Here
147
                            </div>
140
                            </div>
148
                        [% END %]
141
                        [% END %]
149
                    </li>
142
                    </li>
150
                    [% IF ( !Koha.Preference( 'opacuserlogin') || !loggedinusername ) %]
143
                    <!-- Cookie consent button for non logged-in users -->
144
                    [% IF !loggedinusername %]
145
                        <li style="display:none" id="cookieConsentDivider" class="divider-vertical" aria-hidden="true"></li>
146
                        <li style="display:none" id="cookieConsentLi" class="nav-item" aria-hidden="true">
147
                            <a id="cookieConsentButton" href="#" name="Your cookies" class="nav-link" title="View and amend cookies you have consented to" role="button">
148
                                <i class="fa fa-cookie-bite" aria-hidden="true"></i>
149
                                <span class="cookieconsentlabel">Your cookies</span>
150
                            </a>
151
                        </li>
152
                    [% END %]
153
                    [% IF OpacPublic && ( !Koha.Preference( 'opacuserlogin') || !loggedinusername ) %]
151
                        [% IF Koha.Preference( 'EnableOpacSearchHistory' ) %]
154
                        [% IF Koha.Preference( 'EnableOpacSearchHistory' ) %]
155
                            <li class="divider-vertical"></li>
152
                            <li class="nav-item search_history">
156
                            <li class="nav-item search_history">
153
                                <a class="nav-link login-link" href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a>
157
                                <a class="nav-link login-link" href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a>
154
                            </li>
158
                            </li>
155
- 

Return to bug 33244