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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-6 / +22 lines)
Lines 4619-4628 div .suggestion_note { Link Here
4619
4619
4620
/* Cookie consent bar */
4620
/* Cookie consent bar */
4621
#cookieConsentBar {
4621
#cookieConsentBar {
4622
    align-items: center;
4622
    background: rgba( 0, 0, 0, .7 );
4623
    background: rgba( 0, 0, 0, .7 );
4623
    bottom: 0;
4624
    bottom: 0;
4624
    color: rgba( 255, 255, 255, .9 );
4625
    color: rgba( 255, 255, 255, .9 );
4625
    display: none;
4626
    display: none;
4627
    flex-wrap: wrap;
4626
    left: 0;
4628
    left: 0;
4627
    padding: 20px;
4629
    padding: 20px;
4628
    position: fixed;
4630
    position: fixed;
Lines 4634-4649 div .suggestion_note { Link Here
4634
        color: #D7EBFF;
4636
        color: #D7EBFF;
4635
    }
4637
    }
4636
4638
4637
    #consentButtons {
4639
    button {
4638
        margin-top: 10px;
4640
        margin-bottom: .5rem;
4639
        text-align: right;
4641
        margin-top: .5rem;
4640
    }
4641
4642
4642
    button:not( :last-child ) {
4643
        &:not( :last-child ) {
4643
        margin-right: 10px;
4644
            margin-right: 10px;
4645
        }
4644
    }
4646
    }
4645
}
4647
}
4646
4648
4649
#consentButtons {
4650
    flex-grow: 1;
4651
    margin-top: 10px;
4652
    text-align: left;
4653
    white-space: normal;
4654
}
4655
4647
/* Cookie consent modal */
4656
/* Cookie consent modal */
4648
#cookieConsentModal {
4657
#cookieConsentModal {
4649
    .modal-dialog {
4658
    .modal-dialog {
Lines 4699-4704 div .suggestion_note { Link Here
4699
@import "toolbar";
4708
@import "toolbar";
4700
@import "forms";
4709
@import "forms";
4701
4710
4711
@media only screen and ( min-width: 608px ) {
4712
    #consentButtons {
4713
        text-align: right;
4714
        white-space: nowrap;
4715
    }
4716
}
4717
4702
@media ( max-width: 767px ) {
4718
@media ( max-width: 767px ) {
4703
    .header-menu-link {
4719
    .header-menu-link {
4704
        display: inline-block;
4720
        display: inline-block;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-2 / +2 lines)
Lines 86-92 Link Here
86
        <!-- Cookie consent bar -->
86
        <!-- Cookie consent bar -->
87
        <div id="cookieConsentBar" aria-hidden="true">
87
        <div id="cookieConsentBar" aria-hidden="true">
88
            [% IF ( CookieConsentBar && CookieConsentBar.content && CookieConsentBar.content.count >0 ) %]
88
            [% IF ( CookieConsentBar && CookieConsentBar.content && CookieConsentBar.content.count >0 ) %]
89
                <div id="cookieConsentBarText">
89
                <div id="cookieConsentBar_content">
90
                    [%- FOREACH item IN CookieConsentBar.content -%]
90
                    [%- FOREACH item IN CookieConsentBar.content -%]
91
                        [%- item.content | $raw -%]
91
                        [%- item.content | $raw -%]
92
                    [%- END -%]
92
                    [%- END -%]
Lines 97-103 Link Here
97
                    <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
97
                    <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
98
                [% END %]
98
                [% END %]
99
                <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
99
                <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
100
                <button type="button" class="btn btn-info" id="consentMoreInfo">More information</button>
100
                <button type="button" class="btn btn-default" id="consentMoreInfo">More information</button>
101
            </div>
101
            </div>
102
        </div> <!-- /#cookieConsentBar -->
102
        </div> <!-- /#cookieConsentBar -->
103
        <!-- Cookie consent modal -->
103
        <!-- Cookie consent modal -->
(-)a/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js (-1 / +1 lines)
Lines 40-46 Link Here
40
            consentBar.css('bottom', height);
40
            consentBar.css('bottom', height);
41
        };
41
        };
42
        consentBar.attr('aria-hidden', 'false');
42
        consentBar.attr('aria-hidden', 'false');
43
        consentBar.show();
43
        consentBar.css("display", "flex");
44
    }
44
    }
45
45
46
    function hideConsentBar() {
46
    function hideConsentBar() {
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss (+6 lines)
Lines 276-281 Link Here
276
                margin: 5px 0;
276
                margin: 5px 0;
277
            }
277
            }
278
        }
278
        }
279
280
    }
281
282
    #consentButtons {
283
        text-align: right;
284
        white-space: nowrap;
279
    }
285
    }
280
286
281
    #views {
287
    #views {
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (-7 / +15 lines)
Lines 2890-2899 $star-selected: #EDB867; Link Here
2890
2890
2891
/* Cookie consent bar */
2891
/* Cookie consent bar */
2892
#cookieConsentBar {
2892
#cookieConsentBar {
2893
    align-items: center;
2893
    background: rgba( 0, 0, 0, .7 );
2894
    background: rgba( 0, 0, 0, .7 );
2894
    bottom: 0;
2895
    bottom: 0;
2895
    color: rgba( 255, 255, 255, .9 );
2896
    color: rgba( 255, 255, 255, .9 );
2896
    display: none;
2897
    display: none;
2898
    flex-wrap: wrap;
2897
    left: 0;
2899
    left: 0;
2898
    padding: 20px;
2900
    padding: 20px;
2899
    position: fixed;
2901
    position: fixed;
Lines 2905-2920 $star-selected: #EDB867; Link Here
2905
        color: #C5ECFF;
2907
        color: #C5ECFF;
2906
    }
2908
    }
2907
2909
2908
    #consentButtons {
2910
    button {
2909
        margin-top: 10px;
2911
        margin-bottom: .5rem;
2910
        text-align: right;
2912
        margin-top: .5rem;
2911
    }
2912
2913
2913
    button:not( :last-child ) {
2914
        &:not( :last-child ) {
2914
        margin-right: 10px;
2915
            margin-right: 10px;
2916
        }
2915
    }
2917
    }
2916
}
2918
}
2917
2919
2920
#consentButtons {
2921
    flex-grow: 1;
2922
    margin-top: 10px;
2923
    text-align: left;
2924
    white-space: normal;
2925
}
2926
2918
/* Cookie consent modal */
2927
/* Cookie consent modal */
2919
#cookieConsentModal {
2928
#cookieConsentModal {
2920
    .modal-dialog {
2929
    .modal-dialog {
Lines 2922-2928 $star-selected: #EDB867; Link Here
2922
    }
2931
    }
2923
2932
2924
    .consentModalItem {
2933
    .consentModalItem {
2925
        align-items: center;
2926
        border: 1px solid #CCC;
2934
        border: 1px solid #CCC;
2927
        border-radius: 5px;
2935
        border-radius: 5px;
2928
        display: flex;
2936
        display: flex;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +3 lines)
Lines 464-470 Link Here
464
            <!-- Cookie consent bar -->
464
            <!-- Cookie consent bar -->
465
            <div id="cookieConsentBar" aria-hidden="true">
465
            <div id="cookieConsentBar" aria-hidden="true">
466
                [% IF ( CookieConsentBar ) %]
466
                [% IF ( CookieConsentBar ) %]
467
                    [% PROCESS koha_news_block news => CookieConsentBar %]
467
                    <div id="cookieConsentBar_content">
468
                        [% PROCESS koha_news_block news => CookieConsentBar %]
469
                    </div>
468
                [% END %]
470
                [% END %]
469
                <div id="consentButtons">
471
                <div id="consentButtons">
470
                    [% IF ( JSConsents.all('opacConsent').size ) %]
472
                    [% IF ( JSConsents.all('opacConsent').size ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js (-7 / +15 lines)
Lines 27-32 Link Here
27
        initialiseSelected();
27
        initialiseSelected();
28
    });
28
    });
29
29
30
    $(window).on("scroll", function() {
31
        const consentBar = $("#cookieConsentBar");
32
        const langmenu = $("#changelanguage");
33
        const wrapper = $("#wrapper");
34
        if( langmenu ) {
35
            const height = langmenu.height();
36
            if( $(window).scrollTop() >= wrapper.offset().top + wrapper.outerHeight() - window.innerHeight ) {
37
                consentBar.css("bottom", height);
38
            } else {
39
                consentBar.css("bottom", 0);
40
            }
41
        };
42
    });
43
30
    // Initialise existing consent based on local storage
44
    // Initialise existing consent based on local storage
31
    function getExistingConsent() {
45
    function getExistingConsent() {
32
        existingConsent = localStorage.getItem('cookieConsent') ?
46
        existingConsent = localStorage.getItem('cookieConsent') ?
Lines 36-48 Link Here
36
50
37
    function showConsentBar() {
51
    function showConsentBar() {
38
        const consentBar = $('#cookieConsentBar');
52
        const consentBar = $('#cookieConsentBar');
39
        const langmenu = $('#changelanguage');
40
        if(langmenu) {
41
            const height = langmenu.height();
42
            consentBar.css('bottom', height);
43
        };
44
        consentBar.attr('aria-hidden', 'false');
53
        consentBar.attr('aria-hidden', 'false');
45
        consentBar.show();
54
        consentBar.css("display", "flex");
46
    }
55
    }
47
56
48
    function hideConsentBar() {
57
    function hideConsentBar() {
49
- 

Return to bug 34792