From 138ae3c923b63784eb0899cb8b1bf18977229cbf Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 13:31:38 +0200 Subject: [PATCH 1/4] 1353: Use local i2svg replace. Update icons. Add missing. --- .../custom/hoeringsportal/assets/js/icons.js | 65 +++++++++++++------ .../node--citizen-proposal--teaser.html.twig | 2 +- .../content/node--list-display.html.twig | 2 +- .../node--project-main-page--teaser.html.twig | 2 +- .../node--public-meeting--teaser.html.twig | 4 +- .../node--static-page--teaser.html.twig | 2 +- .../templates/content/node--teaser.html.twig | 6 +- ...ock-field--node-project-timeline.html.twig | 2 +- ...field--field-itk-media-mime-type.html.twig | 2 +- ...ield--node--field-video--project.html.twig | 2 +- ...al-link--projekt-billede-galleri.html.twig | 2 +- .../form/form--search-block-form.html.twig | 4 +- .../templates/layout/html.html.twig | 2 - .../misc/itk-pretix-date-entry.html.twig | 2 +- .../templates/navigation/pager.html.twig | 8 +-- .../newsletter-bottom-link.html.twig | 2 +- ...-project-main-page--list-display.html.twig | 2 +- 17 files changed, 66 insertions(+), 45 deletions(-) diff --git a/web/themes/custom/hoeringsportal/assets/js/icons.js b/web/themes/custom/hoeringsportal/assets/js/icons.js index 4afa1a32e..764b5b694 100644 --- a/web/themes/custom/hoeringsportal/assets/js/icons.js +++ b/web/themes/custom/hoeringsportal/assets/js/icons.js @@ -3,50 +3,73 @@ */ // Import the svg core -import { library } from '@fortawesome/fontawesome-svg-core' +import { library, dom } from '@fortawesome/fontawesome-svg-core' // To keep the package size as small as possible we only import icons we use // Import the icons from the free solid package. import { - faSort, + faArrowRight, + faCopy, + faComment, + faCircleCheck, + faFilePdf, faEnvelope, - faSearch, + faMagnifyingGlass, + faPrint, + faSort, faTimes, - faCopy, - faPrint + faCircle, + faFileWord, + faFileAlt, + faFileImage, + faFileExcel, + faTicketAlt, } from '@fortawesome/free-solid-svg-icons' // Import icons from the free brands package import { + faDigg, + faEvernote, faFacebook, - faXTwitter, - faLinkedin, - faWhatsapp, faFacebookMessenger, + faLinkedin, faPinterest, - faDigg, - faTumblr, faReddit, - faEvernote + faTumblr, + faWhatsapp, + faXTwitter, } from '@fortawesome/free-brands-svg-icons' // Add the icons to the library for replacing with the intended svg. library.add( - faSort, + // Solid + faArrowRight, + faCircle, + faCircleCheck, + faComment, + faCopy, faEnvelope, - faSearch, + faFilePdf, + faFileWord, + faFileAlt, + faFileImage, + faFileExcel, + faMagnifyingGlass, + faPrint, + faSort, faTimes, + faTicketAlt, + //Brand + faDigg, + faEvernote, faFacebook, - faXTwitter, - faLinkedin, - faWhatsapp, faFacebookMessenger, + faLinkedin, faPinterest, - faDigg, - faTumblr, faReddit, - faEvernote, - faCopy, - faPrint + faTumblr, + faWhatsapp, + faXTwitter, ) +dom.i2svg(); diff --git a/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig index 26cc68224..10ab18d9e 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig @@ -92,7 +92,7 @@ {{ content.field_author_name }} - + diff --git a/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig index d4dbb7633..37d869e41 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig @@ -105,7 +105,7 @@ {% if (content.field_hearing_id) %} {{ content.field_hearing_id }} {% endif %} - + diff --git a/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig index 7e55130eb..c25fcab18 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig @@ -14,6 +14,6 @@ {{ content.field_project_category }} {{ content.field_area }} - + diff --git a/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig index 1261020ad..6a955d8fd 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig @@ -91,7 +91,7 @@
{{ enddate|date('M')|t }}
{% elseif (content_state == 'finished') %}
{{ 'Finished'|t }}
-
+
{% set overlay = 'TRUE' %} {% set overlay_text = 'Finished'|t %} @@ -132,6 +132,6 @@ {% endif %} {{ content.field_area }} - + diff --git a/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig index 0bdbe9975..30b153c92 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig @@ -76,6 +76,6 @@ set classes = [

{{ label }}

{{ content }}

- +
diff --git a/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig index bb3498fa1..4b215e379 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig @@ -102,7 +102,7 @@ {% set overlay_text_color = 'text-orange' %} {% elseif (content_state == 'finished') %}
{{ 'Finished'|t }}
-
+
{% set overlay = 'TRUE' %} {% set overlay_text = 'Finished'|t %} @@ -119,7 +119,7 @@ {% set ticket_count = deskpro_get_ticket_count(node) %} {% if ticket_count > 0 %}
- {{ ticket_count }} + {{ ticket_count }}
{% endif %} @@ -152,6 +152,6 @@ {% endif %} {{ content.field_area }} - + diff --git a/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig index c3cfaaf4e..95964732a 100755 --- a/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig @@ -83,7 +83,7 @@
{% for term in timeline_terms %} -
{{ term.name }}
+
{{ term.name }}
{% endfor %}
diff --git a/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig index e3a5c26f8..538e81abd 100644 --- a/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig @@ -52,5 +52,5 @@ {% for item in items %} {% set icon = mime_type_icons[item.content['#context'].value]|default('fa-file') %} - + {% endfor %} diff --git a/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig index 4d107ae31..bbbfef4f5 100755 --- a/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig @@ -42,7 +42,7 @@ {% for key, item in items %}
- + {{ item.content }}
diff --git a/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig index 4f69c636b..b37f82a68 100755 --- a/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig @@ -47,7 +47,7 @@ {% for item in items %}
-

+

{{ 'Open project gallery'|t }}

 diff --git a/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig b/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig index 9033469e1..f0bb549c6 100644 --- a/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig +++ b/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig @@ -19,7 +19,7 @@
@@ -27,7 +27,7 @@ {{ children }}
diff --git a/web/themes/custom/hoeringsportal/templates/layout/html.html.twig b/web/themes/custom/hoeringsportal/templates/layout/html.html.twig index c92d050d5..737e4d4be 100755 --- a/web/themes/custom/hoeringsportal/templates/layout/html.html.twig +++ b/web/themes/custom/hoeringsportal/templates/layout/html.html.twig @@ -31,8 +31,6 @@ - - {# diff --git a/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig b/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig index a22bf81f3..fc9ba48cd 100644 --- a/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig +++ b/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig @@ -16,7 +16,7 @@ {% set availability = public_meeting_helper.getPretixAvailability(variables.data) %} - + {{ variables.location }} {{ variables.time_from|date('U')|format_date('hoeringsportal_date_long') }} {{ variables.time_from|date('U')|format_date('hoeringsportal_time') }}–{{ variables.time_to|date('U')|format_date('hoeringsportal_time') }} diff --git a/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig b/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig index 770a7b95e..9994357a1 100755 --- a/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig +++ b/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig @@ -35,24 +35,24 @@ {% if items.previous %}
    • {% else %}
  • - {{ 'Previous'|t }} + {{ 'Previous'|t }}
    • {% endif %}
  • {{ 'Page'|t }} {{ current }} / {{ items.pages|length }}
    • {% if items.next %}
    • {% else %}
  • - {{ 'Next'|t }} + {{ 'Next'|t }}
    • {% endif %} diff --git a/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig b/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig index 1cf68dc5b..ec0610535 100644 --- a/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig +++ b/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig @@ -1,5 +1,5 @@ From 4811ee648a675e7c1e2ac41512bcd86be3a80982 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 13:38:12 +0200 Subject: [PATCH 2/4] 1353: Changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8195359b7..404571eed 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* [PR-407](https://github.com/itk-dev/hoeringsportal/pull/407) + Fix fontawesome issues * [PR-406](https://github.com/itk-dev/hoeringsportal/pull/406) Infobox styling * [PR-405](https://github.com/itk-dev/hoeringsportal/pull/405) From 92a0b0c07393a6acf58e49bf6a479949116685f8 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 13:40:56 +0200 Subject: [PATCH 3/4] 1353: Apply coding standards --- web/themes/custom/hoeringsportal/assets/js/icons.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/themes/custom/hoeringsportal/assets/js/icons.js b/web/themes/custom/hoeringsportal/assets/js/icons.js index 764b5b694..9708d1d92 100644 --- a/web/themes/custom/hoeringsportal/assets/js/icons.js +++ b/web/themes/custom/hoeringsportal/assets/js/icons.js @@ -24,7 +24,7 @@ import { faFileAlt, faFileImage, faFileExcel, - faTicketAlt, + faTicketAlt } from '@fortawesome/free-solid-svg-icons' // Import icons from the free brands package @@ -38,7 +38,7 @@ import { faReddit, faTumblr, faWhatsapp, - faXTwitter, + faXTwitter } from '@fortawesome/free-brands-svg-icons' // Add the icons to the library for replacing with the intended svg. @@ -60,7 +60,7 @@ library.add( faSort, faTimes, faTicketAlt, - //Brand + // Brand faDigg, faEvernote, faFacebook, @@ -70,6 +70,6 @@ library.add( faReddit, faTumblr, faWhatsapp, - faXTwitter, + faXTwitter ) -dom.i2svg(); +dom.i2svg() From f7ec9cb506a7cb0f45176f55b4f4cde3b2908d00 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 14:13:34 +0200 Subject: [PATCH 4/4] 1353: Remove duplicate id on navigation --- .../templates/block/block--system-menu-block.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig b/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig index cef0d359f..36148442d 100755 --- a/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig +++ b/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig @@ -32,7 +32,7 @@ */ #} {% set heading_id = attributes.id ~ '-menu'|clean_id %} -
    +
    {# Label. If not displayed, we still provide it for screen readers. #} {% if not configuration.label_display %} {% set title_attributes = title_attributes.addClass('visually-hidden') %}