From cba9076c9740dcf2649470499ae04f4ee50863a3 Mon Sep 17 00:00:00 2001 From: "Fabien S." Date: Thu, 13 Mar 2025 22:44:19 +0100 Subject: [PATCH 1/2] Add Twig modifier for whitespace trimming --- .../bootstrap_v5_bi_sortable_link.html.twig | 2 +- .../bootstrap_v5_fa_sortable_link.html.twig | 2 +- .../bootstrap_v5_md_sortable_link.html.twig | 2 +- .../foundation_v6_pagination.html.twig | 2 - .../semantic_ui_sortable_link.html.twig | 2 +- ...ap_v4_font_awesome_sortable_link.html.twig | 2 +- ...erial_design_icons_sortable_link.html.twig | 2 +- .../Pagination/uikit_v3_pagination.html.twig | 97 +++++++++---------- .../Pagination/uikit_v3_sortable.html.twig | 2 +- 9 files changed, 55 insertions(+), 58 deletions(-) diff --git a/templates/Pagination/bootstrap_v5_bi_sortable_link.html.twig b/templates/Pagination/bootstrap_v5_bi_sortable_link.html.twig index 2291954..4dd3363 100644 --- a/templates/Pagination/bootstrap_v5_bi_sortable_link.html.twig +++ b/templates/Pagination/bootstrap_v5_bi_sortable_link.html.twig @@ -19,5 +19,5 @@ {% endif %} - {{ title }} + {{- title -}} diff --git a/templates/Pagination/bootstrap_v5_fa_sortable_link.html.twig b/templates/Pagination/bootstrap_v5_fa_sortable_link.html.twig index 74237b0..32cd237 100644 --- a/templates/Pagination/bootstrap_v5_fa_sortable_link.html.twig +++ b/templates/Pagination/bootstrap_v5_fa_sortable_link.html.twig @@ -16,5 +16,5 @@ {% endif %} - {{ title }} + {{- title -}} diff --git a/templates/Pagination/bootstrap_v5_md_sortable_link.html.twig b/templates/Pagination/bootstrap_v5_md_sortable_link.html.twig index ae0eed5..2e6c48a 100644 --- a/templates/Pagination/bootstrap_v5_md_sortable_link.html.twig +++ b/templates/Pagination/bootstrap_v5_md_sortable_link.html.twig @@ -19,5 +19,5 @@ unfold_more {% endif %} - {{ title }} + {{- title -}} diff --git a/templates/Pagination/foundation_v6_pagination.html.twig b/templates/Pagination/foundation_v6_pagination.html.twig index cd8bb91..5cedc83 100644 --- a/templates/Pagination/foundation_v6_pagination.html.twig +++ b/templates/Pagination/foundation_v6_pagination.html.twig @@ -2,7 +2,6 @@ diff --git a/templates/Pagination/twitter_bootstrap_v4_font_awesome_sortable_link.html.twig b/templates/Pagination/twitter_bootstrap_v4_font_awesome_sortable_link.html.twig index 01bba8d..429f410 100644 --- a/templates/Pagination/twitter_bootstrap_v4_font_awesome_sortable_link.html.twig +++ b/templates/Pagination/twitter_bootstrap_v4_font_awesome_sortable_link.html.twig @@ -18,5 +18,5 @@ {% endif %} - {{ title }} + {{- title -}} diff --git a/templates/Pagination/twitter_bootstrap_v4_material_design_icons_sortable_link.html.twig b/templates/Pagination/twitter_bootstrap_v4_material_design_icons_sortable_link.html.twig index 4d8853e..d4880a7 100644 --- a/templates/Pagination/twitter_bootstrap_v4_material_design_icons_sortable_link.html.twig +++ b/templates/Pagination/twitter_bootstrap_v4_material_design_icons_sortable_link.html.twig @@ -21,5 +21,5 @@ unfold_more {% endif %} - {{ title }} + {{- title -}} diff --git a/templates/Pagination/uikit_v3_pagination.html.twig b/templates/Pagination/uikit_v3_pagination.html.twig index 6859946..3faf107 100644 --- a/templates/Pagination/uikit_v3_pagination.html.twig +++ b/templates/Pagination/uikit_v3_pagination.html.twig @@ -13,70 +13,69 @@ #} {% if pageCount > 1 %} + {% if next is defined %} +
  • + +
    • + {% else %} +
  • + {{ 'label_next'|trans({}, 'KnpPaginatorBundle') }} » +
    • + {% endif %} + {% endif %} diff --git a/templates/Pagination/uikit_v3_sortable.html.twig b/templates/Pagination/uikit_v3_sortable.html.twig index f030dc5..08d9f0a 100644 --- a/templates/Pagination/uikit_v3_sortable.html.twig +++ b/templates/Pagination/uikit_v3_sortable.html.twig @@ -18,5 +18,5 @@ {% endif %} -{{ title }} + {{- title -}} From ddb655e752040b663c32795ef06800ac6f35afd7 Mon Sep 17 00:00:00 2001 From: "Fabien S." Date: Fri, 14 Mar 2025 09:47:10 +0100 Subject: [PATCH 2/2] Revert indentation fixes --- .../foundation_v6_pagination.html.twig | 2 + .../Pagination/uikit_v3_pagination.html.twig | 97 ++++++++++--------- .../Pagination/uikit_v3_sortable.html.twig | 2 +- 3 files changed, 52 insertions(+), 49 deletions(-) diff --git a/templates/Pagination/foundation_v6_pagination.html.twig b/templates/Pagination/foundation_v6_pagination.html.twig index 5cedc83..cd8bb91 100644 --- a/templates/Pagination/foundation_v6_pagination.html.twig +++ b/templates/Pagination/foundation_v6_pagination.html.twig @@ -2,6 +2,7 @@ + {% if next is defined %} +
  • + +
    • + {% else %} +
  • + {{ 'label_next'|trans({}, 'KnpPaginatorBundle') }} » +
    • + {% endif %} + {% endif %} diff --git a/templates/Pagination/uikit_v3_sortable.html.twig b/templates/Pagination/uikit_v3_sortable.html.twig index 08d9f0a..04a33a8 100644 --- a/templates/Pagination/uikit_v3_sortable.html.twig +++ b/templates/Pagination/uikit_v3_sortable.html.twig @@ -18,5 +18,5 @@ {% endif %} - {{- title -}} +{{- title -}}