diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig index d6a665cb7..41ab9a540 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig @@ -6,11 +6,11 @@ {% block content %}
- -
{# <=== vue component #} - {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %} - -
+ +
{# <=== vue component #} + {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %} + + {% endblock %} {% block js %} @@ -18,10 +18,10 @@ {{ encore_entry_script_tags('async_upload') }} {{ encore_entry_script_tags('vue_activity') }} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig index 0c35228df..8a636a8cd 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig @@ -23,7 +23,7 @@ {{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }} - + {{ encore_entry_link_tags('page_login') }}
@@ -42,14 +42,13 @@
- +

{{ 'Forgot your password ?'|trans }}

{{ include('@ChillMain/Login/_footer.html.twig') }}
- - + {{ encore_entry_script_tags('page_login') }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig index 8878b9ad4..7c328b889 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig @@ -1,5 +1,5 @@ {# - * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, + * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, / * * This program is free software: you can redistribute it and/or modify @@ -24,25 +24,20 @@ {{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }} - - + {{ encore_entry_link_tags('chill') }} -
-
-
- - - +
+
+ + + +
-
-
- -
- +
{% block content %}{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index fc6f707db..e495eae96 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -26,13 +26,13 @@ - + {{ installation.name }} - {% block title %}{% endblock %} - - {{ encore_entry_link_tags('bootstrap') }} - {{ encore_entry_link_tags('forkawesome') }} - {{ encore_entry_link_tags('ckeditor5') }} + + {{ encore_entry_link_tags('mod_bootstrap') }} + {{ encore_entry_link_tags('mod_forkawesome') }} + {{ encore_entry_link_tags('mod_ckeditor5') }} {{ encore_entry_link_tags('chill') }} {% block css%}{% endblock %} @@ -71,7 +71,7 @@ {{ flashMessage|raw }}
{% endfor %} - + {% endif %} @@ -100,11 +100,11 @@ {{ include('@ChillMain/Layout/_footer.html.twig') }} - {{ encore_entry_script_tags('bootstrap') }} - {{ encore_entry_script_tags('forkawesome') }} - {{ encore_entry_script_tags('ckeditor5') }} + {{ encore_entry_script_tags('mod_bootstrap') }} + {{ encore_entry_script_tags('mod_forkawesome') }} + {{ encore_entry_script_tags('mod_ckeditor5') }} {{ encore_entry_script_tags('chill') }} - + - + {% block js%}{% endblock %} diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js index db65ccec6..b96782a6b 100644 --- a/src/Bundle/ChillMainBundle/chill.webpack.config.js +++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js @@ -45,23 +45,19 @@ module.exports = function(encore, entries) // Aliases are used when webpack is trying to resolve modules path encore.addAliases({ ChillMainAssets: __dirname + '/Resources/public', - //ChillMainSass: __dirname + '/Resources/public/modules/scratch', ShowHide: __dirname + '/Resources/public/modules/show_hide' }); - // Add separate entrypoints - encore.addEntry('login', __dirname + '/Resources/public/modules/login_page/index.js'); - //encore.addEntry('scratch', __dirname + '/Resources/public/modules/scratch/index.js'); + // Page entrypoints + encore.addEntry('page_login', __dirname + '/Resources/public/modules/login_page/index.js'); - // Chill2 new assets - encore.addEntry('forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js'); - encore.addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js'); - - // CKEditor5 + // Modules entrypoints + encore.addEntry('mod_forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js'); + encore.addEntry('mod_bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js'); buildCKEditor(encore); - encore.addEntry('ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js'); + encore.addEntry('mod_ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js'); - // Address + // Vue entrypoints encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js'); }; diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig index e108e218e..23cff6bb9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig @@ -19,7 +19,7 @@