Update epic event v2

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [3.0.0-beta8](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta8) (2022-02-07)
+
+[Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta7...3.0.0-beta8)
+
+**Closed issues:**
+
+- Navigation is displayed above the breadcrumb [\#1002](https://github.com/openeuropa/oe_theme/issues/1002)
+
+**Merged pull requests:**
+
+- EWPP-1888: Handle non-eu logos provided by ECL 3.2. [\#1011](https://github.com/openeuropa/oe_theme/pull/1011) ([yenyasinn](https://github.com/yenyasinn))
+- EWPP-1860: Prepending inpage nav ids with ref-. [\#1004](https://github.com/openeuropa/oe_theme/pull/1004) ([upchuk](https://github.com/upchuk))
+- EWPP-1854: Adapt HTML attributes to improve accessibility and behavior of the Logo link in header and footer. [\#1012](https://github.com/openeuropa/oe_theme/pull/1012) ([sergepavle](https://github.com/sergepavle))
+- EWPP-1585: Show calendar icon on the datepicker. [\#1010](https://github.com/openeuropa/oe_theme/pull/1010) ([yenyasinn](https://github.com/yenyasinn))
+- EWPP-1890: Update to ECL 3.2.0. [\#1008](https://github.com/openeuropa/oe_theme/pull/1008) ([22Alexandra](https://github.com/22Alexandra))
+- EWPP-1631: Contact "name" field should remain optional. [\#984](https://github.com/openeuropa/oe_theme/pull/984) ([yenyasinn](https://github.com/yenyasinn))
+- EPIC-EWPP-755-Highlighted [\#1005](https://github.com/openeuropa/oe_theme/pull/1005) ([22Alexandra](https://github.com/22Alexandra))
+- EWPP-1728: Define blocks for project results field group template. [\#992](https://github.com/openeuropa/oe_theme/pull/992) ([nagyad](https://github.com/nagyad))
+
 ## [3.0.0-beta7](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta7) (2021-12-06)
 
 [Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta6...3.0.0-beta7)

js/inpage_navigation.js

@@ -136,6 +136,13 @@
         return false;
       }
 
+      if (!slug[0].match("^[a-zA-Z]*$")) {
+        // In case the slug doesn't start with letters, append a string to
+        // ensure that the resulting slug is always a valid query selector.
+        slug = 'ref-' + slug;
+        originalSlug = slug;
+      }
+
       // If an element with the generated slug as ID already exists, mark the slug as seen.
       if (!this.seenIds.hasOwnProperty(slug) && document.querySelector('#' + slug)) {
         this.seenIds[slug] = 0;

modules/oe_theme_helper/tests/modules/oe_theme_inpage_navigation_test/templates/oe-theme-inpage-navigation-test-content.html.twig

@@ -45,4 +45,6 @@
   {# An element that will generate an ID that can represent a property of the Object prototype. #}
   <h3 class="heading">Length</h3>
 
+  <h3 class="heading">2022, a new year</h3>
+
 </div>

modules/oe_theme_helper/tests/src/FunctionalJavascript/InPageNavigationLibraryTest.php

@@ -66,7 +66,7 @@ public function testLibrary(): void {
     // container.
     // CSS selector uses "descendent-or-self" as prefix, so we need to use
     // XPath to exclude the container from the selection.
-    $this->assertCount(10, $container->findAll('xpath', '//*[@id]'));
+    $this->assertCount(11, $container->findAll('xpath', '//*[@id]'));
 
     $inner = $container->find('xpath', '/div[@data-inpage-navigation-source-area="h3"]');
     // Since an element with ID "details" already exists in the page, the
@@ -91,10 +91,12 @@ public function testLibrary(): void {
     // easier to assert the content.
     $this->assertEquals('Title with <strong>HTML tags</strong>', $container->find('xpath', '/h3[@id="title-with-html-tags"]')->getHtml());
 
-    // Last 3 assertions for the ID generation.
+    // Last 4 assertions for the ID generation.
     $this->assertEquals('strip--unwanted-characters', $container->find('css', '.strip')->getAttribute('id'));
     $this->assertEquals('constructor', $container->find('xpath', '/h3[@class="heading"][text()="Reserved keyword"]')->getAttribute('id'));
     $this->assertEquals('length', $container->find('xpath', '/h3[@class="heading"][text()="Length"]')->getAttribute('id'));
+    // The heading starting with a non-alpha character gets a ref- prepended.
+    $this->assertEquals('ref-2022-a-new-year', $container->find('xpath', '/h3[@class="heading"][text()="2022, a new year"]')->getAttribute('id'));
 
     $navigation = $assert_session->elementExists('css', '#block-inpage-navigation nav[data-ecl-inpage-navigation]');
     $assert = new InPageNavigationAssert();
@@ -137,6 +139,10 @@ public function testLibrary(): void {
           'label' => 'Length',
           'href' => '#length',
         ],
+        [
+          'label' => '2022, a new year',
+          'href' => '#ref-2022-a-new-year',
+        ],
       ],
     ];
     $assert->assertPattern($expected, $navigation->getOuterHtml());

modules/oe_theme_helper/translations/oe_theme_helper-bg.po

@@ -525,6 +525,18 @@ msgstr "защита на данните"
 msgid "Highlighted"
 msgstr "Акценти"
 
+msgid "European Union flag"
+msgstr "Знаме на Европейския съюз"
+
+msgid "European Commission logo"
+msgstr "Лого на Европейската комисия"
+
+msgid "Home"
+msgstr "Начало"
+
+msgid "European Union"
+msgstr "Европейски съюз"
+
 msgid "This event has been cancelled."
 msgstr "Тази проява е отменена."
 

modules/oe_theme_helper/translations/oe_theme_helper-cs.po

@@ -525,6 +525,18 @@ msgstr "ochrany údajů"
 msgid "Highlighted"
 msgstr "Důležité"
 
+msgid "European Union flag"
+msgstr "Vlajka Evropské unie"
+
+msgid "European Commission logo"
+msgstr "Logo Evropské komise"
+
+msgid "Home"
+msgstr "Úvod"
+
+msgid "European Union"
+msgstr "Evropská unie"
+
 msgid "This event has been cancelled."
 msgstr "Tato akce byla zrušena."
 

modules/oe_theme_helper/translations/oe_theme_helper-da.po

@@ -525,6 +525,18 @@ msgstr "databeskyttelse"
 msgid "Highlighted"
 msgstr "Fremhævet"
 
+msgid "European Union flag"
+msgstr "EU-flaget"
+
+msgid "European Commission logo"
+msgstr "Europa-Kommissionens logo"
+
+msgid "Home"
+msgstr "Forside"
+
+msgid "European Union"
+msgstr "Europæiske Unions"
+
 msgid "This event has been cancelled."
 msgstr "Dette arrangement er aflyst."
 

modules/oe_theme_helper/translations/oe_theme_helper-de.po

@@ -525,6 +525,18 @@ msgstr "Datenschutzbestimmungen"
 msgid "Highlighted"
 msgstr "Hervorgehoben"
 
+msgid "European Union flag"
+msgstr "Flagge der Europäischen Union"
+
+msgid "European Commission logo"
+msgstr "Logo der Europäischen Kommission"
+
+msgid "Home"
+msgstr "Startseite"
+
+msgid "European Union"
+msgstr "Europäische Union"
+
 msgid "This event has been cancelled."
 msgstr "Diese Veranstaltung wurde abgesagt."
 

modules/oe_theme_helper/translations/oe_theme_helper-el.po

@@ -525,6 +525,18 @@ msgstr "όρους προστασίας δεδομένων"
 msgid "Highlighted"
 msgstr "Με επισήμανση"
 
+msgid "European Union flag"
+msgstr "Σημαία της Ευρωπαϊκής Ένωσης"
+
+msgid "European Commission logo"
+msgstr "Λογότυπος της Ευρωπαϊκής Επιτροπής"
+
+msgid "Home"
+msgstr "Αρχική σελίδα"
+
+msgid "European Union"
+msgstr "Ευρωπαϊκή Ένωση"
+
 msgid "This event has been cancelled."
 msgstr "Η εκδήλωση αυτή έχει ματαιωθεί."
 

modules/oe_theme_helper/translations/oe_theme_helper-es.po

@@ -525,6 +525,18 @@ msgstr "condiciones de protección de datos"
 msgid "Highlighted"
 msgstr "Destacado"
 
+msgid "European Union flag"
+msgstr "Bandera de la Unión Europea"
+
+msgid "European Commission logo"
+msgstr "Logotipo de la Comisión Europea"
+
+msgid "Home"
+msgstr "Inicio"
+
+msgid "European Union"
+msgstr "Unión Europea"
+
 msgid "This event has been cancelled."
 msgstr "Este evento se ha cancelado."
 

modules/oe_theme_helper/translations/oe_theme_helper-et.po

@@ -525,6 +525,18 @@ msgstr "isikuandmete kaitse põhimõtetega"
 msgid "Highlighted"
 msgstr "Esiplaanil"
 
+msgid "European Union flag"
+msgstr "Euroopa Liidu lipp"
+
+msgid "European Commission logo"
+msgstr "Euroopa Komisjoni logo"
+
+msgid "Home"
+msgstr "Avaleht"
+
+msgid "European Union"
+msgstr "Euroopa Liit"
+
 msgid "This event has been cancelled."
 msgstr "See üritus on tühistatud."
 

modules/oe_theme_helper/translations/oe_theme_helper-fi.po

@@ -525,6 +525,18 @@ msgstr "tietosuojaselosteen"
 msgid "Highlighted"
 msgstr "Valokeilassa"
 
+msgid "European Union flag"
+msgstr "Euroopan unionin lippu"
+
+msgid "European Commission logo"
+msgstr "Euroopan komission logo"
+
+msgid "Home"
+msgstr "Etusivu"
+
+msgid "European Union"
+msgstr "Euroopan unioni"
+
 msgid "This event has been cancelled."
 msgstr "Tämä tapahtuma on peruutettu."
 

modules/oe_theme_helper/translations/oe_theme_helper-fr.po

@@ -525,6 +525,18 @@ msgstr "conditions relatives à la protection des données"
 msgid "Highlighted"
 msgstr "Mis en évidence"
 
+msgid "European Union flag"
+msgstr "Drapeau de l'Union européenne"
+
+msgid "European Commission logo"
+msgstr "Logo de la Commission européenne"
+
+msgid "Home"
+msgstr "Accueil"
+
+msgid "European Union"
+msgstr "Union européenne"
+
 msgid "This event has been cancelled."
 msgstr "Cet événement a été annulé."
 

modules/oe_theme_helper/translations/oe_theme_helper-ga.po

@@ -525,6 +525,18 @@ msgstr "téarmaí cosanta sonraí"
 msgid "Highlighted"
 msgstr "Aibhsithe"
 
+msgid "European Union flag"
+msgstr "Bratach an Aontais Eorpaigh"
+
+msgid "European Commission logo"
+msgstr "Lógó an Choimisiúin Eorpaigh"
+
+msgid "Home"
+msgstr "Baile"
+
+msgid "European Union"
+msgstr "Aontais Eorpaigh"
+
 msgid "This event has been cancelled."
 msgstr "Cuireadh an imeacht seo ar ceal."
 

modules/oe_theme_helper/translations/oe_theme_helper-hr.po

@@ -525,6 +525,18 @@ msgstr "uvjete zaštite podataka"
 msgid "Highlighted"
 msgstr "Istaknuto"
 
+msgid "European Union flag"
+msgstr "Zastava Europske unije"
+
+msgid "European Commission logo"
+msgstr "Logotip Europske komisije"
+
+msgid "Home"
+msgstr "Početak"
+
+msgid "European Union"
+msgstr "Europske unije"
+
 msgid "This event has been cancelled."
 msgstr "Ovo je događanje otkazano."
 

modules/oe_theme_helper/translations/oe_theme_helper-hu.po

@@ -525,6 +525,18 @@ msgstr "adatvédelmi nyilatkozatot,"
 msgid "Highlighted"
 msgstr "Előtérben"
 
+msgid "European Union flag"
+msgstr "Az Európai Unió zászlaja"
+
+msgid "European Commission logo"
+msgstr "Az Európai Bizottság logója"
+
+msgid "Home"
+msgstr "Kezdőlap"
+
+msgid "European Union"
+msgstr "Európai Unió"
+
 msgid "This event has been cancelled."
 msgstr "Ezt a rendezvényt törölték."
 

modules/oe_theme_helper/translations/oe_theme_helper-it.po

@@ -525,6 +525,18 @@ msgstr "condizioni relative alla protezione dei dati"
 msgid "Highlighted"
 msgstr "Evidenziato"
 
+msgid "European Union flag"
+msgstr "Bandiera dell'Unione europea"
+
+msgid "European Commission logo"
+msgstr "Logo della Commissione europea"
+
+msgid "Home"
+msgstr "Homepage"
+
+msgid "European Union"
+msgstr "Unione europea"
+
 msgid "This event has been cancelled."
 msgstr "L'evento è stato annullato."
 

modules/oe_theme_helper/translations/oe_theme_helper-lt.po

@@ -525,6 +525,18 @@ msgstr "Duomenų apsaugos sąlygas"
 msgid "Highlighted"
 msgstr "Paryškinta"
 
+msgid "European Union flag"
+msgstr "Europos Sąjungos vėliava"
+
+msgid "European Commission logo"
+msgstr "Europos Komisijos logotipas"
+
+msgid "Home"
+msgstr "Pradžios puslapis"
+
+msgid "European Union"
+msgstr "Europos Sąjunga"
+
 msgid "This event has been cancelled."
 msgstr "Renginys buvo atšauktas."
 

modules/oe_theme_helper/translations/oe_theme_helper-lv.po

@@ -525,6 +525,18 @@ msgstr "datu aizsardzības noteikumus"
 msgid "Highlighted"
 msgstr "Aktuāli"
 
+msgid "European Union flag"
+msgstr "Eiropas Savienības karogs"
+
+msgid "European Commission logo"
+msgstr "Eiropas Komisijas logotips"
+
+msgid "Home"
+msgstr "Sākumlapa"
+
+msgid "European Union"
+msgstr "Eiropas Savienība"
+
 msgid "This event has been cancelled."
 msgstr "Šis pasākums ir atcelts."
 

modules/oe_theme_helper/translations/oe_theme_helper-mt.po

@@ -525,6 +525,18 @@ msgstr "mat-termini tal-protezzjoni tad-data"
 msgid "Highlighted"
 msgstr "Enfasizzat"
 
+msgid "European Union flag"
+msgstr "Bandiera tal-Unjoni Ewropea"
+
+msgid "European Commission logo"
+msgstr "Logo tal-Kummissjoni Ewropea"
+
+msgid "Home"
+msgstr "Paġna ewlenija"
+
+msgid "European Union"
+msgstr "L-Unjoni Ewropea"
+
 msgid "This event has been cancelled."
 msgstr "Dan l-avveniment ġie kkanċellat."