Skip to content

Commit

Permalink
Merge pull request #149 from clash82/cookies
Browse files Browse the repository at this point in the history 
EZP-24150: Implement privacy cookie law in demo bundle
  • Loading branch information
@andrerom
andrerom committed Apr 17, 2015
2 parents 4676aca + fdad1ee commit c13fb0b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Resources/views/page_footer.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@
</div>
</div>
</footer>

{{ show_privacy_cookie_banner() }}
1 change: 1 addition & 0 deletions Resources/views/page_head_script.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var YUI3_config = {base: "{{ asset( 'bundles/ezplatformuiassets/vendors/yui3/bui
'@eZDemoBundle/Resources/public/js/toggle_class.js'
'@eZDemoBundle/Resources/public/js/video.js'
'@eZDemoBundle/Resources/public/js/hinclude.js'
'bundles/ezsystemsprivacycookie/js/privacycookie.js'
%}
<script type="text/javascript" src="{{ asset_url }}"></script>
{% endjavascripts %}
1 change: 1 addition & 0 deletions Resources/views/page_head_style.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
'bundles/ezdemo/css/video.css'
'bundles/ezdemo/css/bootstrap.css'
'bundles/ezplatformuiassets/vendors/flag-icon-css/css/flag-icon.min.css'
'bundles/ezsystemsprivacycookie/css/privacycookie.css'
%}
<link rel="stylesheet" type="text/css" href="{{ asset_url }}"/>
{% endstylesheets %}
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"knplabs/knp-menu-bundle": "1.*",
"zetacomponents/feed": "~1.4",
"ezsystems/demobundle-data": "~0.1",
"components/bootstrap": "3.3.2"
"components/bootstrap": "3.3.2",
"ezsystems/privacy-cookie-bundle": "~0.1"
},
"autoload": {
"psr-0": {"EzSystems\\DemoBundle": ""}
Expand Down

9 comments on commit c13fb0b

@ilukac
Copy link

@ilukac ilukac commented on c13fb0b Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this thing broke the installer.
When doing a composer create-project ezsystems/ezplatform it results in:
assetic.ERROR: The template "eZDemoBundle::page_footer.html.twig" contains an error: The function "show_privacy_cookie_banner" does not exist in "eZDemoBundle::page_footer.html.twig" at line 24

[RuntimeException]
The source file "/var/www/ezpublish/ezplatform/ezpublish/../web/bundles/ezsystemsprivacycookie/js/privacycookie.js" does not exist.

@crevillo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ilukac, can you try assets:install and assetic:dump?

@ilukac
Copy link

@ilukac ilukac commented on c13fb0b Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, it doesn't matter what I will do afterwards, but the installer is broken. Somebody else who tries to install will fail that is the point ;)

@crevillo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, only said that because i experienced the Same after updating, not tried with fist install though...

@andrerom
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, this is caused by no use of version (dev-master) in your use of the create-project command, or you can also say it is because there is no composer.lock in v0.5. /cc @bdunogier :)

@ilukac
Copy link

@ilukac ilukac commented on c13fb0b Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, the "composer create-project ezsystems/ezplatform" should work like a charm.
Maybe to setup soem travis test for this?

@andrerom
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it should (just work), but when we tag relies on dev packages you get this basically, something to improve on for next tag I guess.

@bdunogier
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-master version on 2015.03 was a mistake.

The next release (very soon) will have "strict" version numbers, and won't update to master like this. I'll also take care of including a composer.lock file.

Do you see anything else that should be done there ?

@andrerom
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other then that it is only @ilukac's remark about making sure we cover this in tests somewhere.

As our daily internal deployes should also have one for latests stable, and as they should ideally run a few BDD tests to verify that they boot, this might be it. (so Jenkins rather then travis for this, travis tests master stuff on purpose).

Please sign in to comment.