Merge pull request #403 from id-sk/idsk2TomasThur

Add languages in header web, add title in adress
id-sk · Oct 24, 2022 · c28e5bb · c28e5bb
2 parents e4792b5 + 88aa337
commit c28e5bb
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 29 deletions.
diff --git a/app/views/header-web/index.njk b/app/views/header-web/index.njk
@@ -14,18 +14,22 @@
                     text: "Slovenčina",
                     selected: true,
                     link: "#"
+                    language: "sk"
                 },
                 {
                     text: "Deutsch",
                     link: "#"
+                    language: "de"
                 },
                 {
                     text: "English",
                     link: "#"
+                    language: "en"
                 },
                 {
                     text: "Español",
                     link: "#"
+                    language: "es"
                 }
             ]
         },

diff --git a/app/views/komponenty/adresa.njk b/app/views/komponenty/adresa.njk
@@ -28,6 +28,7 @@
           {% set exampleComponentHtml %}
             {{ idskAddress({
               addressTitle: "Adresa podujatia",
+              title: 'Adresa podujatia',
               addressDescription: [
                 {
                   text: "Štefánikova 15"
@@ -63,6 +64,7 @@
           {% set exampleComponentHtml %}
             {{ idskAddress({
               heading: "Ministerstvo investícií, regionálneho rozvoja a informatizácie SR",
+              title: 'Adresa sídla',
               fullWidth: true,
               addressDescription: [
                 {
@@ -87,6 +89,7 @@
             {{ idskAddress({
               heading: "Ministerstvo investícií, regionálneho rozvoja a informatizácie SR",
               addressTitle: "Oddelenie behaviorálnych inovácií",
+              title: "Adresa sídla",
               fullWidth: true,
               addressDescription: [
                 {

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/idsk/components/address/address.yaml b/src/idsk/components/address/address.yaml
@@ -37,11 +37,15 @@ params:
         type: string
         required: false
         description: href link address
-
+  - name: title
+    type: string
+    required: true
+    description: text representing address
 examples:
   - name: ukážka 1
     data:
       addressTitle: Adresa podujatia
+      title: Adresa podujatia
       addressDescription:
         - text: Štefánikova 15
         - text: 811 05 Bratislava
@@ -53,6 +57,7 @@ examples:
     data:
       heading: Ministerstvo investícií, regionálneho rozvoja a informatizácie SR
       fullWidth: true
+      title: Adresa sídla
       addressDescription:
         - text: Štefánikova 15
         - text: 811 05 Bratislava
@@ -65,6 +70,7 @@ examples:
     data:
       heading: Ministerstvo investícií, regionálneho rozvoja a informatizácie SR
       addressTitle: Oddelenie behaviorálnych inovácií
+      title: Adresa sídla
       fullWidth: true
       addressDescription:
         - text: Štefánikova 15

diff --git a/src/idsk/components/address/template.njk b/src/idsk/components/address/template.njk
@@ -22,6 +22,7 @@
         </div>
         <iframe
             class="idsk-address__map"
+            title="{{params.title}}"
             loading="lazy"
             allowfullscreen
             src="{{ params.googleMapsLink }}">

diff --git a/src/idsk/components/header-web/header-web.yaml b/src/idsk/components/header-web/header-web.yaml
@@ -67,6 +67,10 @@ params:
             type: string
             required: false
             description: link to english mutation
+          - name: language
+            type: string
+            required: false
+            description: Set the language
   - name: main
     type: object
     required: true
@@ -244,12 +248,16 @@ examples:
           - text: "Slovenčina"
             selected: true,
             link: "#"
+            language: "sk"
           - text: "Deutsch"
             link: "#"
+            language: "de"
           - text: "English"
             link: "#"
+            language: "en"
           - text: "Español"
             link: "#"
+            language: "es"
       main:
         showLogo: true
         logoSrc: "logo-mirri-farebne.svg"
@@ -299,12 +307,16 @@ examples:
           - text: "Slovenčina"
             selected: true,
             link: "#"
+            language: "sk"
           - text: "Deutsch"
             link: "#"
+            language: "de"
           - text: "English"
             link: "#"
+            language: "en"
           - text: "Español"
             link: "#"
+            language: "es"
       main:
         showLogo: true
         logoSrc: "logo-mirri-farebne.svg"
@@ -357,12 +369,16 @@ examples:
           - text: "Slovenčina"
             selected: true,
             link: "#"
+            language: "sk"
           - text: "Deutsch"
             link: "#"
+            language: "de"
           - text: "English"
             link: "#"
+            language: "en"
           - text: "Español"
             link: "#"
+            language: "es"
       main:
         title: "Ministerstvo investícií"
         loginButton: true
@@ -378,12 +394,16 @@ examples:
           - text: "Slovenčina"
             selected: true,
             link: "#"
+            language: "sk"
           - text: "Deutsch"
             link: "#"
+            language: "de"
           - text: "English"
             link: "#"
+            language: "en"
           - text: "Español"
             link: "#"
+            language: "es"
       main:
         title: "Ministerstvo investícií"
         loginButton: true

diff --git a/src/idsk/components/header-web/template.njk b/src/idsk/components/header-web/template.njk
@@ -88,7 +88,9 @@
                 <li class="idsk-header-web__brand-language-list-item">
                   <a class="govuk-link idsk-header-web__brand-language-list-item-link {{ 'idsk-header-web__brand-language-list-item-link--selected' if language.selected }}"
                     title="{{ language.text }}"
-                    href="{{ language.link }}">
+                    href="{{ language.link }}"
+                    lang="{{language.language}}"
+                    >
                     {{ language.text }}
                   </a>
                 </li>
@@ -213,7 +215,7 @@
           {% elif main.loginButton %}
             <button class="idsk-button idsk-header-web__main-headline-menu-button idsk-header-web__main-headline-menu-button-service"
             aria-label="Rozbaliť menu" aria-expanded="false" data-text-for-show="Rozbaliť menu" data-text-for-hide="Zavrieť menu">
-              <img src="{{ params.assetsPath | default('/assets/images/header-web/') }}/profile.svg" alt="Electronic service menu icon">
+              <img src="{{ params.assetsPath | default('/assets/images/header-web/') }}/profile.svg" alt="Ikona elektronického servisného menu">
               <span class="idsk-header-web__menu-close"></span>
             </button>
           {% endif %}