Merge branch 'bootstrap5' into 110_extend_thirdparty

src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss

@@ -1,4 +1,4 @@
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
+@import '~ChillMainAssets/module/bootstrap/bootstrap';
 //@import '~ChillMainSass/custom/mixins/entity';
 
 //.chill-entity.chill-entity__activity-reason {

src/Bundle/ChillActivityBundle/Resources/public/chill/index.js

@@ -0,0 +1 @@
+require('./chillactivity.scss');

src/Bundle/ChillActivityBundle/Resources/public/index.js

@@ -1 +0,0 @@
-require('./scss/chillactivity.scss');

src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig

@@ -6,20 +6,16 @@
 
 {% block content %}
 <div class="activity-edit">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
             
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
             
-        </div>
-    </div>
 </div>
 {% endblock %}
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -32,6 +28,6 @@
 
 {% block css %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig

@@ -22,19 +22,15 @@
 
 {% block personcontent %}
 <div class="activity-edit">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
             
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
             
-        </div>
-    </div>
 </div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -46,6 +42,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig

@@ -6,20 +6,16 @@
 
 {% block content %}
 <div class="activity-new">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
 
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
 
-        </div>
-    </div>
 </div>
 {% endblock %}
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_script_tags('async_upload') }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
@@ -32,6 +28,6 @@
 
 {% block css %}
     {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig

@@ -6,19 +6,15 @@
 
 {% block personcontent %}
 <div class="activity-new">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
             
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
             
-        </div>
-    </div>
 </div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
@@ -30,6 +26,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig

@@ -8,12 +8,8 @@
 
 {% block content -%}
 <div class="activity-show">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
             
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
             
-        </div>
-    </div>
 </div> 
 {% endblock content %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig

@@ -8,12 +8,8 @@
 
 {% block personcontent -%}
 <div class="activity-show">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
             
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
             
-        </div>
-    </div>
 </div>                
 {% endblock personcontent %}

src/Bundle/ChillActivityBundle/chill.webpack.config.js

@@ -1,6 +1,7 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
 
     encore.addAliases({
         ChillActivityAssets: __dirname + '/Resources/public'

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig

@@ -56,9 +56,9 @@
 {% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig

@@ -24,7 +24,7 @@
 {% block title %}{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block personcontent %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig

@@ -48,9 +48,9 @@
 {% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig

@@ -23,7 +23,7 @@
 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block personcontent %}

src/Bundle/ChillDocStoreBundle/chill.webpack.config.js

@@ -1,3 +1,4 @@
-module.exports = function(encore) {
-    encore.addEntry('async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
+module.exports = function(encore)
+{
+    encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
 };

src/Bundle/ChillEventBundle/Resources/public/chill/index.js

@@ -0,0 +1 @@
+require('./chillevent.scss');

src/Bundle/ChillEventBundle/Resources/public/index.js

@@ -1 +0,0 @@
-require('./css/chillevent.css');

src/Bundle/ChillEventBundle/chill.webpack.config.js

@@ -1,4 +1,4 @@
-// this file loads all assets from the Chill Event Bundle
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
 };

src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss

@@ -6,11 +6,7 @@
  * when possible, try to use bootstrap html class
 */
 
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
-
-@import 'alert-first-child';
-@import 'alert-with-actions';
-
+@import '~ChillMainAssets/module/bootstrap/bootstrap';
 
 /*
  * Specific rules