From 677f4d677c841e8e4424f1d859c2ef896e7e03b5 Mon Sep 17 00:00:00 2001 From: Davi Lima Date: Wed, 13 Jan 2016 12:56:34 -0200 Subject: [PATCH 1/4] Modernize pagination markup to HTML5 and switches deprecated listingBar CSS class reference to pagination --- CHANGES.rst | 15 +++ plone/batching/batchnavigation.pt | 152 +++++++++++++++--------------- 2 files changed, 92 insertions(+), 75 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 04825f4..38451a7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,21 @@ Changelog ========= +1.1.1 (unreleased) +------------------ + +New: + +- Make ellipses stylable and provide more CSS hooks to pagination markup. This also deprecates the CSS class ``listingBar`` in favor of more commonly used ``pagination``, which will be the canonical one in Plone 5.0.2 and up. + [davilima6] +- Switches deprecated ``listingBar`` CSS class to ``pagination``. + [davilima6] + +Fixes: + +- *add item here* + + 1.0.8 (unreleased) ------------------ diff --git a/plone/batching/batchnavigation.pt b/plone/batching/batchnavigation.pt index 8b5862e..9354ca8 100644 --- a/plone/batching/batchnavigation.pt +++ b/plone/batching/batchnavigation.pt @@ -3,90 +3,92 @@ condition="batch" metal:define-macro="navigation"> - + + + + + + + From c54672aeecfa7d9e961249ba6ecc7e247bd73729 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Wed, 20 Jan 2016 02:59:00 +0100 Subject: [PATCH 2/4] rm useless brackets around active. add spans where there are no "a" to allow styling like "a" --- plone/batching/batchnavigation.pt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plone/batching/batchnavigation.pt b/plone/batching/batchnavigation.pt index 9354ca8..6e0d448 100644 --- a/plone/batching/batchnavigation.pt +++ b/plone/batching/batchnavigation.pt @@ -32,7 +32,7 @@
  • - ... + ...
    • @@ -47,7 +47,7 @@
  • - [] +
    • @@ -61,9 +61,8 @@ -
  • - ... +
  • + ...
    • From db4d3a51b33145677b46e682dcaf72683d13a9a1 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Wed, 20 Jan 2016 02:59:07 +0100 Subject: [PATCH 3/4] update metadata, upgrade warning --- CHANGES.rst | 10 ++++++++-- setup.py | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 38451a7..1f50734 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,13 +1,19 @@ Changelog ========= -1.1.1 (unreleased) ------------------- +1.1 (unreleased) +---------------- + +.. warning:: Upgrade Warning! + If you customized the batchnavigation.pt file or use specific CSS styles for it, you might have to update them to reflect the new HTML structure. New: - Make ellipses stylable and provide more CSS hooks to pagination markup. This also deprecates the CSS class ``listingBar`` in favor of more commonly used ``pagination``, which will be the canonical one in Plone 5.0.2 and up. [davilima6] +- Refactor batchnavigation HTML layout to use nav/ul/li elements instead of div/span. + [davilima6] + - Switches deprecated ``listingBar`` CSS class to ``pagination``. [davilima6] diff --git a/setup.py b/setup.py index 1815e79..e346d13 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import find_packages from setuptools import setup -version = '1.0.8.dev0' +version = '1.1.dev0' setup( name='plone.batching', From a86ec087b15a35288e6bb55492ba2b8817b3b848 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Wed, 20 Jan 2016 20:13:04 +0100 Subject: [PATCH 4/4] aftermerge work --- CHANGES.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1f50734..45284e6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,14 +9,15 @@ Changelog New: -- Make ellipses stylable and provide more CSS hooks to pagination markup. This also deprecates the CSS class ``listingBar`` in favor of more commonly used ``pagination``, which will be the canonical one in Plone 5.0.2 and up. - [davilima6] - Refactor batchnavigation HTML layout to use nav/ul/li elements instead of div/span. [davilima6] - Switches deprecated ``listingBar`` CSS class to ``pagination``. [davilima6] +- Make ellipses stylable and provide more CSS hooks to pagination markup. + [davilima6] + Fixes: - *add item here*