collective.tiles.carousel 1.0.4__py3-none-any.whl → 1.1.1__py3-none-any.whl

collective/tiles/carousel/tests/robot/test_example.robot

@@ -23,13 +23,12 @@
 
 *** Settings *****************************************************************
 
-Resource  plone/app/robotframework/selenium.robot
-Resource  plone/app/robotframework/keywords.robot
+Resource  plone/app/robotframework/browser.robot
 
 Library  Remote  ${PLONE_URL}/RobotRemote
 
-Test Setup  Open test browser
-Test Teardown  Close all browsers
+Test Setup  Run keywords  Plone Test Setup
+Test Teardown  Run keywords  Plone Test Teardown
 
 
 *** Test Cases ***************************************************************
@@ -47,20 +46,19 @@ Scenario: As a member I want to be able to log into the website
 
 a login form
   Go To  ${PLONE_URL}/login_form
-  Wait until page contains  Login Name
-  Wait until page contains  Password
+  Get Text    //body    contains    Login Name
+  Get Text    //body    contains    Password
 
 
 # --- WHEN -------------------------------------------------------------------
 
 I enter valid credentials
-  Input Text  __ac_name  admin
-  Input Text  __ac_password  secret
-  Click Button  Log in
+  Type Text    //input[@name="__ac_name"]    admin
+  Type Text    //input[@name="__ac_password"]    secret
+  Click    //button[contains(text(), "Log in")]
 
 
 # --- THEN -------------------------------------------------------------------
 
 I am logged in
-  Wait until page contains  You are now logged in
-  Page should contain  You are now logged in
+  Get Text    //body    contains    You are now logged in

collective/tiles/carousel/tile.pt

@@ -13,12 +13,11 @@
                  darkvariant python:view.data.get('darkvariant') and 'carousel-dark' or '';
                  crossfade python:view.data.get('crossfade') and 'carousel-fade' or '';
                  link_slides python:view.data.get('link_slides') != 'disabled';
-                 items_per_slide python:view.data.get('items_per_slide') and view.data.get('items_per_slide') or 1;
+                 items_per_slide python:view.data.get('items_per_slide', 1) or 1;
                  items_responsive python: items_per_slide > 1 and 'row-cols-2' or 'row-cols-1';
                  items_responsive python: items_per_slide == 3 and 'row-cols-1' or items_responsive;
                  autoplay_interval view/data/carousel_speed|nothing;
                ">
-
         <div class="tileHeader"
              tal:condition="python:view.data['title'] or view.data['description']"
         >
@@ -41,7 +40,7 @@
         >
 
           <div class="carousel-indicators"
-               tal:condition="view/data/indicators"
+               tal:condition="python:view.data.get('indicators')"
           >
             <tal:indicators repeat="item items">
               <button class="${python:repeat.item.index == 0 and 'active' or None}"
@@ -82,7 +81,7 @@
              href="#carousel-${view/id}"
              role="button"
              data-bs-slide="prev"
-             tal:condition="view/data/controls"
+             tal:condition="python:view.data.get('controls') and len(items) > 1"
           >
             <span class="carousel-control-prev-icon"
                   aria-hidden="true"
@@ -95,7 +94,7 @@
              href="#carousel-${view/id}"
              role="button"
              data-bs-slide="next"
-             tal:condition="view/data/controls"
+             tal:condition="python:view.data.get('controls') and len(items) > 1"
           >
             <span class="carousel-control-next-icon"
                   aria-hidden="true"

collective/tiles/carousel/tile.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from collective.tiles.carousel import _
 from collective.tiles.carousel.interfaces import ICollectiveTilesCarouselLayer
 from collective.tiles.carousel.utils import parse_query_from_data
@@ -8,7 +7,6 @@ from plone.app.contenttypes.browser.link_redirect_view import NON_RESOLVABLE_URL
 from plone.app.contenttypes.interfaces import ICollection
 from plone.app.contenttypes.utils import replace_link_variables_by_paths
 from plone.app.z3cform.widgets.querystring import QueryStringFieldWidget
-from plone.app.z3cform.widgets.relateditems import RelatedItemsFieldWidget
 from plone.autoform import directives as form
 from plone.dexterity.interfaces import IDexterityContainer
 from plone.memoize import view
@@ -30,6 +28,16 @@ from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
 
+try:
+    from plone.app.z3cform.widgets.contentbrowser import (
+        ContentBrowserFieldWidget as CarouselItemsWidget,
+    )
+except ImportError:
+    from plone.app.z3cform.widgets.relateditems import (
+        RelatedItemsFieldWidget as CarouselItemsWidget,
+    )
+
+
 @provider(IContextSourceBinder)
 def image_scales(context):
     """Return custom source for image scales.
@@ -74,11 +82,12 @@ class ISliderTile(Schema):
 
     form.widget(
         "carousel_items",
-        RelatedItemsFieldWidget,
+        CarouselItemsWidget,
         vocabulary="plone.app.vocabularies.Catalog",
         pattern_options={
             "orderable": True,
             "recentlyUsed": True,
+            "upload": True,
         },
     )
 
@@ -247,50 +256,37 @@ class SliderTile(Tile):
 
     @property
     def items(self):
-        items = OrderedDict()
+        result = []
+
         if len(self.data.get("carousel_items") or []):
             for item in self.data["carousel_items"]:
                 if ICollection.providedBy(item.to_object):
-                    items.update(
-                        OrderedDict.fromkeys(
-                            [
-                                x.getObject()
-                                for x in item.to_object.results(
-                                    brains=True, batch=False
-                                )
-                            ]
+                    result += [
+                        x.getObject()
+                        for x in item.to_object.results(brains=True, batch=False)
+                    ]
+                elif IDexterityContainer.providedBy(item.to_object):
+                    result += [
+                        x.getObject()
+                        for x in api.content.find(
+                            path="/".join(item.to_object.getPhysicalPath()),
+                            sort_on="getObjPositionInParent",
+                            depth=1,
                         )
-                    )
-                    continue
-                if IDexterityContainer.providedBy(item.to_object):
-                    items.update(
-                        OrderedDict.fromkeys(
-                            [
-                                x.getObject()
-                                for x in api.content.find(
-                                    path="/".join(item.to_object.getPhysicalPath()),
-                                    sort_on="getObjPositionInParent",
-                                    depth=1,
-                                )
-                            ]
-                        )
-                    )
-                    continue
+                    ]
                 else:
-                    items[item.to_object] = None
+                    result.append(item.to_object)
 
         query = self.query
+        limit = self.data.get("limit") or 12
+
         if query:
-            items.update(
-                OrderedDict.fromkeys([x.getObject() for x in self.catalog(**query)])
-            )
+            # limit catalog query to our limit
+            query["sort_limit"] = limit
+            result += [x.getObject() for x in self.catalog(**query)]
 
-        result = []
-        limit = self.data.get("limit") or 12
-        for count, obj in enumerate(items.keys(), 1):
-            result.append(obj)
-            if count >= limit:
-                break
+        # limit result
+        result = result[:limit]
         ips = self.data.get("items_per_slide", 1) or 1
         slides = [
             result[i : i + ips]

{collective.tiles.carousel-1.0.4.dist-info → collective_tiles_carousel-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: collective.tiles.carousel
-Version: 1.0.4
+Version: 1.1.1
 Summary: Slider for plone.app.mosaic based on Bootstrap 5
 Home-page: https://github.com/collective/collective.tiles.carousel
 Author: Peter Holzer
@@ -41,12 +41,24 @@ Requires-Dist: plone.tiles
 Requires-Dist: plone.api
 Requires-Dist: z3c.relationfield
 Provides-Extra: test
-Requires-Dist: plone.app.dexterity ; extra == 'test'
-Requires-Dist: plone.app.testing ; extra == 'test'
-Requires-Dist: plone.browserlayer ; extra == 'test'
-Requires-Dist: plone.testing ; extra == 'test'
-Requires-Dist: plone.app.robotframework[debug] ; extra == 'test'
-Requires-Dist: robotsuite ; extra == 'test'
+Requires-Dist: plone.app.dexterity; extra == "test"
+Requires-Dist: plone.app.testing; extra == "test"
+Requires-Dist: plone.browserlayer; extra == "test"
+Requires-Dist: plone.testing; extra == "test"
+Requires-Dist: plone.app.robotframework[debug]; extra == "test"
+Requires-Dist: robotsuite; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. 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
@@ -108,6 +120,23 @@ Changelog
 =========
 
 
+1.1.1 (2025-05-09)
+------------------
+
+- Show indicators and controls only if there are more than one slide.
+  [petschki]
+
+- Improve result calculation.
+  [petschki]
+
+
+1.1.0 (2024-12-12)
+------------------
+
+- Use new `ContentBrowserWidget` for Plone 6.1.
+  [petschki]
+
+
 1.0.4 (2024-05-02)
 ------------------
 

{collective.tiles.carousel-1.0.4.dist-info → collective_tiles_carousel-1.1.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-collective.tiles.carousel-1.0.4-py3.11-nspkg.pth,sha256=2oWpeYM6MlxuTCe3-blu86w9h991-Etrc9-2Yn3D6ME,1059
+collective.tiles.carousel-1.1.1-py3.13-nspkg.pth,sha256=2oWpeYM6MlxuTCe3-blu86w9h991-Etrc9-2Yn3D6ME,1059
 collective/tiles/carousel/__init__.py,sha256=51V59Yi1aRW6PCzRAoJqUlWno0YQO1wAgi8d37mwTmA,119
 collective/tiles/carousel/configure.zcml,sha256=1-9Nc4-Lej7b7HJb9Puc8Jw_rDRVyS6agix2SR98wrs,1783
 collective/tiles/carousel/interfaces.py,sha256=erGd_4DSscSVyQCdzdWNABmPxuUBV1vwKvz6_m5BCc4,249
 collective/tiles/carousel/setuphandlers.py,sha256=0y1cT8R_eYSdIv-aZUY-pazUGia27EFzCCHC-SiGMrI,586
 collective/tiles/carousel/testing.py,sha256=WxBe18FLBdf-9nQmw_0rL_Gf1Eu0aLnUDD0RUxJ2VE0,1685
-collective/tiles/carousel/tile.pt,sha256=ePFsqwYEMYpng21_l8Hp8Ok9-f_KfUKICaq-oJ3n3yc,4737
-collective/tiles/carousel/tile.py,sha256=lkl_R91n7h6Oh3X-2QWn-m7YfqnFioCS2WhhcGciyjQ,12230
+collective/tiles/carousel/tile.pt,sha256=lf-v-icgXLqS88tjpf2BWs5l4BAvVQDJAAjURM26BN0,4782
+collective/tiles/carousel/tile.py,sha256=CsEXPNCDh9f7-3EkB-tBU-ys7zdePiKjnbjSJiGO48c,11875
 collective/tiles/carousel/utils.py,sha256=M0fOW-m5fhe63I4PtO8jCqnbooZ9ZXctj5in_Ru8j-o,550
 collective/tiles/carousel/locales/README.rst,sha256=fS2h1MYp7b5Im-GcnIsZLHhK1N4F-_VuHBf_DorI2_A,611
 collective/tiles/carousel/locales/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,12 +28,12 @@ collective/tiles/carousel/slides/static/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeu
 collective/tiles/carousel/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 collective/tiles/carousel/tests/test_robot.py,sha256=VPu3DguHGk-5srPM-N9BZj4dALjotYup8RWZ-QRdbpQ,947
 collective/tiles/carousel/tests/test_setup.py,sha256=4FnSh4YBgEbcKTEw-feXs61FYm137R198GQUz4bXFBE,2221
-collective/tiles/carousel/tests/robot/test_example.robot,sha256=RjktU-NOhxH3xDxc_Tn91wLAVcuQQ2aNnMEV5oHOKFw,2032
-collective.tiles.carousel-1.0.4.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-collective.tiles.carousel-1.0.4.dist-info/LICENSE.rst,sha256=iDVL_6C7byshRvxykg-JJfnJl1UQCvKDV_H-1dp_8GU,668
-collective.tiles.carousel-1.0.4.dist-info/METADATA,sha256=58tQmNcfVHw1njopS1Y5WhOUJ6oq3C_DsoFBP3ipm90,4028
-collective.tiles.carousel-1.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-collective.tiles.carousel-1.0.4.dist-info/entry_points.txt,sha256=ru0hdDg0GqdaMNDkHf3l7rtXvCkgCOmh7S-EiRWIpUk,130
-collective.tiles.carousel-1.0.4.dist-info/namespace_packages.txt,sha256=AiVC9ju6UYs_UE8dvyfAvQmRsFgWG25eyAfTG-nLAjM,28
-collective.tiles.carousel-1.0.4.dist-info/top_level.txt,sha256=FyC0xnd95fkjCaKazR3nfIgNqhWMpB0mYBlzALyXKTg,11
-collective.tiles.carousel-1.0.4.dist-info/RECORD,,
+collective/tiles/carousel/tests/robot/test_example.robot,sha256=5m94vuXTR8NH6qj1s52WlTCj-3Iwgy579yRFX0JG-UE,2053
+collective_tiles_carousel-1.1.1.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+collective_tiles_carousel-1.1.1.dist-info/LICENSE.rst,sha256=iDVL_6C7byshRvxykg-JJfnJl1UQCvKDV_H-1dp_8GU,668
+collective_tiles_carousel-1.1.1.dist-info/METADATA,sha256=WG-tqdNH-Z-p9ci9Pb8SNVUWhtDDQPlwPikO4MloJmE,4535
+collective_tiles_carousel-1.1.1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+collective_tiles_carousel-1.1.1.dist-info/entry_points.txt,sha256=ru0hdDg0GqdaMNDkHf3l7rtXvCkgCOmh7S-EiRWIpUk,130
+collective_tiles_carousel-1.1.1.dist-info/namespace_packages.txt,sha256=AiVC9ju6UYs_UE8dvyfAvQmRsFgWG25eyAfTG-nLAjM,28
+collective_tiles_carousel-1.1.1.dist-info/top_level.txt,sha256=FyC0xnd95fkjCaKazR3nfIgNqhWMpB0mYBlzALyXKTg,11
+collective_tiles_carousel-1.1.1.dist-info/RECORD,,

{collective.tiles.carousel-1.0.4.dist-info → collective_tiles_carousel-1.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any