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 {
@@ -71,7 +71,7 @@ div.flex-table.list-records {
             &:nth-child(2) {
                flex-grow: 0; flex-shrink: 1; flex-basis: 70%;
             }
-            
+
             &:only-child {
                flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
                & > div.concerned-groups {
@@ -80,11 +80,11 @@ div.flex-table.list-records {
                   flex-direction: column; // TODO pas fini
                   div.group {
                      flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
-                     h4 {} 
+                     h4 {}
                      ul.list-content {
-                        li { 
+                        li {
                            display: inline;
-                        } 
+                        }
                      }
                   }
                }

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,32 +6,28 @@
 
 {% 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>
-</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 }}"]', 
+            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
-        window.activity = {{ activity_json|json_encode|raw }}; 
+        window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}
 
 {% 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,10 +1,11 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries) {
+module.exports = function(encore, entries)
-    entries.push(__dirname + '/Resources/public/index.js');
+{
-    
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+
     encore.addAliases({
         ChillActivityAssets: __dirname + '/Resources/public'
     });
-    
+
     encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };

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

@@ -22,11 +22,11 @@
 {% block title %}{{ 'Editing document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 {% block personcontent %}
     <h1>{{ 'Edit Document' | trans }}</h1>
-    
+
     {{ form_errors(form) }}
 
     {{ form_start(form) }}
-    
+
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
@@ -49,16 +49,16 @@
             </li>
         {% endif %} #}
     </ul>
-        
+
     {{ form_end(form) }}
 
 
 {% 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

@@ -22,11 +22,11 @@
 
 {% block personcontent %}
     <h1>{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
-    
+
     {{ form_errors(form) }}
 
     {{ form_start(form) }}
-    
+
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
@@ -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,19 +23,19 @@
 {% 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 %}
     <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
-    
+
     <dl class="chill_view_data">
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
-        
+
         <dt>{{ 'Scope' | trans }}</dt>
         <dd>{{ document.scope.name | localize_translatable_string }}</dd>
-        
+
         <dt>{{ 'Category'|trans }}</dt>
         <dd>{{ document.category.name|localize_translatable_string }}</dd>
 
@@ -58,7 +58,7 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        
+
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>

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

@@ -1,3 +1,4 @@
-module.exports = function(encore) {
+module.exports = function(encore)
-    encore.addEntry('async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
+{
+    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)
-module.exports = function(encore, entries) {
+{
-    entries.push(__dirname + '/Resources/public/index.js');
+    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 '~ChillMainAssets/module/bootstrap/bootstrap';
-
-@import 'alert-first-child';
-@import 'alert-with-actions';
-
 
 /*
  * Specific rules
@@ -24,12 +20,12 @@
 // styles communs pour tous les bandeaux
 div.banner {
    .id-number {
-      font-weight: lighter; 
+      font-weight: lighter;
       font-size: 50%;
       &:before { content: '(n°'; }
       &:after { content: ')'; }
    }
-   a.phone, 
+   a.phone,
    a.email {
       color: white;
    }
@@ -73,14 +69,14 @@ div.flex-table {
    }
    div.item-bloc {
       // We use box-shadow instead of border
-      // to avoid to manage border double-width 
+      // to avoid to manage border double-width
       // when blocs are resized for small screen !
       // Then we can simulate border-collapse: collapse (table)
-      box-shadow: 
+      box-shadow:
-          1px 0 0 0 var(--bs-dark), 
+          1px 0 0 0 var(--bs-dark),
-          0 1px 0 0 var(--bs-dark), 
+          0 1px 0 0 var(--bs-dark),
           1px 1px 0 0 var(--bs-dark),   /* fix the corner */
-          1px 0 0 0 var(--bs-dark) inset, 
+          1px 0 0 0 var(--bs-dark) inset,
           0 1px 0 0 var(--bs-dark) inset;
    }
 }