Merge pull request #27 from minvws/feature/new-homepage

✨ [Feature] new homepage 🎉
minvws · Apr 21, 2021 · 414342c · 414342c
2 parents 3bba8b6 + 7accb47
commit 414342c
Show file tree

Hide file tree

Showing 218 changed files with 2,321 additions and 5,104 deletions.
diff --git a/_config.yml b/_config.yml
@@ -13,15 +13,15 @@ collections:
   questions-scanner-in-app:
     output: true
     permalink: /:categories/:name/
-  stories:
+  user-instructions:
     output: false
   scanner-instructions:
     output: false  
 
 sass:
+  style: compressed
   load_paths:
     - css
-    - css-rtl
 
 include:
   - .well-known

diff --git a/_data/translations.yml b/_data/translations.yml
@@ -1,4 +1,6 @@
 head-app-name: CoronaCheck
+
+scanner-app-name: CoronaCheck Scanner
 
 ## SOCIAL tags
 
@@ -102,7 +104,7 @@ header-skip-to-content:
   tr: Doğrudan içeriğe gidin
 
 header-title:
-  nl: CoronaCheck
+  nl: Ga naar een event met de CoronaCheck-app
   fy: CoronaCheck
   en: CoronaCheck
   ar: CoronaCheck
@@ -115,9 +117,9 @@ header-title:
   tr: CoronaCheck
 
 header-subtitle:
-  nl: Krijg toegang na testen
+  nl: Met de app kan je aantonen dat je negatief getest bent op corona. CoronaCheck wordt op dit moment getest tijdens de pilots testen voor toegang, kijk voor de actuele lijst op de <a href='https://www.rijksoverheid.nl/onderwerpen/coronavirus-covid-19/algemene-coronaregels/cijfers-en-onderzoeken-over-het-coronavirus/pilot-toegangsbewijzen' target='_blank' rel='noopener noreferrer'>pagina van de Rijksoverheid.</a>
   fy: 
-  en: Get tested, gain access
+  en: Get tested, gain access*
   ar: 
   bg: 
   de: 
@@ -414,6 +416,19 @@ faq-category-scanner-general:
   ro: 
   tr:  
 
+faq-category-scanner-testdocument:
+  nl: Toegang met testbewijs
+  fy: 
+  en: Toegang met testbewijs
+  ar: 
+  bg: 
+  de: 
+  es: 
+  fr: 
+  pl: 
+  ro: 
+  tr:  
+
 faq-category-scannerapp-privacy:
   nl: Privacy
   fy: 
@@ -454,9 +469,61 @@ faq-category-general:
   tr:
 
 faq-category-howtouse:
-  nl: Gebruik CoronaCheck
+  nl: Toegang met testbewijs
+  fy: 
+  en: Using CoronaCheck*
+  ar: 
+  bg: 
+  de: 
+  es: 
+  fr: 
+  pl: 
+  ro: 
+  tr:
+
+faq-category-usingtheapp:
+  nl: Testbewijs in de app
   fy: 
-  en: Using CoronaCheck
+  en: Using CoronaCheck*
+  ar: 
+  bg: 
+  de: 
+  es: 
+  fr: 
+  pl: 
+  ro: 
+  tr:
+
+faq-category-usingprintversion:
+  nl: Testbewijs op papier
+  fy: 
+  en: Using CoronaCheck*
+  ar: 
+  bg: 
+  de: 
+  es: 
+  fr: 
+  pl: 
+  ro: 
+  tr:
+
+faq-category-gettingtested:
+  nl: Testen
+  fy: 
+  en: Getting tested
+  ar: 
+  bg: 
+  de: 
+  es: 
+  fr: 
+  pl: 
+  ro: 
+  tr:
+
+faq-category-misc:
+  nl: Overig
+  fy: 
+  en: Miscellaneous
   ar: 
   bg: 
   de: 
@@ -519,7 +586,7 @@ layout-template-faq:
   tr: Sık sorulan sorulara dön
 
 layout-faq-btn:
-  nl: Bekijk alle meestgestelde vragen
+  nl: Bekijk alle vragen
   fy: Besjoch alle faakstelde fragen (Nederlânsk)
   en: All frequently asked questions
   ar: جميع الأسئلة المتكررة (الانجليزية)
@@ -567,17 +634,14 @@ coronacheck-lead-title:
   pl: Pobierz aplikację CoronaCheck
   ro: Descărcați aplicația CoronaCheck
   tr: CoronaCheck uygulamasını indirin
-
-coronacheck-announcement: |
-  Geen meldingen
 
 # info-caveat-fy: |
 #  De app wurket yn it Frysk allinne op Android tastellen dy’t Frysk as systeemtaal stypje. Do kinst Frysk as taal foar dy tastellen yn de ynstellingen fan Android ynstelle. iPhones stypje Frysk as systeemtaal spitigernôch net. Yn de oare talen kin yn de Appstore hjir de app wol delhelle wurde.
 
 # info-caveat-letop-fy: 'Tink derom:'
 
 scanner-lead: 
-  nl: "Dankzij CoronaCheck krijgen bezoekers toegang tot bepaalde sociale, culturele of sportieve activiteiten. Maar alleen als uit de coronatest blijkt dat zij geen corona hebben. Kijk op de <a href='https://www.rijksoverheid.nl/onderwerpen/coronavirus-covid-19/algemene-coronaregels/cijfers-en-onderzoeken-over-het-coronavirus/pilot-toegangsbewijzen?utm_campaign=coronavirus&utm_source=coronacheck.nl/nl/scanner' target='_blank' rel='noopener noreferrer'>pagina van de Rijksoverheid</a> om te zien welke pilots er in april worden gedaan met testen voor toegang."
+  nl: "Dankzij CoronaCheck krijgen bezoekers toegang tot bepaalde sociale, culturele of sportieve locaties. Maar alleen als uit de coronatest blijkt dat zij geen corona hebben. Kijk op de <a href='https://www.rijksoverheid.nl/onderwerpen/coronavirus-covid-19/algemene-coronaregels/cijfers-en-onderzoeken-over-het-coronavirus/pilot-toegangsbewijzen' target='_blank' rel='noopener noreferrer'>pagina van de Rijksoverheid</a> om te zien welke pilots er in april worden gedaan met testen voor toegang."
   fy: 
   en: 
   ar: 
@@ -602,10 +666,6 @@ scanner-lead-title:
   ro: Descărcați aplicația CoronaCheck Scanner
   tr: CoronaCheck Scanner uygulamasını indirin
 
-
-scanner-announcement: |
-  Geen meldingen
-
 coronacheck-app-store-url:
   nl: https://apps.apple.com/nl/app/coronacheck/id1548269870
   fy: 
@@ -746,17 +806,17 @@ footer-phone-opening-hours:
   tr: "Pazartesi - Pazar 08:00 - 20:00 "
 
 footer-phone-mail: 
-  nl: "Of stuur een e-mail naar: <a href='mailto:[email protected]'>[email protected]</a>"
-  fy: "Of stjoer in e-mail nei: <a href='mailto:[email protected]'>[email protected]</a>"
-  en: "Or send an e-mail to: <a href='mailto:[email protected]'>[email protected]</a>"
-  ar: "أو ارسل بريدًا الكترونيًا إلى: <a href='mailto:[email protected]'>[email protected]</a>"
-  bg: "Или изпрати имейл на <a href='mailto:[email protected]'>[email protected]</a>"
-  de: "Oder schicken Sie eine E-Mail an: <a href='mailto:[email protected]'>[email protected]</a>"
-  es: "O envía un correo a: <a href='mailto:[email protected]'>[email protected]</a>"
-  fr: "Ou envoyez un courriel à : <a href='mailto:[email protected]'>[email protected]</a>"
-  pl: "Lub wyślij wiadomość e-mail na adres: <a href='mailto:[email protected]'>[email protected]</a>"
-  ro: "Sau trimiteți un mesaj prin email la: <a href='mailto:[email protected]'>[email protected]</a>"
-  tr: "Veya şu adrese bir e-posta gönderin: <a href='mailto:[email protected]'>[email protected]</a>"
+  nl: "Of stuur een e-mail naar:"
+  fy: "Of stjoer in e-mail nei:"
+  en: "Or send an e-mail to:"
+  ar: "أو ارسل بريدًا الكترونيًا إلى:"
+  bg: "Или изпрати имейл на"
+  de: "Oder schicken Sie eine E-Mail an:"
+  es: "O envía un correo a:"
+  fr: "Ou envoyez un courriel à :"
+  pl: "Lub wyślij wiadomość e-mail na adres:"
+  ro: "Sau trimiteți un mesaj prin email la:"
+  tr: "Veya şu adrese bir e-posta gönderin:"
 
 footer-colophon: 
   nl: Colofon
@@ -835,6 +895,19 @@ footer-misc-title:
   pl: O CoronaCheck
   ro: Despre CoronaCheck
   tr: CoronaCheck hakkında
+
+footer-misc-title-scanner:
+  nl: Over CoronaCheck Scanner
+  fy: Oer CoronaCheck
+  en: About CoronaCheck
+  ar: حول CoronaCheck
+  bg: За CoronaCheck
+  de: Über CoronaCheck
+  es: Sobre CoronaCheck
+  fr: À propos de CoronaCheck
+  pl: O CoronaCheck
+  ro: Despre CoronaCheck
+  tr: CoronaCheck hakkında
 
 footer-contact-title:
   nl: Contact
@@ -848,6 +921,8 @@ footer-contact-title:
   pl: Kontakt
   ro: Contact
   tr: İletişim
+
+
 
 footer-logos-minvws-url: https://minvws.nl/
 footer-logos-minvws-img-alt: 
@@ -894,6 +969,7 @@ footer-logos-ggd-img-alt:
   tr: GGD Hollanda logosu
 
 footer-misc-privacy-url: privacy
+
 footer-misc-privacy:
   nl: Privacy
   fy: Privacyferklearring
@@ -907,6 +983,21 @@ footer-misc-privacy:
   ro: Confidențialitate
   tr: Gizlilik
 
+footer-misc-terms-of-service-url: gebruikersvoorwaarden
+
+footer-misc-terms-of-service:
+  nl: Gebruikersvoorwaarden
+  fy: 
+  en: Terms of Service
+  ar: الخصوصية
+  bg: Защита на личните данни
+  de: Datenschutz
+  es: Privacidad
+  fr: Confidentialité
+  pl: Prywatność
+  ro: Confidențialitate
+  tr: Gizlilik
+
 footer-misc-interoperability-url: interoperabiliteit
 footer-misc-interoperability:
   nl: Samenwerking CoronaCheck met andere landen
@@ -1125,7 +1216,7 @@ information-title:
   tr: 'Verilerinizi şu şekilde ele alıyoruz:'
 
 information-qrcode:
-  nl: In de QR-code staat alleen wanneer je negatief getest bent.
+  nl: In de QR-code staan minimale persoonsgegevens.
   fy: 
   en: Your QR code only says when you tested negative.
   ar: 
@@ -1391,4 +1482,38 @@ home-video-content_md:
   nl: Bekijk in 2 minuten wat CoronaCheck is, wat CoronaCheck doet en waarom de app belangrijk is.
   fy: Besjoch yn 2 minuten wat CoronaCheck is, wat CoronaCheck docht en wêrom’t de app wichtich is. (Nederlânsk)
   en: Find out in two-minutes what CoronaCheck is, what it does and what it can mean for you!
-
+
+user-instructions-title:
+  nl: Hoe werkt het?
+  fy: 
+  en: How does it work?
+
+print-version-title:
+  nl: Wil je een papieren testbewijs?
+  fy: 
+  en: 
+
+print-version-content:
+  nl: Vanaf vrijdag 23 april is het mogelijk om hier je papieren testbewijs te maken.
+  fy: 
+  en: 
+
+print-version-url: 
+  nl: /nl/print/
+  fy: 
+  en: 
+
+print-version-url-link: 
+  nl: Maak papieren testbewijs
+  fy: 
+  en: 
+
+about-coronacheck-title:
+  nl: Over CoronaCheck
+  fy: Oer CoronaCheck
+  en: About CoronaCheck
+
+about-coronacheck-content:
+  nl: <p>Met behulp van een testbewijs via de CoronaCheck-app of op papier toon je aan dat je kortgeleden negatief getest bent op corona. Zo kan Nederland meer buiten de deur doen.</p>
+  fy: 
+  en: 
diff --git a/_includes/components/about-coronacheck.html b/_includes/components/about-coronacheck.html
@@ -0,0 +1,16 @@
+<div class="about">
+  <div class="about__column-image">
+    <img
+      src="{{ site.baseurl }}/img/holder_qrcode_maken.svg"
+      alt=""
+      loading="lazy"
+      class="about__image"
+    >
+  </div>
+  <div class="about__column-content">
+      <h2 class="about__title">{{ site.data.translations.about-coronacheck-title[page.lang] }}</h2>
+
+      {{ site.data.translations.about-coronacheck-content[page.lang] }}
+  </div>
+  </div>
+
diff --git a/_includes/breadcrumbs.html → _includes/components/breadcrumbs.html b/_includes/breadcrumbs.html → _includes/components/breadcrumbs.html
diff --git a/_includes/coronacheck-badges.html → _includes/components/coronacheck-badges.html b/_includes/coronacheck-badges.html → _includes/components/coronacheck-badges.html
@@ -6,20 +6,20 @@ <h2>{{ site.data.translations.coronacheck-lead-title[page.lang] }}:</h2>
   <ul class="layout-app-badges">
     <li class="app_badge_column__left">
       <a class=" app-store" href="{{ site.data.translations.coronacheck-app-store-url[page.lang] }}">
-        <img src="{{ site.baseurl }}/img/{{ site.data.translations.badge-app-store-img[page.lang] }}" 
+        <img src="{{ site.baseurl }}/img/badges/{{ site.data.translations.badge-app-store-img[page.lang] }}" 
         alt="{{ site.data.translations.header-appstore[page.lang] }}" 
         height="65" width="196"
         />
       </a>
     </li>
     <li class="app_badge_column__right">
       <a class="play-store" href="{{ site.data.translations.coronacheck-google-play-url }}">
-        <img src="{{ site.baseurl }}/img/{{site.data.translations.badge-google-play-img[page.lang] }}" alt="{{ site.data.translations.header-googleplaystore[page.lang] }}" height="65" width="216" />
+        <img src="{{ site.baseurl }}/img/badges/{{site.data.translations.badge-google-play-img[page.lang] }}" alt="{{ site.data.translations.header-googleplaystore[page.lang] }}" height="65" width="216" />
       </a>
     </li>
     <li class="app_badge_column__right {% if include.huawei != 'true' %}huawei-only-show-mobile{% endif %}">
       <a class="huawei-store" href="{{ site.data.translations.coronacheck-huawei-url }}">
-        <img src="{{ site.baseurl }}/img/{{site.data.translations.badge-huawei-img[page.lang]  }}" alt="{{ site.data.translations.header-huaweiappgallery[page.lang] }}" height="65" width="216" />
+        <img src="{{ site.baseurl }}/img/badges/{{site.data.translations.badge-huawei-img[page.lang]  }}" alt="{{ site.data.translations.header-huaweiappgallery[page.lang] }}" height="65" width="216" />
       </a>
     </li>
   </ul>

diff --git a/_includes/demo-codes.html → _includes/components/demo-codes.html b/_includes/demo-codes.html → _includes/components/demo-codes.html
diff --git a/_includes/faq.html → _includes/components/faq.html b/_includes/faq.html → _includes/components/faq.html
@@ -12,21 +12,16 @@
 <section class="faq-homepage">
   <h2 class="faq-homepage__title" id="faq">{{ site.data.translations.faq[page.lang] }}</h2>
 
-  <div class="statements">
-
+  <div class="highlighted-faqs">
     {% for question in questions %}
 
-      <article class="statements__statement">
-        <div class="statement-summary">
-          <div class="statement-summary__icon">
-            {% include graphics/{{ question.featuredHomeIcon }}.svg  %}
-          </div>
-          <div class="statement__content">
+      <article class="highlighted-faq">
+        <div class="highlighted-faq__summary">
+          <div class="highlighted-faq__title">
             <h3>{{ question.title }}</h3>
-            <p>{{ question.featuredHomeText }}</p>
           </div>
-          <a href="{{ site.baseurl }}{{ question.url }}" class="statement-summary__btn-expand">
-            <span class="icon icon-chevron-right"></span>{{ site.data.translations.readmore[page.lang] }}
+          <a href="{{ site.baseurl }}{{ question.url }}" class="highlighted-faq__summary__btn-expand">
+            {{ site.data.translations.readmore[page.lang] }}
             <span class="screen-reader-text"> {{ site.data.translations.readmore-about_screen-reader[page.lang] }}: {{ question.title }}</span>
           </a>
         </div>
@@ -37,11 +32,11 @@ <h3>{{ question.title }}</h3>
 
   <p class="faq-homepage__more">
     {% if include.for == "coronacheck" %}
-      <a href="{{ langSlug }}faq" class="btn btn--color-secondary btn--large">
+      <a href="{{ langSlug }}faq" class="btn btn--large">
         {{ site.data.translations.layout-faq-btn[page.lang] }}<span class="icon icon-chevron-right"></span>
       </a>
     {% elsif include.for == "scanner" %}
-      <a href="{{ langSlug }}faq-scanner" class="btn btn--color-secondary btn--large">
+      <a href="{{ langSlug }}faq-scanner" class="btn btn--large">
         {{ site.data.translations.layout-faq-btn[page.lang] }}<span class="icon icon-chevron-right"></span>
       </a>
     {% endif %}

diff --git a/_includes/information.html → _includes/components/information.html b/_includes/information.html → _includes/components/information.html
diff --git a/_includes/language-picker.html → _includes/components/language-picker.html b/_includes/language-picker.html → _includes/components/language-picker.html