imio.smartweb.core 1.2.44__tar.gz → 1.2.46__tar.gz

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/CHANGES.rst

@@ -2,6 +2,32 @@ Changelog
 =========
 
 
+1.2.46 (2024-05-07)
+-------------------
+
+- WEB-4101 : fix React topic display
+  [thomlamb]
+
+
+1.2.45 (2024-05-06)
+-------------------
+
+- WEB-4101 : Allow to choose to display topic or category on event & news.
+  This affects all related content types: SectionNews, SectionEvents, NewsView, EventsView.
+  Local category is alway taken before category (1 value).
+  Topic is always the first in list (1 value).
+  [laulaz, thomlamb]
+
+- Add end date on event cards
+  [thomlamb]
+
+- Add tradcution for directory timetable
+  [thomlamb]
+
+- SUP-36869 : Fix root ulr on Leaflet Marker.
+  [thomlamb]
+
+
 1.2.44 (2024-04-18)
 -------------------
 

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.44
+Version: 1.2.46
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -21,9 +21,40 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.8
-Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
+Requires-Dist: setuptools
+Requires-Dist: z3c.jbot
+Requires-Dist: z3c.unconfigure
+Requires-Dist: plone.api>=1.8.4
+Requires-Dist: plone.gallery
+Requires-Dist: plone.restapi
+Requires-Dist: plone.app.dexterity
+Requires-Dist: plone.app.imagecropping
+Requires-Dist: eea.facetednavigation
+Requires-Dist: collective.anysurfer
+Requires-Dist: collective.autopublishing
+Requires-Dist: collective.faceted.map
+Requires-Dist: collective.geolocationbehavior
+Requires-Dist: collective.instancebehavior
+Requires-Dist: collective.messagesviewlet
+Requires-Dist: collective.sendinblue
+Requires-Dist: collective.solr
+Requires-Dist: collective.taxonomy
+Requires-Dist: collective.z3cform.datagridfield
+Requires-Dist: embeddify
+Requires-Dist: more-itertools
+Requires-Dist: imio.smartweb.common
+Requires-Dist: imio.smartweb.locales
+Provides-Extra: test
+Requires-Dist: plone.app.testing; extra == "test"
+Requires-Dist: plone.testing>=5.0.0; extra == "test"
+Requires-Dist: plone.app.contenttypes; extra == "test"
+Requires-Dist: plone.app.robotframework[debug]; extra == "test"
+Requires-Dist: plone.restapi[test]; extra == "test"
+Requires-Dist: requests-mock; extra == "test"
+Requires-Dist: beautifulsoup4; extra == "test"
+Requires-Dist: freezegun; extra == "test"
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -158,6 +189,32 @@ Changelog
 =========
 
 
+1.2.46 (2024-05-07)
+-------------------
+
+- WEB-4101 : fix React topic display
+  [thomlamb]
+
+
+1.2.45 (2024-05-06)
+-------------------
+
+- WEB-4101 : Allow to choose to display topic or category on event & news.
+  This affects all related content types: SectionNews, SectionEvents, NewsView, EventsView.
+  Local category is alway taken before category (1 value).
+  Topic is always the first in list (1 value).
+  [laulaz, thomlamb]
+
+- Add end date on event cards
+  [thomlamb]
+
+- Add tradcution for directory timetable
+  [thomlamb]
+
+- SUP-36869 : Fix root ulr on Leaflet Marker.
+  [thomlamb]
+
+
 1.2.44 (2024-04-18)
 -------------------
 

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.core",
-    version="1.2.44",
+    version="1.2.46",
     description="Core product for iMio websites",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

imio.smartweb.core-1.2.46/src/imio/smartweb/core/behaviors/categorization.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.locales import SmartwebMessageFactory as _
+from plone.autoform import directives
+from plone.autoform.interfaces import IFormFieldProvider
+from plone.supermodel import model
+from zope import schema
+from zope.interface import provider
+
+
+@provider(IFormFieldProvider)
+class ICategoryDisplay(model.Schema):
+    directives.order_before(show_categories_or_topics="IOrientation.orientation")
+
+    model.fieldset("layout", fields=["show_categories_or_topics"])
+    show_categories_or_topics = schema.Choice(
+        title=_("Show category or topic"),
+        description=_(
+            "Select if you want (specific) category or (first) topic displayed on items"
+        ),
+        source="imio.smartweb.vocabulary.CategoriesDisplay",
+        required=True,
+        default="category",
+    )

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/behaviors/configure.zcml

@@ -5,6 +5,13 @@
 
   <include package="plone.behavior" file="meta.zcml"/>
 
+  <plone:behavior
+      name="imio.smartweb.category_display"
+      title="Categories / Topics display"
+      description="Allow to choose to display categories or topics"
+      provides=".categorization.ICategoryDisplay"
+      />
+
   <plone:behavior
       name="imio.smartweb.orientation"
       title="Image orientation"

imio.smartweb.core-1.2.46/src/imio/smartweb/core/browser/static/smartweb-edit-compiled.css

@@ -0,0 +1 @@
+#contentview-preview .icon-preview:before{content:"\e833"}.pat-sortable>:hover{cursor:move}.pat-sortable{display:block;position:relative}.pat-sortable .sortable-section{border:1px solid #dee2e6!important;margin-bottom:1rem;margin-top:1rem;padding:.5rem}.hidden-section-title{opacity:.3}.section-title{vertical-align:middle}.content-section h2,.section-title,.show-hide-banner{display:inline-block}.show-hide-banner{background:#fff;border:1px solid #e6e6e6;padding:15px}.header-section{background:#f2f2f2;line-height:1.9;margin-bottom:1rem!important;margin-top:1rem!important;padding:0 1rem}table.table_schedule{cursor:default}ul.plonetoolbar-authentic-sources-menu,ul.plonetoolbar-smartweb-help-menu{padding-inline-start:0;width:100%}a.manage[class*=contenttype-imio-smartweb-]:before{display:none}a.manage[class*=contenttype-imio-smartweb-] svg{margin-right:5px}.manage-section .form_section_size option{font-size:15px}.manage-section .form_section_size option:before{aspect-ratio:16/9;content:"";display:block;width:40px}.form_section_size .icon_col-sm-3:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h40v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M45 5v90H5V5h40m5-5H0v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M45 5h40v90H45z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M85 5v90H45V5h40m5-5H40v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M85 5h40v90H85z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M125 5v90H85V5h40m5-5H80v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M125 5h40v90h-40z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-40V5h40m5-5h-50v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-4:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h53.36v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M58.36 5v90H5V5h53.36m5-5H0v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M58.27 5h53.36v90H58.27z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M111.64 5v90H58.28V5h53.36m5-5H53.28v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M111.64 5H165v90h-53.36z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-53.36V5H165m5-5h-63.36v100H170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-6:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h160v90H5z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90H5V5h160m5-5H0v100h170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M5 5h80v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M85 5v90H5V5h80m5-5H0v100h90V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-8:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h53.36v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M58.36 5v90H5V5h53.36m5-5H0v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M58.27 5h53.36v90H58.27z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M111.64 5v90H58.28V5h53.36m5-5H53.28v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M111.64 5H165v90h-53.36z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-53.36V5H165m5-5h-63.36v100H170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-9:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h40v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M45 5v90H5V5h40m5-5H0v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M45 5h40v90H45z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M85 5v90H45V5h40m5-5H40v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M85 5h40v90H85z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M125 5v90H85V5h40m5-5H80v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M125 5h40v90h-40z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-40V5h40m5-5h-50v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-12:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h160v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M165 5v90H5V5h160m5-5H0v100h170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}

imio.smartweb.core-1.2.46/src/imio/smartweb/core/browser/static/src/edit.less

@@ -0,0 +1,114 @@
+#contentview-preview .icon-preview:before {
+  content: '\e833';
+}
+
+.pat-sortable> :hover {
+  cursor: move;
+}
+
+.pat-sortable {
+  position: relative;
+  display: block;
+
+  .sortable-section {
+    padding: 0.5rem;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    border: 1px solid #dee2e6 !important;
+  }
+}
+
+.hidden-section-title {
+  opacity: 0.3;
+}
+
+.section-title {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.content-section {
+  h2 {
+    display: inline-block;
+  }
+}
+
+.show-hide-banner {
+  display: inline-block;
+  padding: 15px;
+  background: #fff;
+  border: solid 1px #e6e6e6;
+}
+
+.header-section {
+  background: #f2f2f2;
+  padding: 0 1rem;
+  line-height: 1.9;
+  margin-top: 1rem !important;
+  margin-bottom: 1rem !important;
+}
+
+table.table_schedule {
+  cursor: default;
+}
+
+ul.plonetoolbar-authentic-sources-menu {
+  padding-inline-start: 0;
+  width: 100%;
+}
+
+ul.plonetoolbar-smartweb-help-menu {
+  padding-inline-start: 0;
+  width: 100%;
+}
+
+a.manage[class*="contenttype-imio-smartweb-"] {
+    &:before {
+        display: none;
+    }
+    svg {
+      margin-right: 5px;
+    }
+}
+
+// layout select
+
+.manage-section .form_section_size option {
+  font-size: 15px;    
+}
+.manage-section .form_section_size option:before {
+  content:"";
+  display: block;
+  width: 40px;
+  aspect-ratio: 16/9;
+}
+.form_section_size .icon_col-sm-3:before {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h40v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M45 5v90H5V5h40m5-5H0v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M45 5h40v90H45z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M85 5v90H45V5h40m5-5H40v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M85 5h40v90H85z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M125 5v90H85V5h40m5-5H80v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M125 5h40v90h-40z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-40V5h40m5-5h-50v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.form_section_size .icon_col-sm-4:before {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h53.36v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M58.36 5v90H5V5h53.36m5-5H0v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M58.27 5h53.36v90H58.27z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M111.64 5v90H58.28V5h53.36m5-5H53.28v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M111.64 5H165v90h-53.36z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-53.36V5H165m5-5h-63.36v100H170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.form_section_size .icon_col-sm-6:before {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h160v90H5z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90H5V5h160m5-5H0v100h170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M5 5h80v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M85 5v90H5V5h80m5-5H0v100h90V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.form_section_size .icon_col-sm-8:before {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h53.36v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M58.36 5v90H5V5h53.36m5-5H0v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M58.27 5h53.36v90H58.27z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M111.64 5v90H58.28V5h53.36m5-5H53.28v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M111.64 5H165v90h-53.36z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-53.36V5H165m5-5h-63.36v100H170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.form_section_size .icon_col-sm-9:before {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h40v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M45 5v90H5V5h40m5-5H0v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M45 5h40v90H45z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M85 5v90H45V5h40m5-5H40v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M85 5h40v90H85z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M125 5v90H85V5h40m5-5H80v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M125 5h40v90h-40z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-40V5h40m5-5h-50v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.form_section_size .icon_col-sm-12:before {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h160v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M165 5v90H5V5h160m5-5H0v100h170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");
+  background-size: contain;
+  background-repeat: no-repeat;
+}

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/pages/cirkwi/content.py

@@ -18,6 +18,11 @@ class ICirkwiView(IPages):
         required=True,
     )
 
+    cirkwi_widget_mb_key = schema.TextLine(
+        title=_("Cirkwi widget mb_key"),
+        required=True,
+    )
+
 
 @implementer(ICirkwiView)
 class CirkwiView(Pages):

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/pages/cirkwi/view.py

@@ -10,7 +10,8 @@ class CirkwiViewView(BrowserView):
 
     def get_cirkwi_html(self):
         cirkwi_widget_id = self.context.cirkwi_widget_id
-        url = f"{self.cirwki_api_uri}{cirkwi_widget_id}"
+        cirkwi_widget_mb_key = self.context.cirkwi_widget_mb_key
+        url = f"{self.cirwki_api_uri}{cirkwi_widget_id}?mb_key={cirkwi_widget_mb_key}&{self.request.get('QUERY_STRING')}"
         response = requests.get(url)
         if response.status_code != 200:
             return response.status_code

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/rest/events/endpoint.py

@@ -35,6 +35,7 @@ class BaseEventsEndpoint(BaseEndpoint):
         params = [
             "selected_agendas={}".format(self.context.selected_agenda),
             "metadata_fields=category",
+            "metadata_fields=local_category",
             "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=start",

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/rest/events/view.pt

@@ -14,7 +14,8 @@
                                        display-map view/display_map;
                                        only-past-events view/only_past_events;
                                        view-path view/view_path;
-                                       display_agendas_titles view/display_agendas_titles;"></smartweb-events>
+                                       display_agendas_titles view/display_agendas_titles;
+                                       show-categories-or-topics view/show_categories_or_topics;"></smartweb-events>
     </div>
     </metal:main>
   </body>

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/rest/events/view.py

@@ -25,3 +25,7 @@ class EventsViewView(BaseRestView):
     @property
     def display_agendas_titles(self):
         return self.context.display_agendas_titles
+
+    @property
+    def show_categories_or_topics(self):
+        return self.context.show_categories_or_topics

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/rest/news/endpoint.py

@@ -39,6 +39,7 @@ class BaseNewsEndpoint(BaseEndpoint):
             "selected_news_folders={}".format(self.context.selected_news_folder),
             "portal_type=imio.news.NewsItem",
             "metadata_fields=category",
+            "metadata_fields=local_category",
             "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=has_leadimage",

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/rest/news/view.pt

@@ -12,7 +12,8 @@
                                          orientation view/orientation;
                                          current-language view/current_language;
                                          view-path view/view_path;
-                                         display_newsfolders_titles view/display_newsfolders_titles;"></smartweb-news>
+                                         display_newsfolders_titles view/display_newsfolders_titles;
+                                         show-categories-or-topics view/show_categories_or_topics;"></smartweb-news>
       </div>
     </metal:main>
   </body>

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/rest/news/view.py

@@ -17,3 +17,7 @@ class NewsViewView(BaseRestView):
     @property
     def display_newsfolders_titles(self):
         return self.context.display_newsfolders_titles
+
+    @property
+    def show_categories_or_topics(self):
+        return self.context.show_categories_or_topics

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/sections/configure.zcml

@@ -68,7 +68,7 @@
       name="savesize"
       attribute="save_size"
       class="imio.smartweb.core.contents.sections.views.SectionView"
-      permission="zope2.View"
+      permission="cmf.ModifyPortalContent"
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
 

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/sections/events/view.py

@@ -2,6 +2,7 @@
 
 from datetime import date
 from dateutil.parser import parse
+from imio.smartweb.common.utils import translate_vocabulary_term
 from imio.smartweb.core.config import EVENTS_URL
 from imio.smartweb.core.contents.sections.views import CarouselOrTableSectionView
 from imio.smartweb.core.contents.sections.views import HashableJsonSectionView
@@ -29,6 +30,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
             selected_item,
             "metadata_fields=container_uid",
             "metadata_fields=category_title",
+            "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",
             "metadata_fields=has_leadimage",
@@ -63,11 +65,19 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
             end = item["end"] and parse(item["end"]) or None
             date_dict = {"start": start, "end": end}
             modified_hash = hash_md5(item["modified"])
+            category = ""
+            if self.context.show_categories_or_topics == "category":
+                category = item.get("category_title", "")
+            elif self.context.show_categories_or_topics == "topic":
+                topic = item.get("topics") and item["topics"][0] or None
+                category = translate_vocabulary_term(
+                    "imio.smartweb.vocabulary.Topics", topic
+                )
             dict_item = {
                 "uid": item_uid,
                 "title": item["title"],
                 "description": item["description"],
-                "category": item["category_title"],
+                "category": category,
                 "event_date": date_dict,
                 "url": f"{linking_view_url}/{item_id}?u={item_uid}",
                 "container_id": item.get("usefull_container_id", None),

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/sections/macros.pt

@@ -68,8 +68,9 @@
                   tal:attributes="name string:select_${context/UID};
                                   id string:select_${context/UID}">
             <option tal:repeat="size view/get_sizes"
-                    tal:attributes="value size/key"
-                    tal:content="size/value"></option>
+                    tal:attributes="title size/value; value size/key; class string:icon_${size/key}"
+                    >
+            </option>
           </select>
         </form>
         <a class="section_size"

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/sections/news/view.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.utils import translate_vocabulary_term
 from imio.smartweb.core.config import NEWS_URL
 from imio.smartweb.core.contents.sections.views import CarouselOrTableSectionView
 from imio.smartweb.core.contents.sections.views import HashableJsonSectionView
@@ -27,6 +28,7 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
             "portal_type=imio.news.NewsItem",
             "metadata_fields=container_uid",
             "metadata_fields=category_title",
+            "metadata_fields=topics",
             "metadata_fields=has_leadimage",
             "metadata_fields=modified",
             "metadata_fields=effective",
@@ -56,11 +58,19 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
             item_url = item["@id"]
             item_uid = item["UID"]
             modified_hash = hash_md5(item["modified"])
+            category = ""
+            if self.context.show_categories_or_topics == "category":
+                category = item.get("category_title", "")
+            elif self.context.show_categories_or_topics == "topic":
+                topic = item.get("topics") and item["topics"][0] or None
+                category = translate_vocabulary_term(
+                    "imio.smartweb.vocabulary.Topics", topic
+                )
             dict_item = {
                 "uid": item_uid,
                 "title": item["title"],
                 "description": item["description"],
-                "category": item["category_title"],
+                "category": category,
                 "effective": item["effective"],
                 "url": f"{linking_view_url}/{item_id}?u={item_uid}",
                 "container_id": item.get("usefull_container_id", None),

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/contents/sections/views.py

@@ -3,7 +3,6 @@
 from Acquisition import aq_inner
 from imio.smartweb.common.utils import get_vocabulary
 from imio.smartweb.common.utils import translate_vocabulary_term
-from imio.smartweb.core.utils import get_current_language
 from imio.smartweb.core.utils import hash_md5
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
@@ -11,6 +10,7 @@ from plone.locking.browser.info import LockInfoViewlet
 from plone.protect.interfaces import IDisableCSRFProtection
 from Products.Five.browser import BrowserView
 from zope.annotation.interfaces import IAnnotations
+from zope.i18n import translate
 from zope.interface import alsoProvides
 from zope.interface import Interface
 from zope.lifecycleevent import modified
@@ -65,9 +65,9 @@ class SectionView(BrowserView):
         return api.user.is_anonymous()
 
     def get_section_size(self):
-        if not self.context.bootstrap_css_class:
-            return _("Define section size")
         current_lang = api.portal.get_current_language()[:2]
+        if not self.context.bootstrap_css_class:
+            return translate(_("Define section size"), target_language=current_lang)
         return translate_vocabulary_term(
             "imio.smartweb.vocabulary.BootstrapCSS",
             self.context.bootstrap_css_class,
@@ -89,7 +89,7 @@ class SectionView(BrowserView):
         context = aq_inner(self.context)
         context.bootstrap_css_class = section_size
         context.reindexObject()
-        current_lang = get_current_language(self.context)[:2]
+        current_lang = api.portal.get_current_language()[:2]
         size_txt = translate_vocabulary_term(
             "imio.smartweb.vocabulary.BootstrapCSS",
             section_size,

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <metadata>
-  <version>1056</version>
+  <version>1057</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-plone.app.imagecropping:default</dependency>

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/profiles/default/types/imio.smartweb.EventsView.xml

@@ -32,6 +32,7 @@
     <element value="plone.locking"/>
     <element value="plone.leadimage"/>
     <element value="plone.imagecropping"/>
+    <element value="imio.smartweb.category_display"/>
     <element value="imio.smartweb.orientation"/>
     <element value="imio.smartweb.listing"/>
     <element value="imio.smartweb.topics"/>

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/profiles/default/types/imio.smartweb.NewsView.xml

@@ -32,6 +32,7 @@
     <element value="plone.locking"/>
     <element value="plone.leadimage"/>
     <element value="plone.imagecropping"/>
+    <element value="imio.smartweb.category_display"/>
     <element value="imio.smartweb.orientation"/>
     <element value="imio.smartweb.listing"/>
     <element value="imio.smartweb.topics"/>

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/profiles/default/types/imio.smartweb.SectionEvents.xml

@@ -28,6 +28,7 @@
     <element value="plone.namefromtitle"/>
     <element value="plone.locking"/>
     <element value="plone.shortname"/>
+    <element value="imio.smartweb.category_display"/>
     <element value="imio.smartweb.orientation"/>
   </property>
 

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/profiles/default/types/imio.smartweb.SectionNews.xml

@@ -28,6 +28,7 @@
     <element value="plone.namefromtitle"/>
     <element value="plone.locking"/>
     <element value="plone.shortname"/>
+    <element value="imio.smartweb.category_display"/>
     <element value="imio.smartweb.orientation"/>
   </property>
 

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/tests/resources/json_rest_events.json

@@ -12,7 +12,7 @@
             "@type": "imio.events.Event",
             "UID": "97902f2e26774a369035117d56381a2a",
             "breadcrumb": "Belleville » Accueil temps libre » Journée de l'ATL",
-            "category_title": null,
+            "category_title": "Presse",
             "description": "Description de mon événement",
             "end": "2023-10-31T10:00:00+00:00",
             "first_end": "2023-10-31T10:00:00+00:00",
@@ -652,6 +652,7 @@
             "review_state": "published",
             "start": "2023-01-31T09:00:00+00:00",
             "title": "Journée de l'ATL",
+            "topics": ["education"],
             "whole_day": true
         },
         {

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/tests/resources/json_rest_news.json

@@ -7,7 +7,7 @@
             "UID": "aff08290e3f64cfa830417bc36d5614f",
             "breadcrumb": "belleville >> commune >> Première actualité",
             "category": null,
-            "category_title": null,
+            "category_title": "Presse",
             "description": "Description",
             "effective": "2021-05-11T13:31:00",
             "has_leadimage": false,
@@ -641,7 +641,7 @@
             "modified": "2021-05-11T13:31:00",
             "review_state": "published",
             "title": "Première actualité",
-            "topics": null
+            "topics": ["education"]
         },
         {
             "@id": "https://actualites.enwallonie.be/belleville/commune/a02e0afe2cbe4209970992d5d7323373",

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/tests/resources/json_rest_specific_events.json

@@ -1,5 +1,5 @@
 {
-    "@id": "http://localhost:8080/Plone/@events?UID=1178188bddde4ced95a6cf8bf04c443c&portal_type=imio.events.Event&metadata_fields=category_title&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=image_scales&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&sort_limit=6",
+    "@id": "http://localhost:8080/Plone/@events?UID=1178188bddde4ced95a6cf8bf04c443c&portal_type=imio.events.Event&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=image_scales&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&sort_limit=6",
     "items": [
         {
             "@id": "http://localhost:8080/Plone/belleville/communal/1178188bddde4ced95a6cf8bf04c443c",

{imio.smartweb.core-1.2.44 → imio.smartweb.core-1.2.46}/src/imio/smartweb/core/tests/test_htmx_in_sections.py

@@ -4,6 +4,7 @@ from imio.smartweb.core.interfaces import IImioSmartwebCoreLayer
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
 from plone import api
+from plone.api import portal as portal_api
 from plone.app.testing import logout
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
@@ -17,6 +18,7 @@ from zope.component import queryMultiAdapter
 from zope.interface import alsoProvides
 
 import json
+import mock
 import re
 import transaction
 
@@ -75,11 +77,16 @@ class TestSections(ImioSmartwebTestCase):
         self.assertEqual(len(available_sizes), nb_occurrences)
         for size in available_sizes:
             self.assertIn(
-                f'<option value="{size["key"]}">{size["value"]}</option>',
+                f'<option title="{size["value"]}" value="{size["key"]}" class="icon_{size["key"]}" >',
                 form_to_choose_size,
             )
+            # self.assertIn(
+            #     f'<option value="{size["key"]}">{size["value"]}</option>',
+            #     form_to_choose_size,
+            # )
 
     def test_change_section_size(self):
+        portal_api.get_current_language = mock.Mock(return_value="en")
         transaction.commit()
         section_text_uid = self.section_text.UID()
         browser = Browser(self.layer["app"])