imio.smartweb.core 1.2.38__py3-none-any.whl → 1.2.79__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- imio/smartweb/core/behaviors/categorization.py +24 -0
- imio/smartweb/core/behaviors/configure.zcml +7 -0
- imio/smartweb/core/browser/controlpanel.py +43 -0
- imio/smartweb/core/browser/faceted/block_view.pt +4 -4
- imio/smartweb/core/browser/faceted/summary_view.pt +4 -4
- imio/smartweb/core/browser/sitemap.py +10 -3
- imio/smartweb/core/browser/static/icons/action-delete.svg +3 -0
- imio/smartweb/core/browser/static/icons/action-engagement-2.svg +4 -0
- imio/smartweb/core/browser/static/icons/action-panneaux.svg +3 -0
- imio/smartweb/core/browser/static/icons/action-vote.svg +3 -0
- imio/smartweb/core/browser/static/icons/categorie-attention.svg +3 -0
- imio/smartweb/core/browser/static/icons/categorie-infos-travaux-2.svg +4 -0
- imio/smartweb/core/browser/static/icons/categorie-nature.svg +3 -0
- imio/smartweb/core/browser/static/icons/categorie-parcs-a-conteneurs.svg +4 -0
- imio/smartweb/core/browser/static/icons/categorie-plus.svg +3 -0
- imio/smartweb/core/browser/static/icons/categorie-primes-2.svg +5 -0
- imio/smartweb/core/browser/static/icons/categorie-sport-natation.svg +4 -0
- imio/smartweb/core/browser/static/icons/organisation-ecole-sac.svg +4 -0
- imio/smartweb/core/browser/static/icons/organisation-scout.svg +3 -0
- imio/smartweb/core/browser/static/icons/reseausocial-behance.svg +3 -0
- imio/smartweb/core/browser/static/icons/reseausocial-linkedin.svg +3 -0
- imio/smartweb/core/browser/static/smartweb-edit-compiled.css +1 -1
- imio/smartweb/core/browser/static/smartweb-view-compiled.css +1 -1
- imio/smartweb/core/browser/static/src/edit.less +42 -0
- imio/smartweb/core/browser/static/src/view.less +109 -56
- imio/smartweb/core/browser/vocabulary.py +8 -3
- imio/smartweb/core/contents/__init__.py +2 -0
- imio/smartweb/core/contents/configure.zcml +1 -0
- imio/smartweb/core/contents/folder/block_view.pt +8 -8
- imio/smartweb/core/contents/folder/summary_view.pt +4 -4
- imio/smartweb/core/contents/pages/cirkwi/content.py +5 -0
- imio/smartweb/core/contents/pages/cirkwi/view.py +2 -1
- imio/smartweb/core/contents/pages/configure.zcml +1 -0
- imio/smartweb/core/contents/pages/portal_page/view.py +3 -0
- imio/smartweb/core/contents/pages/views.py +47 -1
- imio/smartweb/core/contents/publication/__init__.py +0 -0
- imio/smartweb/core/contents/publication/configure.zcml +5 -0
- imio/smartweb/core/contents/publication/content.py +23 -0
- imio/smartweb/core/contents/rest/base.py +9 -7
- imio/smartweb/core/contents/rest/directory/endpoint.py +2 -2
- imio/smartweb/core/contents/rest/directory/view.pt +2 -1
- imio/smartweb/core/contents/rest/events/content.py +13 -0
- imio/smartweb/core/contents/rest/events/endpoint.py +5 -3
- imio/smartweb/core/contents/rest/events/view.pt +5 -1
- imio/smartweb/core/contents/rest/events/view.py +12 -0
- imio/smartweb/core/contents/rest/news/content.py +6 -0
- imio/smartweb/core/contents/rest/news/endpoint.py +4 -2
- imio/smartweb/core/contents/rest/news/view.pt +4 -1
- imio/smartweb/core/contents/rest/news/view.py +8 -0
- imio/smartweb/core/contents/rest/utils.py +0 -1
- imio/smartweb/core/contents/rest/view.py +4 -0
- imio/smartweb/core/contents/sections/common_templates/carousel.pt +5 -1
- imio/smartweb/core/contents/sections/common_templates/table.pt +18 -4
- imio/smartweb/core/contents/sections/configure.zcml +18 -0
- imio/smartweb/core/contents/sections/contact/content.py +2 -2
- imio/smartweb/core/contents/sections/contact/macros.pt +28 -3
- imio/smartweb/core/contents/sections/contact/utils.py +2 -0
- imio/smartweb/core/contents/sections/contact/view.py +28 -12
- imio/smartweb/core/contents/sections/events/content.py +12 -4
- imio/smartweb/core/contents/sections/events/view.py +20 -2
- imio/smartweb/core/contents/sections/external_content/view.pt +4 -4
- imio/smartweb/core/contents/sections/external_content/views.py +6 -4
- imio/smartweb/core/contents/sections/files/content.py +7 -1
- imio/smartweb/core/contents/sections/files/view.py +43 -12
- imio/smartweb/core/contents/sections/links/view.py +5 -0
- imio/smartweb/core/contents/sections/macros.pt +26 -0
- imio/smartweb/core/contents/sections/news/content.py +11 -3
- imio/smartweb/core/contents/sections/news/view.py +20 -2
- imio/smartweb/core/contents/sections/text/views.py +2 -0
- imio/smartweb/core/contents/sections/views.py +73 -10
- imio/smartweb/core/interfaces.py +4 -0
- imio/smartweb/core/profiles/default/metadata.xml +1 -1
- imio/smartweb/core/profiles/default/taxonomies/page_category.xml +16 -0
- imio/smartweb/core/profiles/default/taxonomies/procedure_category.xml +26 -0
- imio/smartweb/core/profiles/default/types/imio.smartweb.EventsView.xml +1 -0
- imio/smartweb/core/profiles/default/types/imio.smartweb.NewsView.xml +1 -0
- imio/smartweb/core/profiles/default/types/imio.smartweb.Publication.xml +38 -0
- imio/smartweb/core/profiles/default/types/imio.smartweb.SectionEvents.xml +1 -0
- imio/smartweb/core/profiles/default/types/imio.smartweb.SectionFiles.xml +2 -0
- imio/smartweb/core/profiles/default/types/imio.smartweb.SectionNews.xml +1 -0
- imio/smartweb/core/profiles/default/types.xml +1 -0
- imio/smartweb/core/profiles/icons/basic/registry.xml +120 -0
- imio/smartweb/core/rest/authentic_sources.py +17 -2
- imio/smartweb/core/subscribers.py +48 -0
- imio/smartweb/core/subscribers.zcml +12 -0
- imio/smartweb/core/tests/resources/json_iadeliberations_institutions.json +60 -0
- imio/smartweb/core/tests/resources/json_iadeliberations_publication.json +105 -0
- imio/smartweb/core/tests/resources/json_iadeliberations_publications.json +270 -0
- imio/smartweb/core/tests/resources/json_rest_events.json +6 -2
- imio/smartweb/core/tests/resources/json_rest_news.json +2 -2
- imio/smartweb/core/tests/resources/json_rest_specific_events.json +1 -1
- imio/smartweb/core/tests/test_htmx_in_sections.py +131 -0
- imio/smartweb/core/tests/test_iadeliberations.py +136 -0
- imio/smartweb/core/tests/test_icons.py +1 -1
- imio/smartweb/core/tests/test_rest.py +58 -17
- imio/smartweb/core/tests/test_section_contact.py +42 -10
- imio/smartweb/core/tests/test_section_events.py +28 -5
- imio/smartweb/core/tests/test_section_external_content.py +28 -2
- imio/smartweb/core/tests/test_section_news.py +30 -8
- imio/smartweb/core/tests/test_sections.py +17 -0
- imio/smartweb/core/tests/test_vocabularies.py +60 -3
- imio/smartweb/core/tests/test_vocabulary.py +43 -0
- imio/smartweb/core/upgrades/configure.zcml +108 -0
- imio/smartweb/core/upgrades/profiles/1055_to_1056/types/imio.smartweb.SectionFiles.xml +12 -0
- imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.EventsView.xml +11 -0
- imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.NewsView.xml +11 -0
- imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.SectionEvents.xml +11 -0
- imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.SectionNews.xml +11 -0
- imio/smartweb/core/upgrades/profiles/1057_to_1058/taxonomies/page_category.cfg +9 -0
- imio/smartweb/core/upgrades/profiles/1057_to_1058/taxonomies/page_category.xml +73 -0
- imio/smartweb/core/upgrades/profiles/1057_to_1058/taxonomies/procedure_category.cfg +9 -0
- imio/smartweb/core/upgrades/profiles/1057_to_1058/taxonomies/procedure_category.xml +118 -0
- imio/smartweb/core/upgrades/profiles/1058_to_1059/registry/linkedin-icon.xml +126 -0
- imio/smartweb/core/upgrades/profiles/1059_to_1060/registry/iadeliberation.xml +9 -0
- imio/smartweb/core/upgrades/profiles/1060_to_1061/types/imio.smartweb.Publication.xml +38 -0
- imio/smartweb/core/upgrades/profiles/1060_to_1061/types/imio.smartweb.SectionFiles.xml +11 -0
- imio/smartweb/core/upgrades/profiles/1060_to_1061/types.xml +4 -0
- imio/smartweb/core/upgrades/profiles/1060_to_1061/workflows.xml +6 -0
- imio/smartweb/core/utils.py +33 -2
- imio/smartweb/core/viewlets/configure.zcml +23 -1
- imio/smartweb/core/viewlets/footer.pt +5 -0
- imio/smartweb/core/viewlets/footer.py +5 -0
- imio/smartweb/core/viewlets/htmx.py +15 -0
- imio/smartweb/core/viewlets/htmx_js_header.pt +64 -0
- imio/smartweb/core/viewlets/ogptags.py +4 -3
- imio/smartweb/core/viewlets/social.py +23 -0
- imio/smartweb/core/vocabularies.py +65 -3
- imio/smartweb/core/vocabularies.zcml +18 -0
- imio/smartweb/core/webcomponents/build/1c1605a5fe9a2b10a88f.png +1 -0
- imio/smartweb/core/webcomponents/build/524db40e119aa11f4478.png +1 -0
- imio/smartweb/core/webcomponents/build/57d3b7cb1ab874660b39.svg +1 -0
- imio/smartweb/core/webcomponents/build/6cf03871df23ed2ee8b3.png +1 -0
- imio/smartweb/core/webcomponents/build/css/373.smartweb-webcomponents-compiled.css +1 -1
- imio/smartweb/core/webcomponents/build/css/486.smartweb-webcomponents-compiled.css +1 -1
- imio/smartweb/core/webcomponents/build/css/884.smartweb-webcomponents-compiled.css +1 -0
- imio/smartweb/core/webcomponents/build/css/919.smartweb-webcomponents-compiled.css +1 -1
- imio/smartweb/core/webcomponents/build/css/smartweb-webcomponents-compiled.css +1 -1
- imio/smartweb/core/webcomponents/build/js/218.smartweb-webcomponents-compiled.js +1 -1
- imio/smartweb/core/webcomponents/build/js/218.smartweb-webcomponents-compiled.js.LICENSE.txt +10 -8
- imio/smartweb/core/webcomponents/build/js/373.smartweb-webcomponents-compiled.js +2 -1
- imio/smartweb/core/webcomponents/build/js/{568.smartweb-webcomponents-compiled.js.LICENSE.txt → 373.smartweb-webcomponents-compiled.js.LICENSE.txt} +0 -4
- imio/smartweb/core/webcomponents/build/js/486.smartweb-webcomponents-compiled.js +1 -1
- imio/smartweb/core/webcomponents/build/js/499.smartweb-webcomponents-compiled.js +2 -0
- imio/smartweb/core/webcomponents/build/js/{674.smartweb-webcomponents-compiled.js.LICENSE.txt → 499.smartweb-webcomponents-compiled.js.LICENSE.txt} +1 -8
- imio/smartweb/core/webcomponents/build/js/799.smartweb-webcomponents-compiled.js +1 -1
- imio/smartweb/core/webcomponents/build/js/824.smartweb-webcomponents-compiled.js +2 -0
- imio/smartweb/core/webcomponents/build/js/828.smartweb-webcomponents-compiled.js +2 -0
- imio/smartweb/core/webcomponents/build/js/828.smartweb-webcomponents-compiled.js.LICENSE.txt +32 -0
- imio/smartweb/core/webcomponents/build/js/884.smartweb-webcomponents-compiled.js +1 -0
- imio/smartweb/core/webcomponents/build/js/919.smartweb-webcomponents-compiled.js +1 -1
- imio/smartweb/core/webcomponents/build/js/{568.smartweb-webcomponents-compiled.js → 963.smartweb-webcomponents-compiled.js} +2 -2
- imio/smartweb/core/webcomponents/build/js/963.smartweb-webcomponents-compiled.js.LICENSE.txt +3 -0
- imio/smartweb/core/webcomponents/build/js/smartweb-webcomponents-compiled.js +1 -1
- imio/smartweb/core/webcomponents/build/js/smartweb-webcomponents-compiled.js.LICENSE.txt +11 -14
- imio/smartweb/core/webcomponents/package.json +42 -40
- imio/smartweb/core/webcomponents/src/components/Annuaire/Annuaire.jsx +146 -79
- imio/smartweb/core/webcomponents/src/components/Annuaire/Annuaire.scss +415 -351
- imio/smartweb/core/webcomponents/src/components/Annuaire/ContactCard/ContactCard.jsx +95 -62
- imio/smartweb/core/webcomponents/src/components/Annuaire/ContactContent/ContactContent.jsx +328 -168
- imio/smartweb/core/webcomponents/src/components/Annuaire/ContactList/ContactList.jsx +21 -4
- imio/smartweb/core/webcomponents/src/components/Annuaire/Filters/Filter.jsx +213 -100
- imio/smartweb/core/webcomponents/src/components/Annuaire/index.js +1 -1
- imio/smartweb/core/webcomponents/src/components/Events/EventCard/EventCard.jsx +76 -33
- imio/smartweb/core/webcomponents/src/components/Events/EventContent/EventContent.jsx +604 -377
- imio/smartweb/core/webcomponents/src/components/Events/EventList/EventList.jsx +29 -4
- imio/smartweb/core/webcomponents/src/components/Events/Events.jsx +162 -88
- imio/smartweb/core/webcomponents/src/components/Events/Events.scss +496 -378
- imio/smartweb/core/webcomponents/src/components/Events/Filters/Filter.jsx +259 -91
- imio/smartweb/core/webcomponents/src/components/Filters/DateFilter.jsx +62 -55
- imio/smartweb/core/webcomponents/src/components/Filters/DateFilter.scss +68 -17
- imio/smartweb/core/webcomponents/src/components/Filters/IamData.jsx +42 -0
- imio/smartweb/core/webcomponents/src/components/Filters/MainFilter.scss +229 -0
- imio/smartweb/core/webcomponents/src/components/Filters/PublicTargetData.jsx +94 -0
- imio/smartweb/core/webcomponents/src/components/Filters/SelectStyles.js +58 -0
- imio/smartweb/core/webcomponents/src/components/Filters/TaxonomyFilter.jsx +149 -0
- imio/smartweb/core/webcomponents/src/components/Filters/TaxonomyFilter.scss +70 -0
- imio/smartweb/core/webcomponents/src/components/News/Filters/Filter.jsx +139 -83
- imio/smartweb/core/webcomponents/src/components/News/News.jsx +133 -67
- imio/smartweb/core/webcomponents/src/components/News/News.scss +170 -127
- imio/smartweb/core/webcomponents/src/components/News/NewsCard/NewsCard.jsx +76 -44
- imio/smartweb/core/webcomponents/src/components/News/NewsContent/NewsContent.jsx +261 -188
- imio/smartweb/core/webcomponents/src/components/News/NewsList/NewsList.jsx +48 -9
- imio/smartweb/core/webcomponents/src/components/Search/ContactResult/ContactResult.jsx +21 -10
- imio/smartweb/core/webcomponents/src/components/Search/EventsResult/EventsResult.jsx +21 -10
- imio/smartweb/core/webcomponents/src/components/Search/Filters/Filter.jsx +8 -9
- imio/smartweb/core/webcomponents/src/components/Search/NewsResult/NewsResult.jsx +23 -12
- imio/smartweb/core/webcomponents/src/components/Search/Search.jsx +7 -6
- imio/smartweb/core/webcomponents/src/components/Search/Search.scss +115 -96
- imio/smartweb/core/webcomponents/src/components/Search/WebResult/WebResult.jsx +12 -3
- imio/smartweb/core/webcomponents/src/components/Search/index.js +1 -1
- imio/smartweb/core/webcomponents/src/hooks/ScrollContext.jsx +3 -0
- imio/smartweb/core/webcomponents/src/hooks/useAxios.js +3 -3
- imio/smartweb/core/webcomponents/src/hooks/useFilterQuery.js +1 -2
- imio/smartweb/core/webcomponents/src/index.scss +255 -211
- imio/smartweb/core/webcomponents/src/utils/Map.jsx +26 -19
- imio/smartweb/core/webcomponents/src/utils/Map.scss +2 -2
- imio/smartweb/core/webcomponents/src/utils/translation.js +129 -9
- imio.smartweb.core-1.2.79-py3.8-nspkg.pth +2 -0
- {imio.smartweb.core-1.2.38.dist-info → imio.smartweb.core-1.2.79.dist-info}/METADATA +403 -10
- {imio.smartweb.core-1.2.38.dist-info → imio.smartweb.core-1.2.79.dist-info}/RECORD +206 -160
- {imio.smartweb.core-1.2.38.dist-info → imio.smartweb.core-1.2.79.dist-info}/WHEEL +1 -1
- imio/smartweb/core/webcomponents/build/assets/location-bla.1423bcce16ddcb21141430cac1428dc1.svg +0 -1
- imio/smartweb/core/webcomponents/build/assets/next-react-white.819cb069ac8eec300a9db6a7707712d6.svg +0 -1
- imio/smartweb/core/webcomponents/build/assets/next-react.17bc43ff4a6a86f4520f5782f6a89a72.svg +0 -1
- imio/smartweb/core/webcomponents/build/assets/search.57bdbf5b191499cd77514097d1c4972c.svg +0 -1
- imio/smartweb/core/webcomponents/build/css/686.smartweb-webcomponents-compiled.css +0 -1
- imio/smartweb/core/webcomponents/build/js/209.smartweb-webcomponents-compiled.js +0 -2
- imio/smartweb/core/webcomponents/build/js/40.smartweb-webcomponents-compiled.js +0 -1
- imio/smartweb/core/webcomponents/build/js/674.smartweb-webcomponents-compiled.js +0 -2
- imio/smartweb/core/webcomponents/build/js/686.smartweb-webcomponents-compiled.js +0 -1
- imio/smartweb/core/webcomponents/src/assets/facebook-news.svg +0 -1
- imio/smartweb/core/webcomponents/src/assets/location-bla.svg +0 -1
- imio/smartweb/core/webcomponents/src/assets/next-react.svg +0 -1
- imio/smartweb/core/webcomponents/src/assets/search.svg +0 -1
- imio/smartweb/core/webcomponents/src/assets/skeleton.svg +0 -1
- imio/smartweb/core/webcomponents/src/components/Annuaire/ContactContent/download.svg +0 -1
- imio.smartweb.core-1.2.38-py3.8-nspkg.pth +0 -3
- /imio/smartweb/core/webcomponents/build/js/{209.smartweb-webcomponents-compiled.js.LICENSE.txt → 824.smartweb-webcomponents-compiled.js.LICENSE.txt} +0 -0
- {imio.smartweb.core-1.2.38.dist-info → imio.smartweb.core-1.2.79.dist-info}/LICENSE.GPL +0 -0
- {imio.smartweb.core-1.2.38.dist-info → imio.smartweb.core-1.2.79.dist-info}/LICENSE.rst +0 -0
- {imio.smartweb.core-1.2.38.dist-info → imio.smartweb.core-1.2.79.dist-info}/namespace_packages.txt +0 -0
- {imio.smartweb.core-1.2.38.dist-info → imio.smartweb.core-1.2.79.dist-info}/top_level.txt +0 -0
@@ -1,24 +1,24 @@
|
|
1
1
|
export default {
|
2
2
|
// common
|
3
|
-
'Publié'
|
3
|
+
'Publié': {
|
4
4
|
en: 'Published',
|
5
5
|
fr: 'Publié',
|
6
6
|
de: 'Veröffentlicht',
|
7
7
|
nl: 'Gepubliceerd',
|
8
8
|
},
|
9
|
-
'Actualisé'
|
9
|
+
'Actualisé': {
|
10
10
|
en: 'Updated',
|
11
11
|
fr: 'Actualisé',
|
12
12
|
de: 'Aktualisiert',
|
13
13
|
nl: 'Bijgewerkt',
|
14
14
|
},
|
15
|
-
'Événements'
|
15
|
+
'Événements': {
|
16
16
|
en: 'Events',
|
17
17
|
fr: 'Événements',
|
18
18
|
de: 'Veranstaltungen',
|
19
19
|
nl: 'Evenementen',
|
20
20
|
},
|
21
|
-
'Actualités'
|
21
|
+
'Actualités': {
|
22
22
|
en: 'News',
|
23
23
|
fr: 'Actualités',
|
24
24
|
de: 'Nachrichten',
|
@@ -66,6 +66,24 @@ export default {
|
|
66
66
|
de: "Kategorien",
|
67
67
|
nl: "Categorieën",
|
68
68
|
},
|
69
|
+
"Catégories locale": {
|
70
|
+
en: 'Local categories',
|
71
|
+
fr: "Catégories locale",
|
72
|
+
de: "Lokale Kategorien",
|
73
|
+
nl: "Lokale categorieën",
|
74
|
+
},
|
75
|
+
"Catégories spécifiques": {
|
76
|
+
en: 'Specific categories',
|
77
|
+
fr: "Catégories spécifiques",
|
78
|
+
de: "Spezifische Kategorien",
|
79
|
+
nl: "Specifieke categorieën",
|
80
|
+
},
|
81
|
+
"Quoi": {
|
82
|
+
en: 'What',
|
83
|
+
fr: "Quoi",
|
84
|
+
de: "Was",
|
85
|
+
nl: "Wat",
|
86
|
+
},
|
69
87
|
"Facilités": {
|
70
88
|
en: 'Facilities',
|
71
89
|
fr: "Facilités",
|
@@ -156,6 +174,12 @@ export default {
|
|
156
174
|
de: ' Veranstaltung gefunden',
|
157
175
|
nl: ' Evenement gevonden',
|
158
176
|
},
|
177
|
+
'Gratuit': {
|
178
|
+
en: 'Free',
|
179
|
+
fr: 'Gratuit',
|
180
|
+
de: 'Kostenlos',
|
181
|
+
nl: 'Gratis',
|
182
|
+
},
|
159
183
|
"Aucun événement n'a été trouvé": {
|
160
184
|
en: 'No event was found',
|
161
185
|
fr: "Aucun événement n'a été trouvé",
|
@@ -210,6 +234,12 @@ export default {
|
|
210
234
|
de: 'Kontakt vorschlagen',
|
211
235
|
nl: 'Contact voorstellen',
|
212
236
|
},
|
237
|
+
"Quand": {
|
238
|
+
en: 'When',
|
239
|
+
fr: "Quand",
|
240
|
+
de: 'Wann',
|
241
|
+
nl: 'Wanneer',
|
242
|
+
},
|
213
243
|
"Toutes les dates": {
|
214
244
|
en: 'All dates',
|
215
245
|
fr: "Toutes les dates",
|
@@ -227,13 +257,13 @@ export default {
|
|
227
257
|
fr: "Demain",
|
228
258
|
de: "Morgen",
|
229
259
|
nl: "Morgen",
|
230
|
-
},
|
260
|
+
},
|
231
261
|
"Ce week-end": {
|
232
262
|
en: "This weekend",
|
233
263
|
fr: "Ce week-end",
|
234
264
|
de: "Dieses Wochenende",
|
235
265
|
nl: "Dit weekend",
|
236
|
-
},
|
266
|
+
},
|
237
267
|
"Cette semaine": {
|
238
268
|
en: "This week",
|
239
269
|
fr: "Cette semaine",
|
@@ -245,17 +275,107 @@ export default {
|
|
245
275
|
fr: "Ce mois-ci",
|
246
276
|
de: "Diesen Monat",
|
247
277
|
nl: "Deze maand",
|
248
|
-
},
|
278
|
+
},
|
249
279
|
"Personnalisé (Du ... au ...)": {
|
250
280
|
en: "Custom (From ... to ...)",
|
251
281
|
fr: "Personnalisé (Du ... au ...)",
|
252
282
|
de: "Benutzerdefiniert (Von ... bis ...)",
|
253
283
|
nl: "Aangepast (Van ... tot ...)",
|
254
284
|
},
|
285
|
+
"Le": {
|
286
|
+
en: "On",
|
287
|
+
fr: "Le",
|
288
|
+
de: "Am",
|
289
|
+
nl: "Op",
|
290
|
+
},
|
291
|
+
"de": {
|
292
|
+
en: "of",
|
293
|
+
fr: "de",
|
294
|
+
de: "von",
|
295
|
+
nl: "van",
|
296
|
+
},
|
297
|
+
"à": {
|
298
|
+
en: "at",
|
299
|
+
fr: "à",
|
300
|
+
de: "um",
|
301
|
+
nl: "om",
|
302
|
+
},
|
303
|
+
"Du": {
|
304
|
+
en: "From",
|
305
|
+
fr: "Du",
|
306
|
+
de: "Von",
|
307
|
+
nl: "Van",
|
308
|
+
},
|
309
|
+
"au": {
|
310
|
+
en: "to",
|
311
|
+
fr: "au",
|
312
|
+
de: "bis",
|
313
|
+
nl: "tot",
|
314
|
+
},
|
255
315
|
"Personnalisé": {
|
256
316
|
en: "Custom",
|
257
317
|
fr: "Personnalisé",
|
258
318
|
de: "Benutzerdefiniert",
|
259
319
|
nl: "Aangepast",
|
260
|
-
}
|
261
|
-
|
320
|
+
},
|
321
|
+
"Monday": {
|
322
|
+
en: "Monday",
|
323
|
+
fr: "Lundi",
|
324
|
+
de: "Montag",
|
325
|
+
nl: "Maandag",
|
326
|
+
},
|
327
|
+
"Tuesday": {
|
328
|
+
en: "Tuesday",
|
329
|
+
fr: "Mardi",
|
330
|
+
de: "Dienstag",
|
331
|
+
nl: "Dinsdag",
|
332
|
+
},
|
333
|
+
"Wednesday": {
|
334
|
+
en: "Wednesday",
|
335
|
+
fr: "Mercredi",
|
336
|
+
de: "Mittwoch",
|
337
|
+
nl: "Woensdag",
|
338
|
+
},
|
339
|
+
"Thursday": {
|
340
|
+
en: "Thursday",
|
341
|
+
fr: "Jeudi",
|
342
|
+
de: "Donnerstag",
|
343
|
+
nl: "Donderdag",
|
344
|
+
},
|
345
|
+
"Friday": {
|
346
|
+
en: "Friday",
|
347
|
+
fr: "Vendredi",
|
348
|
+
de: "Freitag",
|
349
|
+
nl: "Vrijdag",
|
350
|
+
},
|
351
|
+
"Saturday": {
|
352
|
+
en: "Saturday",
|
353
|
+
fr: "Samedi",
|
354
|
+
de: "Samstag",
|
355
|
+
nl: "Zaterdag",
|
356
|
+
},
|
357
|
+
"Sunday": {
|
358
|
+
en: "Sunday",
|
359
|
+
fr: "Dimanche",
|
360
|
+
de: "Sonntag",
|
361
|
+
nl: "Zondag",
|
362
|
+
},
|
363
|
+
"Fermé": {
|
364
|
+
en: "Closed",
|
365
|
+
fr: "Fermé",
|
366
|
+
de: "Geschlossen",
|
367
|
+
nl: "Gesloten",
|
368
|
+
},
|
369
|
+
"Ouvert": {
|
370
|
+
en: "Open",
|
371
|
+
fr: "Ouvert",
|
372
|
+
de: "Geöffnet",
|
373
|
+
nl: "Open",
|
374
|
+
},
|
375
|
+
"Itinéraire": {
|
376
|
+
en: "Itinerary",
|
377
|
+
fr: "Itinéraire",
|
378
|
+
de: "Route",
|
379
|
+
nl: "Route",
|
380
|
+
},
|
381
|
+
}
|
@@ -0,0 +1,2 @@
|
|
1
|
+
import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio',));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('imio', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio', types.ModuleType('imio'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
|
2
|
+
import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio', 'smartweb'));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('imio.smartweb', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio.smartweb', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio.smartweb', types.ModuleType('imio.smartweb'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p);m and setattr(sys.modules['imio'], 'smartweb', m)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: imio.smartweb.core
|
3
|
-
Version: 1.2.
|
3
|
+
Version: 1.2.79
|
4
4
|
Summary: Core product for iMio websites
|
5
5
|
Home-page: https://github.com/imio/imio.smartweb.core
|
6
6
|
Author: Christophe Boulanger
|
@@ -18,6 +18,8 @@ Classifier: Framework :: Plone :: 6.0
|
|
18
18
|
Classifier: Programming Language :: Python
|
19
19
|
Classifier: Programming Language :: Python :: 3
|
20
20
|
Classifier: Programming Language :: Python :: 3.8
|
21
|
+
Classifier: Programming Language :: Python :: 3.9
|
22
|
+
Classifier: Programming Language :: Python :: 3.10
|
21
23
|
Classifier: Operating System :: OS Independent
|
22
24
|
Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
|
23
25
|
Requires-Python: >=3.8
|
@@ -26,7 +28,7 @@ License-File: LICENSE.rst
|
|
26
28
|
Requires-Dist: setuptools
|
27
29
|
Requires-Dist: z3c.jbot
|
28
30
|
Requires-Dist: z3c.unconfigure
|
29
|
-
Requires-Dist: plone.api
|
31
|
+
Requires-Dist: plone.api>=1.8.4
|
30
32
|
Requires-Dist: plone.gallery
|
31
33
|
Requires-Dist: plone.restapi
|
32
34
|
Requires-Dist: plone.app.dexterity
|
@@ -47,14 +49,14 @@ Requires-Dist: more-itertools
|
|
47
49
|
Requires-Dist: imio.smartweb.common
|
48
50
|
Requires-Dist: imio.smartweb.locales
|
49
51
|
Provides-Extra: test
|
50
|
-
Requires-Dist: plone.app.testing
|
51
|
-
Requires-Dist: plone.testing
|
52
|
-
Requires-Dist: plone.app.contenttypes
|
53
|
-
Requires-Dist: plone.app.robotframework[debug]
|
54
|
-
Requires-Dist: plone.restapi[test]
|
55
|
-
Requires-Dist: requests-mock
|
56
|
-
Requires-Dist: beautifulsoup4
|
57
|
-
Requires-Dist: freezegun
|
52
|
+
Requires-Dist: plone.app.testing; extra == "test"
|
53
|
+
Requires-Dist: plone.testing>=5.0.0; extra == "test"
|
54
|
+
Requires-Dist: plone.app.contenttypes; extra == "test"
|
55
|
+
Requires-Dist: plone.app.robotframework[debug]; extra == "test"
|
56
|
+
Requires-Dist: plone.restapi[test]; extra == "test"
|
57
|
+
Requires-Dist: requests-mock; extra == "test"
|
58
|
+
Requires-Dist: beautifulsoup4; extra == "test"
|
59
|
+
Requires-Dist: freezegun; extra == "test"
|
58
60
|
|
59
61
|
.. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
|
60
62
|
If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
|
@@ -189,6 +191,397 @@ Changelog
|
|
189
191
|
=========
|
190
192
|
|
191
193
|
|
194
|
+
1.2.79 (2025-01-15)
|
195
|
+
-------------------
|
196
|
+
|
197
|
+
- Fix missing jquery for edit section after ods_widget fix
|
198
|
+
[thomlamb]
|
199
|
+
|
200
|
+
|
201
|
+
1.2.78 (2025-01-06)
|
202
|
+
-------------------
|
203
|
+
|
204
|
+
- WEB-4158 : Missing file in previous release!
|
205
|
+
[boulch]
|
206
|
+
|
207
|
+
|
208
|
+
1.2.77 (2025-01-06)
|
209
|
+
-------------------
|
210
|
+
|
211
|
+
- WEB-4158 : ods_widget (css and js) are not loaded anymore on all pages
|
212
|
+
They are only loaded on pages that contains an external content section
|
213
|
+
[boulch]
|
214
|
+
|
215
|
+
|
216
|
+
1.2.76 (2025-01-06)
|
217
|
+
-------------------
|
218
|
+
|
219
|
+
- WEB-4199 : Fix missing contacts when there are more contacts than default Plone batching
|
220
|
+
[boulch]
|
221
|
+
|
222
|
+
- Replace url by social icon in contact section
|
223
|
+
[thomlamb]
|
224
|
+
|
225
|
+
- Add iframe youtube or vimeo in React news view
|
226
|
+
[thomlamb]
|
227
|
+
|
228
|
+
1.2.75 (2024-11-19)
|
229
|
+
-------------------
|
230
|
+
|
231
|
+
- Reduce queries to directory
|
232
|
+
[boulch, laulaz]
|
233
|
+
|
234
|
+
|
235
|
+
1.2.74 (2024-11-13)
|
236
|
+
-------------------
|
237
|
+
|
238
|
+
- Avoid request for images when gallery block is not visible in Section Contact
|
239
|
+
[laulaz]
|
240
|
+
|
241
|
+
|
242
|
+
1.2.73 (2024-10-14)
|
243
|
+
-------------------
|
244
|
+
|
245
|
+
- WEB-4156 : Allow to specifiy if a wca token is needed when forwarding requests
|
246
|
+
[remdub]
|
247
|
+
|
248
|
+
|
249
|
+
1.2.72 (2024-10-02)
|
250
|
+
-------------------
|
251
|
+
|
252
|
+
- WEB-4152 : Add some logs to debug forwarding requests
|
253
|
+
[boulch]
|
254
|
+
|
255
|
+
- WEB-4134 : Add default values to some smartweb settings fields
|
256
|
+
[boulch]
|
257
|
+
|
258
|
+
|
259
|
+
1.2.71 (2024-09-30)
|
260
|
+
-------------------
|
261
|
+
|
262
|
+
- Fix : Increase b_size value to get all institutions from ia.deliberations
|
263
|
+
[boulch]
|
264
|
+
|
265
|
+
- WEB-4024 : Add React event files size
|
266
|
+
[thomlamb]
|
267
|
+
|
268
|
+
- WEB-4027 : Add linkedin icon and change Twitter icon to X icon
|
269
|
+
[thomlamb]
|
270
|
+
|
271
|
+
- WEB-4146 : Replace created by effective date in news cards
|
272
|
+
[thomlamb]
|
273
|
+
|
274
|
+
|
275
|
+
1.2.70 (2024-09-16)
|
276
|
+
-------------------
|
277
|
+
|
278
|
+
- WEB-4143 : Fix a CSRF bug in section files
|
279
|
+
[boulch]
|
280
|
+
|
281
|
+
- WEB-4144 : Set requests timeout to 12 when we populate RemoteContacts vocabulary
|
282
|
+
[remdub]
|
283
|
+
|
284
|
+
|
285
|
+
1.2.69 (2024-09-10)
|
286
|
+
-------------------
|
287
|
+
|
288
|
+
- WEB-4121 : Fix missing auth for OGP tags
|
289
|
+
See commit 381a5e422d8705f86c434d2f0d4bd099938b9cc3
|
290
|
+
[laulaz]
|
291
|
+
|
292
|
+
- WEB-3995 : Add temporary debug annotation to verify section hash updates
|
293
|
+
[laulaz, remdub]
|
294
|
+
|
295
|
+
|
296
|
+
1.2.68 (2024-09-09)
|
297
|
+
-------------------
|
298
|
+
|
299
|
+
- WEB-3995 : Don't reindex section when we receive no JSON (ex: timeout)
|
300
|
+
This will reduce ZODB transactions numbers.
|
301
|
+
[bsuttor, laulaz, remdub]
|
302
|
+
|
303
|
+
- CITI-4 : Add conditional log to debug WCA token errors
|
304
|
+
[laulaz]
|
305
|
+
|
306
|
+
- WEB-4134 : Restrict Publication content type to Manager for now.
|
307
|
+
This is to avoid putting the content type to production sites without notice.
|
308
|
+
[laulaz, remdub]
|
309
|
+
|
310
|
+
|
311
|
+
1.2.67 (2024-09-04)
|
312
|
+
-------------------
|
313
|
+
|
314
|
+
- WEB-4134 : Timestamping : code refactoring, fix view , improve some tests
|
315
|
+
[boulch]
|
316
|
+
|
317
|
+
- Fix: Replace i tag with svg icon in React view
|
318
|
+
[thomlamb]
|
319
|
+
|
320
|
+
- WEB-4134 : Manage timestamping in coordination with ia.deliberations' rest api
|
321
|
+
[boulch]
|
322
|
+
|
323
|
+
|
324
|
+
1.2.66 (2024-08-27)
|
325
|
+
-------------------
|
326
|
+
|
327
|
+
- Fix: Transform all folder view template to list elements
|
328
|
+
[thomlamb]
|
329
|
+
|
330
|
+
- Fix: delete ratio class to external content section
|
331
|
+
[thomlamb]
|
332
|
+
|
333
|
+
- WEB-4138 : Adding link on React elements to edit them
|
334
|
+
[thomlamb]
|
335
|
+
|
336
|
+
|
337
|
+
1.2.65 (2024-08-13)
|
338
|
+
-------------------
|
339
|
+
|
340
|
+
- WEB-4136 : Authorize 70 sections/page instead of 40
|
341
|
+
[boulch]
|
342
|
+
|
343
|
+
- Fix: keep scroll on load more in React view
|
344
|
+
[thomlamb]
|
345
|
+
|
346
|
+
- WEB-4132 : In anonymous mode, use remoteUrl instead of internal link url in links sections
|
347
|
+
[boulch]
|
348
|
+
|
349
|
+
|
350
|
+
1.2.64 (2024-08-05)
|
351
|
+
-------------------
|
352
|
+
|
353
|
+
- SUP-38386 : Fix style for elloha to avoid absolute position
|
354
|
+
[boulch]
|
355
|
+
|
356
|
+
|
357
|
+
1.2.63 (2024-07-31)
|
358
|
+
-------------------
|
359
|
+
|
360
|
+
- SUP-38386 : Update "elloha" plugin in external content section. Agent can set url field to visitwallonia.elloha.com
|
361
|
+
[boulch]
|
362
|
+
|
363
|
+
|
364
|
+
1.2.62 (2024-07-22)
|
365
|
+
-------------------
|
366
|
+
|
367
|
+
- SUP-36628 : Fix new svg icon name for tradcution
|
368
|
+
[thomlamb]
|
369
|
+
|
370
|
+
|
371
|
+
1.2.61 (2024-07-22)
|
372
|
+
-------------------
|
373
|
+
|
374
|
+
- SUP-36628 : Add scroll context to keep the scroll position when we change the page
|
375
|
+
[thomlamb]
|
376
|
+
|
377
|
+
- SUP-37746 : Add new svg icon
|
378
|
+
[thomlamb]
|
379
|
+
|
380
|
+
1.2.60 (2024-07-12)
|
381
|
+
-------------------
|
382
|
+
|
383
|
+
- WEB-4125 : Take scale on context leadimage to populate og:image:* tags
|
384
|
+
[boulch]
|
385
|
+
|
386
|
+
|
387
|
+
1.2.59 (2024-07-10)
|
388
|
+
-------------------
|
389
|
+
|
390
|
+
- SUP-36854 : Fix ajax select2 widget when apply a word filtering and populating specific news and specific events
|
391
|
+
[boulch]
|
392
|
+
|
393
|
+
|
394
|
+
1.2.58 (2024-06-26)
|
395
|
+
-------------------
|
396
|
+
|
397
|
+
- WEB-4116 : Fix error 500 when forward request from e-guichet (got an unexpected keyword argument 'include_items')
|
398
|
+
[boulch]
|
399
|
+
|
400
|
+
|
401
|
+
1.2.57 (2024-06-26)
|
402
|
+
-------------------
|
403
|
+
|
404
|
+
- WEB-4121 : Correct bad format
|
405
|
+
[boulch]
|
406
|
+
|
407
|
+
|
408
|
+
1.2.56 (2024-06-25)
|
409
|
+
-------------------
|
410
|
+
|
411
|
+
- WEB-4121 : Fix ERROR : imio.events.core.contents.event.serializer, line 28, in get_container_uid
|
412
|
+
and fix WARNING : No such index: 'include_items'
|
413
|
+
[boulch]
|
414
|
+
|
415
|
+
- GHA tests on Python 3.8 3.9 and 3.10
|
416
|
+
[remdub]
|
417
|
+
|
418
|
+
|
419
|
+
1.2.55 (2024-06-07)
|
420
|
+
-------------------
|
421
|
+
|
422
|
+
- Fix React placeholder color
|
423
|
+
[thomlamb]
|
424
|
+
|
425
|
+
|
426
|
+
1.2.54 (2024-06-07)
|
427
|
+
-------------------
|
428
|
+
|
429
|
+
- WEB-4113 : Add DE and NL translations in page/procedure categories taxonomies
|
430
|
+
[laulaz]
|
431
|
+
|
432
|
+
|
433
|
+
1.2.53 (2024-06-06)
|
434
|
+
-------------------
|
435
|
+
|
436
|
+
- WEB-4113 : Use `TranslatedAjaxSelectWidget` to fix select2 values translation
|
437
|
+
[laulaz]
|
438
|
+
|
439
|
+
|
440
|
+
1.2.52 (2024-06-06)
|
441
|
+
-------------------
|
442
|
+
|
443
|
+
- WEB-4113 : Inherit `getVocabulary` from `imio.smartweb.common` view to handle
|
444
|
+
vocabularies translations correctly
|
445
|
+
[laulaz]
|
446
|
+
|
447
|
+
|
448
|
+
1.2.51 (2024-06-03)
|
449
|
+
-------------------
|
450
|
+
|
451
|
+
- Fix loaded sticky filter menu in React view
|
452
|
+
[thomlamb]
|
453
|
+
|
454
|
+
|
455
|
+
1.2.50 (2024-05-30)
|
456
|
+
-------------------
|
457
|
+
|
458
|
+
- Fix loaded calcul of sticky filter menu in React view
|
459
|
+
[thomlamb]
|
460
|
+
|
461
|
+
|
462
|
+
1.2.49 (2024-05-29)
|
463
|
+
-------------------
|
464
|
+
|
465
|
+
- WEB-4101 : Encode URLs parameters for `search-filters`. This fixes issues with special chars.
|
466
|
+
[laulaz]
|
467
|
+
|
468
|
+
- WEB-3802: Fix after testing, complited traduction, optimize code
|
469
|
+
[thomlamb]
|
470
|
+
|
471
|
+
|
472
|
+
1.2.48 (2024-05-27)
|
473
|
+
-------------------
|
474
|
+
|
475
|
+
- WEB-3802: Add grouped filter for category and local category in React filters
|
476
|
+
[thomlamb]
|
477
|
+
|
478
|
+
- WEB-4101 : Handle (local) categories translations correctly
|
479
|
+
[laulaz]
|
480
|
+
|
481
|
+
- SUP-36937: Add Recurrence dates in React event content view
|
482
|
+
[thomlamb]
|
483
|
+
|
484
|
+
- WEB-4104 : When change section size (front-office method), reindexParent to refresh cache
|
485
|
+
[boulch]
|
486
|
+
|
487
|
+
- WEB-4105 : Make text section smarter about its lead image format (portrait / landscape)
|
488
|
+
[boulch]
|
489
|
+
|
490
|
+
|
491
|
+
1.2.47 (2024-05-07)
|
492
|
+
-------------------
|
493
|
+
|
494
|
+
- fix React svg import and delete unused svg
|
495
|
+
[thomlamb]
|
496
|
+
|
497
|
+
- add missing React translations
|
498
|
+
[thomlamb]
|
499
|
+
|
500
|
+
1.2.46 (2024-05-07)
|
501
|
+
-------------------
|
502
|
+
|
503
|
+
- WEB-4101 : fix React topic display
|
504
|
+
[thomlamb]
|
505
|
+
|
506
|
+
|
507
|
+
1.2.45 (2024-05-06)
|
508
|
+
-------------------
|
509
|
+
|
510
|
+
- WEB-4101 : Allow to choose to display topic or category on event & news.
|
511
|
+
This affects all related content types: SectionNews, SectionEvents, NewsView, EventsView.
|
512
|
+
Local category is alway taken before category (1 value).
|
513
|
+
Topic is always the first in list (1 value).
|
514
|
+
[laulaz, thomlamb]
|
515
|
+
|
516
|
+
- Add end date on event cards
|
517
|
+
[thomlamb]
|
518
|
+
|
519
|
+
- Add tradcution for directory timetable
|
520
|
+
[thomlamb]
|
521
|
+
|
522
|
+
- SUP-36869 : Fix root ulr on Leaflet Marker.
|
523
|
+
[thomlamb]
|
524
|
+
|
525
|
+
|
526
|
+
1.2.44 (2024-04-18)
|
527
|
+
-------------------
|
528
|
+
|
529
|
+
- WEB-4099 : Fix select name
|
530
|
+
[boulch]
|
531
|
+
|
532
|
+
|
533
|
+
1.2.43 (2024-04-18)
|
534
|
+
-------------------
|
535
|
+
|
536
|
+
- WEB-4099 : Resize sections in front-end thanks to htmx / jquery
|
537
|
+
[boulch]
|
538
|
+
|
539
|
+
- WEB-4098 : Add affiche scale for section on table view display and one element by lot
|
540
|
+
[thomlamb]
|
541
|
+
|
542
|
+
- WEB-4098 : Add new profile for imio.smartweb.orientation to section files
|
543
|
+
[thomlamb]
|
544
|
+
|
545
|
+
- SUP-35100 : Fix sitemap.xml.gz generation. When a "main" rest view was removed, continue to build sitemap for others rest views
|
546
|
+
[boulch]
|
547
|
+
|
548
|
+
|
549
|
+
1.2.42 (2024-04-12)
|
550
|
+
-------------------
|
551
|
+
|
552
|
+
- SUP-36564 : Fix arcgis external content plugin
|
553
|
+
[boulch]
|
554
|
+
|
555
|
+
|
556
|
+
1.2.41 (2024-04-04)
|
557
|
+
-------------------
|
558
|
+
|
559
|
+
- Set higher timeout because retrieving some datas can take some time
|
560
|
+
[boulch]
|
561
|
+
|
562
|
+
|
563
|
+
1.2.40 (2024-04-02)
|
564
|
+
-------------------
|
565
|
+
|
566
|
+
- MWEBPM-9 : Add container_uid in rest views to retrieve agenda id/title or news folder id/title
|
567
|
+
[boulch]
|
568
|
+
|
569
|
+
- MWEBPM-9 : Retrieve agenda id/title or news folder id/title and display it in "common templates" table
|
570
|
+
[boulch]
|
571
|
+
|
572
|
+
|
573
|
+
1.2.39 (2024-03-28)
|
574
|
+
-------------------
|
575
|
+
|
576
|
+
- MWEBPM-9 : Retrieve agenda id/title or news folder id/title and display it in "common templates" carousel
|
577
|
+
[boulch]
|
578
|
+
|
579
|
+
- MWEBPM-8 : Add "min" or "max" to queries depending to "only past events"
|
580
|
+
[thomlamb]
|
581
|
+
|
582
|
+
- MWEBPM-8 : Add field to manage "only past events" rest view
|
583
|
+
[boulch]
|
584
|
+
|
192
585
|
1.2.38 (2024-03-18)
|
193
586
|
-------------------
|
194
587
|
|