From 58e67cd6053764d8f04fe996ebe492e4b14edb79 Mon Sep 17 00:00:00 2001 From: Peter Mathis Date: Tue, 19 May 2020 08:30:35 +0200 Subject: [PATCH 1/4] improve mosaic documentation --- CHANGES.rst | 6 +++++- README.rst | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7046053d..fec6a249 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,13 +4,17 @@ Changelog 3.4.3 (unreleased) ------------------ -- Use collection from context as default. `target_collection` is now used to select an alternative collection as result source. +- Use collection from context as default. `target_collection` is now used to select an alternative collection as result source. This allows to copy and paste preconfigured collections for reuse without reconfiguring each filter element. [agitator] - Fix search which include the terms "and", "or" and "not" [jeffersonbledsoe] +- Update ``plone.app.mosaic`` integration documentation with the + new ``Contentlisting tile`` feature (this needs ``plone.app.standardtiles`` >= 2.3.3) + [petschki] + 3.4.2 (2021-02-25) ------------------ diff --git a/README.rst b/README.rst index 5241be7e..45fe6e4c 100644 --- a/README.rst +++ b/README.rst @@ -49,13 +49,19 @@ source collection template and on the target page which shows the filtered resul Mosaic Integration ------------------ -The three tiles can be added within the Mosaic editor multiple times. Just select them in the ``Insert`` menu -and assign a collection to it. To show the results of the collection simply add a -``Existing Content`` tile which links to the same collection your filter tiles are assigned with. +If ``plone.app.mosaic`` is installed you can enable the ``collective.collectionfilter tiles`` profile +in the addon controlpanel. -TODO: right now the collection needs a default_view template, which wraps the result list with a unique selector -inside the ``#content-core`` container. so the collectionfilter can load the filtered result correctly from -the collection into the container inside the existing content tile. +The filter tiles can be added within the Mosaic editor multiple times. Just select them in the ``Insert`` menu +and assign a collection to it. + +As a second step you have to add a ``ContentListing`` tile which shows the search result initially. +If you are enable Mosaic on a ISyndicatableCollection context you can use the query from it. + +*Important*: + + Make shure you add a unique *tile CSS class* and use this class as ``Content CSS Selector`` + in your filter tiles so that AJAX reload works correctly for the result listing. Geolocation filter support From 97409ad882f277edf573a845f8ab3cab9d881932 Mon Sep 17 00:00:00 2001 From: Peter Mathis Date: Tue, 19 May 2020 08:43:40 +0200 Subject: [PATCH 2/4] fix versions for testing --- test-5.0.x.cfg | 3 +-- test-5.1.x.cfg | 2 -- test-5.2.x.cfg | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/test-5.0.x.cfg b/test-5.0.x.cfg index ef6c5107..211b7266 100644 --- a/test-5.0.x.cfg +++ b/test-5.0.x.cfg @@ -18,9 +18,8 @@ test-eggs = flake8-ignore = E501,E241 [versions] -setuptools = -zc.buildout = pycodestyle = +lxml = configparser = 3.8.1 coverage = >=3.7 diff --git a/test-5.1.x.cfg b/test-5.1.x.cfg index 643dc8ee..8d9f9426 100644 --- a/test-5.1.x.cfg +++ b/test-5.1.x.cfg @@ -18,8 +18,6 @@ test-eggs = flake8-ignore = E501,E241 [versions] -setuptools = -zc.buildout = configparser = 3.8.1 coverage = >=3.7 diff --git a/test-5.2.x.cfg b/test-5.2.x.cfg index 6f082c72..5f5fe1be 100644 --- a/test-5.2.x.cfg +++ b/test-5.2.x.cfg @@ -17,7 +17,5 @@ test-eggs = flake8-ignore = E501,E241 [versions] -#setuptools = -#zc.buildout = coverage = >=3.7 From e3827488de188c696959d86ef520e1d5a6186726 Mon Sep 17 00:00:00 2001 From: Peter Mathis Date: Tue, 19 May 2020 16:35:18 +0200 Subject: [PATCH 3/4] pin zc.buildout and setuptools --- requirements.txt | 1 + test-5.0.x.cfg | 5 +++++ test-5.1.x.cfg | 2 ++ test-5.2.x.cfg | 2 ++ 4 files changed, 10 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..81b1299c --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +-r https://raw.githubusercontent.com/plone/buildout.coredev/5.2/requirements.txt diff --git a/test-5.0.x.cfg b/test-5.0.x.cfg index 211b7266..265a429c 100644 --- a/test-5.0.x.cfg +++ b/test-5.0.x.cfg @@ -1,4 +1,7 @@ [buildout] +eggs-directory = ${buildout:directory}/eggs +download-cache = ${buildout:directory}/downloads + extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-5.0.x.cfg https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg @@ -18,6 +21,8 @@ test-eggs = flake8-ignore = E501,E241 [versions] +zc.buildout = +setuptools = pycodestyle = lxml = configparser = 3.8.1 diff --git a/test-5.1.x.cfg b/test-5.1.x.cfg index 8d9f9426..8f75b6b5 100644 --- a/test-5.1.x.cfg +++ b/test-5.1.x.cfg @@ -18,6 +18,8 @@ test-eggs = flake8-ignore = E501,E241 [versions] +zc.buildout = +setuptools = configparser = 3.8.1 coverage = >=3.7 diff --git a/test-5.2.x.cfg b/test-5.2.x.cfg index 5f5fe1be..0825107a 100644 --- a/test-5.2.x.cfg +++ b/test-5.2.x.cfg @@ -17,5 +17,7 @@ test-eggs = flake8-ignore = E501,E241 [versions] +zc.buildout = +setuptools = coverage = >=3.7 From df7419339cb3e2ea761149f9df15b75bcdf88642 Mon Sep 17 00:00:00 2001 From: agitator Date: Thu, 27 May 2021 15:25:44 +0200 Subject: [PATCH 4/4] update mosaic usage --- README.rst | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 45fe6e4c..8abc0cd0 100644 --- a/README.rst +++ b/README.rst @@ -49,19 +49,15 @@ source collection template and on the target page which shows the filtered resul Mosaic Integration ------------------ -If ``plone.app.mosaic`` is installed you can enable the ``collective.collectionfilter tiles`` profile -in the addon controlpanel. +If ``plone.app.mosaic`` is installed, enable the ``collective.collectionfilter tiles`` in the addon controlpanel. -The filter tiles can be added within the Mosaic editor multiple times. Just select them in the ``Insert`` menu -and assign a collection to it. +Enable ``Layout View`` for your Collection. -As a second step you have to add a ``ContentListing`` tile which shows the search result initially. -If you are enable Mosaic on a ISyndicatableCollection context you can use the query from it. +Edit your Collection and add a ``ContentListing`` tile. -*Important*: +Make sure you add a unique **tile CSS class** to your ``ContentListing`` tile. - Make shure you add a unique *tile CSS class* and use this class as ``Content CSS Selector`` - in your filter tiles so that AJAX reload works correctly for the result listing. +Add multiples filter tiles and make sure you use the unique **tile CSS class** as ``Content CSS Selector``. Geolocation filter support