imio.smartweb.core 1.2.38__py3-none-any.whl → 1.2.79__py3-none-any.whl

imio/smartweb/core/contents/sections/contact/macros.pt

@@ -61,7 +61,8 @@
               i18n:translate="">Contact</h3>
 
           <span tal:replace="python:contact.vat_number"></span>
-          <ul tal:define="phones python:contact.phones;
+          <ul class="contact_informations_genral"
+              tal:define="phones python:contact.phones;
                           mails python:contact.mails;
                           urls python:contact.urls">
             <li class="phones"
@@ -78,13 +79,37 @@
               <a tal:attributes="href  python:'mailto:{}'.format(mail.get('mail_address'))"
                  tal:content="python:'{}'.format(mail.get('mail_address'))" />
             </li>
+          </ul>
+          <ul class="contact_informations_social"
+              tal:define="urls python:contact.urls">
             <li class="urls"
                 tal:repeat="url urls"
                 tal:attributes="class python:url.get('type') or ''">
               <a tal:attributes="href python:url.get('url');
                                  title python:contact.get_translated_url_type(url.get('type'))"
-                 tal:content="python:url.get('url')"
-                 target="_blank" />
+                target="_blank">
+                  <tal:condition tal:condition="python:url.get('type') == 'facebook'">
+                      <i class="bi bi-facebook"></i>
+                  </tal:condition>
+                  <tal:condition tal:condition="python:url.get('type') == 'twitter'">
+                      <i class="bi bi-twitter"></i>
+                  </tal:condition>
+                  <tal:condition tal:condition="python:url.get('type') == 'instagram'">
+                      <i class="bi bi-instagram"></i>
+                  </tal:condition>
+                  <tal:condition tal:condition="python:url.get('type') == 'youtube'">
+                    <i class="bi bi-youtube"></i>
+                  </tal:condition>
+                  <tal:condition tal:condition="python:url.get('type') == 'pinterest'">
+                      <i class="bi bi-pinterest"></i>
+                  </tal:condition>
+                  <tal:condition tal:condition="python:url.get('type') == 'linkedin'">
+                      <i class="bi bi-linkedin"></i>
+                  </tal:condition>
+
+                  <span tal:attributes="class python:'sr-only' if url.get('type') != 'website' else ''"
+                        tal:content="python:url.get('url')"/>
+              </a>
             </li>
           </ul>
         </div>

imio/smartweb/core/contents/sections/contact/utils.py

@@ -69,6 +69,8 @@ class ContactProperties(ContactSchedule):
         return json.dumps(geo_json)
 
     def images(self, image_scale, nb_results_by_batch):
+        if "gallery" not in self.context.visible_blocks:
+            return
         contact_url = self.contact["@id"]
         query = "@search?portal_type=Image&path.depth=1&metadata_fields=modified"
         images_url_request = "{}/{}".format(contact_url, query)

imio/smartweb/core/contents/sections/contact/view.py

@@ -4,30 +4,46 @@ from imio.smartweb.core.config import DIRECTORY_URL
 from imio.smartweb.core.contents.sections.contact.utils import ContactProperties
 from imio.smartweb.core.contents.sections.views import HashableJsonSectionView
 from imio.smartweb.core.utils import batch_results
-from imio.smartweb.core.utils import get_json
 from plone import api
+from zope.component import queryMultiAdapter
 
 
 class ContactView(HashableJsonSectionView):
     """Contact Section view"""
 
     def contacts(self):
-        if self.context.related_contacts is None:
-            return
-        related_contacts = self.context.related_contacts
-        uids = "&UID=".join(related_contacts)
+        # Firstly, try to get contact from the container view
+        container_view = queryMultiAdapter(
+            (self.context.aq_parent, self.request), name="full_view"
+        )
+        self.json_data = container_view.get_page_contacts()
+        if self.json_data is None or len(self.json_data.get("items", [])) == 0:
+            return []
+
+        container_contacts = self.json_data.get("items")
+        results_items = [
+            contact
+            for contact in container_contacts
+            if contact["UID"] in self.context.related_contacts
+        ]
+        index_map = {
+            value: index for index, value in enumerate(self.context.related_contacts)
+        }
+        results_items = sorted(results_items, key=lambda x: index_map[x["UID"]])
+
+        # construct JSON data as before WEBBDC-1265 to avoid hash differences
+        uids = "&UID=".join(self.context.related_contacts)
         url = "{}/@search?UID={}&fullobjects=1".format(DIRECTORY_URL, uids)
         current_lang = api.portal.get_current_language()[:2]
         if current_lang != "fr":
             url = f"{url}&translated_in_{current_lang}=1"
-        self.json_data = get_json(url)
+        self.json_data = {
+            "@id": url,
+            "items": results_items,
+            "items_total": len(results_items),
+        }
         self.refresh_modification_date()
-        if self.json_data is None or len(self.json_data.get("items", [])) == 0:  # NOQA
-            return
-        results = self.json_data.get("items")
-        index_map = {value: index for index, value in enumerate(related_contacts)}
-        results = sorted(results, key=lambda x: index_map[x["UID"]])
-        return batch_results(results, self.context.nb_contact_by_line)
+        return batch_results(results_items, self.context.nb_contact_by_line)
 
     def get_contact_properties(self, json_dict):
         return ContactProperties(json_dict, self.context)

imio/smartweb/core/contents/sections/events/content.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives
 from plone.supermodel import model
@@ -13,8 +13,8 @@ from zope import schema
 from zope.globalrequest import getRequest
 from zope.i18n import translate
 from zope.interface import implementer
-from zope.schema.interfaces import IContextAwareDefaultFactory
 from zope.interface import provider
+from zope.schema.interfaces import IContextAwareDefaultFactory
 
 
 @provider(IContextAwareDefaultFactory)
@@ -40,8 +40,9 @@ class ISectionEvents(ISection):
     )
     directives.widget(
         "specific_related_events",
-        AjaxSelectFieldWidget,
-        source="imio.smartweb.vocabulary.EventsFromEntity",
+        TranslatedAjaxSelectWidget,
+        vocabulary="imio.smartweb.vocabulary.EventsFromEntity",
+        pattern_options={"multiple": True},
     )
 
     directives.widget(
@@ -85,6 +86,13 @@ class ISectionEvents(ISection):
         title=_("Show items description"), required=False
     )
 
+    model.fieldset("layout", fields=["display_agendas_titles"])
+    display_agendas_titles = schema.Bool(
+        title=_("Display agendas titles"),
+        description=_("If checked, display agendas titles in the carousel view."),
+        required=False,
+    )
+
 
 @implementer(ISectionEvents)
 class SectionEvents(Section):

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
@@ -27,7 +28,10 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
             )
         params = [
             selected_item,
+            "metadata_fields=container_uid",
             "metadata_fields=category_title",
+            "metadata_fields=local_category",
+            "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",
             "metadata_fields=has_leadimage",
@@ -47,7 +51,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
         url = "{}/@events?{}".format(EVENTS_URL, "&".join(params))
         self.json_data = get_json(url)
         self.refresh_modification_date()
-        if self.json_data is None or len(self.json_data.get("items", [])) == 0:  # NOQA
+        if self.json_data is None or len(self.json_data.get("items", [])) == 0:
             return []
         linking_view_url = self.context.linking_rest_view.to_object.absolute_url()
         image_scale = self.image_scale
@@ -62,13 +66,23 @@ 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("local_category") or 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),
+                "container_title": item.get("usefull_container_title", None),
                 "has_image": item["has_leadimage"],
                 "image": f"{item_url}/@@images/image/{orientation}_{image_scale}?cache_key={modified_hash}",
             }
@@ -85,3 +99,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
 
     def is_multi_dates(self, start, end):
         return start and end and start.date() != end.date()
+
+    @property
+    def display_container_title(self):
+        return self.context.display_agendas_titles

imio/smartweb/core/contents/sections/external_content/view.pt

@@ -27,20 +27,20 @@
 
     <div tal:condition="not:which_plugin"
          tal:define="collapse_klass python: 'collapse' if context.collapsible_section else ''"
-         tal:attributes="class string:body-section ratio ${collapse_klass};
+         tal:attributes="class string:body-section ${collapse_klass};
                          id string:body-section-${context/id}"
          tal:content="structure view/contents" />
 
     <div tal:condition="python:which_plugin == 'ideluxwasteplugin'">
-        <metal:block use-macro="context/@@view_idelux_waste/embeded_datas" tal:define="datas view/contents">
+        <metal:block use-macro="context/@@view_idelux_waste/embeded_datas" tal:define="datas view/contents"></metal:block>
     </div>
 
     <div tal:condition="python:which_plugin == 'inbwcontainersaffluenceplugin'">
-        <metal:block use-macro="context/@@view_inbw_container_affluence/embeded_datas" tal:define="datas view/contents">
+        <metal:block use-macro="context/@@view_inbw_container_affluence/embeded_datas" tal:define="datas view/contents"></metal:block>
     </div>
 
     <div tal:condition="python:which_plugin == 'odwbwidgetplugin'">
-        <metal:block use-macro="context/@@view_odwb_widget/embeded_datas" tal:define="datas view/contents">
+        <metal:block use-macro="context/@@view_odwb_widget/embeded_datas" tal:define="datas view/contents"></metal:block>
     </div>
 
   </div>

imio/smartweb/core/contents/sections/external_content/views.py

@@ -139,7 +139,7 @@ class EaglebePlugin(BasePlugin):
 
 class EllohaPlugin(BasePlugin):
     def __call__(self, parts, config={}):
-        if "reservation.elloha.com" in parts.netloc:
+        if "elloha.com" in parts.netloc:
             self.parts = parts
             self.config = config
             return self
@@ -173,14 +173,15 @@ class EllohaPlugin(BasePlugin):
         cw1 = res.get("constellationwidgetcontainer")
         cw2 = cw1.replace("-", "")
         idoi = res.get("idoi")
+        internal_url = "https://reservation.elloha.com"
         return (
-            f'<div class="elloha">'
+            f'<div class="elloha" style="position:relative;">'
             f'<div id="ConstellationWidgetContainer{cw1}" '
             f'style="width:100%" data-id-projet="{cw2}">...</div></div>'
-            f'<script type="text/javascript" src="{self.parts.geturl()}/Scripts/widget-loader.min.js?v=42"></script>'
+            f'<script type="text/javascript" src="{internal_url}/Scripts/widget-loader.min.js?v=42"></script>'
             f'<script type="text/javascript">var constellationWidgetUrl{cw2}, '
             f"constellationTypeModule{cw2};"
-            f'constellationWidgetUrl{cw2} = "https://reservation.elloha.com/Widget/BookingEngine/{cw1}?idoi={idoi}&culture=fr-FR";'
+            f'constellationWidgetUrl{cw2} = "{internal_url}/Widget/BookingEngine/{cw1}?idoi={idoi}&culture=fr-FR";'
             f'constellationTypeModule{cw2}=1; constellationWidgetLoad("ConstellationWidgetContainer{cw1}");'
             f'constellationWidgetAddEvent(window, "resize", function () {{constellationWidgetSetAppearance("ConstellationWidgetContainer{cw1}");}});</script>'
         )
@@ -230,6 +231,7 @@ class ArcgisPlugin(BasePlugin):
         if "arcgis" in parts.netloc:
             self.parts = parts
             self.config = config
+            return self
         return None
 
     @property

imio/smartweb/core/contents/sections/files/content.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from imio.smartweb.core.contents import IPublication
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
@@ -30,3 +30,9 @@ class SectionFiles(Section):
     """SectionText class"""
 
     manage_content = True
+
+    def has_publications(self):
+        for item in self.items():
+            if IPublication.providedBy(item[1]):
+                return True
+        return False

imio/smartweb/core/contents/sections/files/view.py

@@ -1,33 +1,64 @@
 # -*- coding: utf-8 -*-
-
+from imio.smartweb.core.contents import IPublication
 from imio.smartweb.core.contents.sections.views import CarouselOrTableSectionView
 from imio.smartweb.core.utils import batch_results
 from imio.smartweb.core.utils import get_scale_url
+from plone import api
+from plone.protect.interfaces import IDisableCSRFProtection
 from zope.component import queryMultiAdapter
+from zope.interface import alsoProvides
 
 
 class FilesView(CarouselOrTableSectionView):
     """Files Section view"""
 
     def items(self):
+        alsoProvides(self.request, IDisableCSRFProtection)
+        orientation = self.context.orientation
         image_scale = self.image_scale
-        items = self.context.listFolderContents()
+        items = super(FilesView, self).items()
         results = []
         for item in items:
             url = item.absolute_url()
             has_image = True if getattr(item.aq_base, "image", None) else False
             file_view = queryMultiAdapter((item, self.request), name="file_view")
             scale_url = get_scale_url(
-                item, self.request, "image", image_scale, orientation="paysage"
+                item, self.request, "image", image_scale, orientation
             )
-            results.append(
-                {
-                    "title": item.title,
-                    "description": item.description,
-                    "url": url,
-                    "image": scale_url,
-                    "has_image": has_image,
-                    "item_infos": file_view.human_readable_size(),
-                }
+            dict_item = {
+                "title": item.title,
+                "description": item.description,
+                "smartweb_type": item.smartweb_type,
+                "url": url,
+                "image": scale_url,
+                "has_image": has_image,
+            }
+            dict_item["item_infos"] = (
+                None if file_view is None else file_view.human_readable_size()
             )
+            if IPublication.providedBy(item):
+                extra_properties = [
+                    "linked_publication",
+                    "publication_datetime",
+                    "publication_url",
+                    "publication_document_type",
+                    "publication_attached_file",
+                ]
+                dict_item = self.get_publication_extra_properties(
+                    item, dict_item, extra_properties
+                )
+
+            results.append(dict_item)
         return batch_results(results, self.context.nb_results_by_batch)
+
+    def retrieve_item_url(self, item):
+        if item.get("publication_url", None) is not None and api.user.is_anonymous():
+            # return "real" publication url in iadeliberation
+            return item.get("publication_url")
+        # return smartweb item url
+        return item.get("url")
+
+    def get_publication_extra_properties(self, item, dict_item, extra_properties):
+        for prop in extra_properties:
+            dict_item[prop] = getattr(item, prop, None)
+        return dict_item

imio/smartweb/core/contents/sections/links/view.py

@@ -3,6 +3,7 @@
 from imio.smartweb.core.contents.sections.views import CarouselOrTableSectionView
 from imio.smartweb.core.utils import batch_results
 from imio.smartweb.core.utils import get_scale_url
+from plone import api
 
 
 class LinksView(CarouselOrTableSectionView):
@@ -15,6 +16,10 @@ class LinksView(CarouselOrTableSectionView):
         results = []
         for item in items:
             url = item.absolute_url()
+            is_anon = api.user.is_anonymous()
+            if hasattr(item, "remoteUrl") and item.remoteUrl is not None and is_anon:
+                portal_url = api.portal.get().absolute_url()
+                url = item.remoteUrl.replace("${portal_url}", portal_url)
             has_icon = has_image = False
             if getattr(item.aq_base, "svg_icon", None):
                 has_icon = True

imio/smartweb/core/contents/sections/macros.pt

@@ -53,6 +53,32 @@
         <a tal:attributes="href string:${context/absolute_url}/delete_confirmation"
            i18n:translate="">Delete section</a>
 
+        <form class="form_section_size"
+              style="display: none;"
+              hx-swap="innerHTML"
+              hx-trigger="change"
+              tal:attributes="name string:sizesForm_${context/UID};
+                              id string:sizesForm_${context/UID};
+                              hx-boost string:${context/UID};
+                              hx-post string:${context/absolute_url}/@@savesize;
+                              hx-target string:#selected_size_${context/UID}">
+          <select name="sectionSize"
+                  class="form-select select_section_size"
+                  hx-vals="serialize"
+                  tal:attributes="name string:select_${context/UID};
+                                  id string:select_${context/UID}">
+            <option tal:repeat="size view/get_sizes"
+                    tal:attributes="title size/value; value size/key; class string:icon_${size/key}"
+                    >
+            </option>
+          </select>
+        </form>
+        <a class="section_size"
+           href="#"
+           tal:attributes="id string:selected_size_${context/UID};
+                           uid string:${context/UID}"
+           tal:content="string:${view/get_section_size}"></a>
+
         <tal:dates define="modified context/ModificationDate">
           <span class="documentModified"
                 tal:condition="modified">

imio/smartweb/core/contents/sections/news/content.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives
 from plone.supermodel import model
@@ -40,8 +40,9 @@ class ISectionNews(ISection):
     )
     directives.widget(
         "specific_related_newsitems",
-        AjaxSelectFieldWidget,
-        source="imio.smartweb.vocabulary.NewsItemsFromEntity",
+        TranslatedAjaxSelectWidget,
+        vocabulary="imio.smartweb.vocabulary.NewsItemsFromEntity",
+        pattern_options={"multiple": True},
     )
 
     directives.widget(
@@ -85,6 +86,13 @@ class ISectionNews(ISection):
         title=_("Show items description"), required=False
     )
 
+    model.fieldset("layout", fields=["display_newsfolders_titles"])
+    display_newsfolders_titles = schema.Bool(
+        title=_("Display news folders titles"),
+        description=_("If checked, display news folders titles in the carousel view."),
+        required=False,
+    )
+
 
 @implementer(ISectionNews)
 class SectionNews(Section):

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
@@ -25,7 +26,10 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
         params = [
             selected_item,
             "portal_type=imio.news.NewsItem",
+            "metadata_fields=container_uid",
             "metadata_fields=category_title",
+            "metadata_fields=local_category",
+            "metadata_fields=topics",
             "metadata_fields=has_leadimage",
             "metadata_fields=modified",
             "metadata_fields=effective",
@@ -43,7 +47,7 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
         url = "{}/@search?{}".format(NEWS_URL, "&".join(params))
         self.json_data = get_json(url)
         self.refresh_modification_date()
-        if self.json_data is None or len(self.json_data.get("items", [])) == 0:  # NOQA
+        if self.json_data is None or len(self.json_data.get("items", [])) == 0:
             return []
         linking_view_url = self.context.linking_rest_view.to_object.absolute_url()
         image_scale = self.image_scale
@@ -55,13 +59,23 @@ 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("local_category") or 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),
+                "container_title": item.get("usefull_container_title", None),
                 "has_image": item["has_leadimage"],
                 "image": f"{item_url}/@@images/image/{orientation}_{image_scale}?cache_key={modified_hash}",
             }
@@ -75,3 +89,7 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
     @property
     def see_all_url(self):
         return self.context.linking_rest_view.to_object.absolute_url()
+
+    @property
+    def display_container_title(self):
+        return self.context.display_newsfolders_titles

imio/smartweb/core/contents/sections/text/views.py

@@ -10,4 +10,6 @@ class TextView(SectionView):
     def get_scale_url(self, item):
         request = self.request
         scale = self.context.image_size
+        if self.context.image._height > self.context.image._width:
+            return get_scale_url(item, request, "image", scale, "portrait")
         return get_scale_url(item, request, "image", scale, "paysage")