Skip to content

Commit c13fb0b

Browse files
committed
Merge pull request #149 from clash82/cookies
EZP-24150: Implement privacy cookie law in demo bundle
2 parents 4676aca + fdad1ee commit c13fb0b

4 files changed

+6
-1
lines changed

Resources/views/page_footer.html.twig

+2
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020
</div>
2121
</div>
2222
</footer>
23+
24+
{{ show_privacy_cookie_banner() }}

Resources/views/page_head_script.html.twig

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ var YUI3_config = {base: "{{ asset( 'bundles/ezplatformuiassets/vendors/yui3/bui
1818
'@eZDemoBundle/Resources/public/js/toggle_class.js'
1919
'@eZDemoBundle/Resources/public/js/video.js'
2020
'@eZDemoBundle/Resources/public/js/hinclude.js'
21+
'bundles/ezsystemsprivacycookie/js/privacycookie.js'
2122
%}
2223
<script type="text/javascript" src="{{ asset_url }}"></script>
2324
{% endjavascripts %}

Resources/views/page_head_style.html.twig

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
'bundles/ezdemo/css/video.css'
33
'bundles/ezdemo/css/bootstrap.css'
44
'bundles/ezplatformuiassets/vendors/flag-icon-css/css/flag-icon.min.css'
5+
'bundles/ezsystemsprivacycookie/css/privacycookie.css'
56
%}
67
<link rel="stylesheet" type="text/css" href="{{ asset_url }}"/>
78
{% endstylesheets %}

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"knplabs/knp-menu-bundle": "1.*",
1919
"zetacomponents/feed": "~1.4",
2020
"ezsystems/demobundle-data": "~0.1",
21-
"components/bootstrap": "3.3.2"
21+
"components/bootstrap": "3.3.2",
22+
"ezsystems/privacy-cookie-bundle": "~0.1"
2223
},
2324
"autoload": {
2425
"psr-0": {"EzSystems\\DemoBundle": ""}

0 commit comments

Comments
 (0)