diff --git a/composer.json b/composer.json
index fb0d2dcd1..b5af76421 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
"knplabs/knp-time-bundle": "^1.12",
"symfony/intl": "4.*",
"symfony/swiftmailer-bundle": "^3.5",
- "league/csv": "^9.6",
+ "league/csv": "^9.7.1",
"phpoffice/phpspreadsheet": "^1.16",
"symfony/browser-kit": "^5.2",
"symfony/css-selector": "^5.2",
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
new file mode 100644
index 000000000..fc492c7bc
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -0,0 +1,129 @@
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
+
+// activity creation first step: select type page
+div.new-activity-select-type {
+ div.activity-row {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: center;
+ gap: 12px;
+
+ div.bloc {
+ width: 200px;
+ align-self: flex-end;
+ height: 140px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ }
+}
+
+// exceptions for flex-table in list-records
+div.activity-list {
+ div.flex-table {
+ div.item-bloc {
+ div.item-row.main {
+ div.item-col {
+ &:first-child {
+ flex-basis: 27%;
+ }
+ ul.list-content {
+ li.social-issues, li.social-actions {
+ .badge-primary {
+ font-variant: small-caps;
+ font-weight: bold;
+ font-size: 88%;
+ margin-bottom: 0.2em;
+ }
+ }
+ li.social-issues .badge-primary {
+ background-color: $orange;
+ }
+ li.social-actions .badge-primary {
+ background-color: $green;
+ }
+ }
+ }
+ }
+ div.item-row.details {
+ flex-direction: row;
+ & > div.item-col {
+ justify-content: flex-start;
+ align-self: center;
+ &:nth-child(1) {
+ flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
+ }
+ &: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 {
+ flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
+ display: flex;
+ flex-direction: column; // TODO pas fini
+ div.group {
+ flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
+ h4 {}
+ ul.list-content {
+ li {
+ display: inline;
+ }
+ }
+ }
+ }
+ }
+ }
+ div.concerned-groups {
+ font-size: 85%;
+ h4 {
+ text-transform: uppercase;
+ }
+ }
+ }
+ ul.list-content {
+ list-style-type: none;
+ padding-left: 1em;
+ margin: 0 0;
+ li {
+ margin-bottom: 0.2em;
+ }
+ }
+ }
+ div.duration {
+ font-size: smaller;
+ padding-left: 1em;
+ margin-top: 1em;
+ }
+ }
+}
+
+// exceptions for flex-bloc in concerned-groups
+div.flex-bloc.concerned-groups {
+ margin-top: 1em;
+ div.item-bloc {
+ flex-grow: 0; flex-shrink: 0; flex-basis: 25%; //4 blocs
+ ul.list-content {
+ list-style-type: none;
+ padding-left: 0;
+ li {
+ margin-bottom: 0.2em;
+ a {
+ color: $white;
+ cursor: pointer;
+ &:hover {
+ color: #ffffffab;
+ }
+ }
+ }
+ }
+ }
+ &.person div.item-bloc {
+ flex-basis: 33%; //3 blocs
+ }
+}
+
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..3028d6f5c
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js
@@ -0,0 +1 @@
+require('./chillactivity.scss');
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/index.js b/src/Bundle/ChillActivityBundle/Resources/public/index.js
deleted file mode 100644
index e219e368b..000000000
--- a/src/Bundle/ChillActivityBundle/Resources/public/index.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./scss/chillactivity.scss');
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
deleted file mode 100644
index 4bb1204a4..000000000
--- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
-//@import '~ChillMainSass/custom/mixins/entity';
-
-//.chill-entity.chill-entity__activity-reason {
-// @include entity($chill-pink, white);
-//}
-
-.activity {
- color: $chill-green;
-}
-
-// exceptions for flex-bloc in concerned-groups
-div.flex-bloc.concerned-groups {
- margin-top: 1em;
- div.item-bloc {
- flex-grow: 0; flex-shrink: 0; flex-basis: 25%; //4 blocs
- ul.list-content {
- list-style-type: none;
- padding-left: 0;
- li {
- margin-bottom: 0.2em;
- a {
- color: white;
- cursor: pointer;
- &:hover {
- color: #ffffffab;
- }
- }
- }
- }
- }
- &.person div.item-bloc {
- flex-basis: 33%; //3 blocs
- }
-}
-
-// exceptions for flex-table in list-records
-div.flex-table.list-records {
- div.item-bloc {
- div.item-row.main {
- div.item-col {
- &:first-child {
- flex-basis: 27%;
- }
- ul.list-content {
- li.social-issues, li.social-actions {
- .badge-primary {
- font-variant: small-caps;
- font-weight: bold;
- font-size: 88%;
- margin-bottom: 0.2em;
- }
- }
- li.social-issues .badge-primary {
- background-color: var(--chill-orange);
- }
- li.social-actions .badge-primary {
- background-color: var(--chill-green);
- }
- }
- }
- }
- div.item-row.details {
- flex-direction: row;
- & > div.item-col {
- justify-content: flex-start;
- align-self: center;
- &:nth-child(1) {
- flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
- }
- &: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 {
- flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
- display: flex;
- flex-direction: column; // TODO pas fini
- div.group {
- flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
- h4 {}
- ul.list-content {
- li {
- display: inline;
- }
- }
- }
- }
- }
- }
- div.concerned-groups {
- font-size: 85%;
- h4 {
- text-transform: uppercase;
- }
- }
- }
- ul.list-content {
- list-style-type: none;
- padding-left: 1em;
- margin: 0 0;
- li {
- margin-bottom: 0.2em;
- }
- }
- }
- div.duration {
- font-size: smaller;
- padding-left: 1em;
- margin-top: 1em;
- }
-}
-
-div.activity-row {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- justify-content: center;
- gap: 12px;
- div.bloc {
- width: 200px;
- align-self: flex-end;
- height: 140px;
- display: flex;
- justify-content: center;
- align-items: center;
- }
-}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
index 4985ea1f7..2ee9eeba0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -60,7 +60,10 @@
{% for bloc in blocs %}
@@ -84,7 +87,10 @@
- {{ item|chill_entity_render_box({'only_denomination': true}) }}
+ {{ item|chill_entity_render_box({
+ 'render': 'raw',
+ 'addAltNames': false
+ }) }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index 6160f652e..f6ffa2b66 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -6,20 +6,16 @@
{% block content %}
-
-
{# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-
-
{% endblock %}
{% block js %}
{{ parent() }}
- {{ encore_entry_link_tags('async_upload') }}
+ {{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_script_tags('vue_activity') }}
{% endblock %}
{% block css %}
{{ parent() }}
-
+ {{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
index d39091389..fb2309a9d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -6,19 +6,15 @@
{% block personcontent %}
-
-
{# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
-
-
{% endblock %}
{% block js %}
- {{ encore_entry_link_tags('async_upload') }}
+ {{ encore_entry_link_tags('mod_async_upload') }}
+ {{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
-
+ {{ encore_entry_link_tags('mod_async_upload') }}
{% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
index 0586321cb..662477c99 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
+++ b/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 %}
-
+ {{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block personcontent %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
index 109effc9f..b60ad6550 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
@@ -22,11 +22,11 @@
{% block personcontent %}
{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}
-
+
{{ 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 %}
-
+ {{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
-
+ {{ encore_entry_link_tags('mod_async_upload') }}
{% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
index e316e189f..f22864645 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
+++ b/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 %}
-
+ {{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block personcontent %}
{{ 'Document %title%' | trans({ '%title%': document.title }) }}
-
+
- {{ 'Title'|trans }}
- {{ document.title }}
-
+
- {{ 'Scope' | trans }}
- {{ document.scope.name | localize_translatable_string }}
-
+
- {{ 'Category'|trans }}
- {{ document.category.name|localize_translatable_string }}
@@ -58,7 +58,7 @@
{{ 'Back to the list' | trans }}
-
+
{{ m.download_button(document.object, document.title) }}
diff --git a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js b/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js
index 14f94cd53..833052ef4 100644
--- a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js
+++ b/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');
};
diff --git a/src/Bundle/ChillEventBundle/Resources/public/css/chillevent.css b/src/Bundle/ChillEventBundle/Resources/public/chill/chillevent.scss
similarity index 100%
rename from src/Bundle/ChillEventBundle/Resources/public/css/chillevent.css
rename to src/Bundle/ChillEventBundle/Resources/public/chill/chillevent.scss
diff --git a/src/Bundle/ChillEventBundle/Resources/public/chill/index.js b/src/Bundle/ChillEventBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..adb0dd85e
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/Resources/public/chill/index.js
@@ -0,0 +1 @@
+require('./chillevent.scss');
diff --git a/src/Bundle/ChillEventBundle/Resources/public/index.js b/src/Bundle/ChillEventBundle/Resources/public/index.js
deleted file mode 100644
index 697693c59..000000000
--- a/src/Bundle/ChillEventBundle/Resources/public/index.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./css/chillevent.css');
\ No newline at end of file
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
index 36ef66af3..e9f9a0270 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
@@ -108,8 +108,6 @@
{{ chill_pagination(paginator) }}
{% endif %}
-{% form_theme form_add_event_participation_by_person 'bootstrap_4_layout.html.twig' %}
-
{{ form_start(form_add_event_participation_by_person) }}
{#
@@ -137,4 +135,4 @@
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
index 2e7dd6cdb..a0551ff1a 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -3,9 +3,7 @@
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
{% block title 'Participation creation'|trans %}
-
- {% form_theme form _self %}
-
+
{% block _collection_row %}