[TASK] update repo from ftp

templates/components/element.twig

-<div class="component component__{{element.type}}  {% if element.backgroundColor==" grey" %} secondary-bg {% endif %}"
+<div class="component component__{{element.type}}  {% if element.backgroundColor==' grey' %} secondary-bg {% endif %}"
     id="{{element.label}}">
     <div class="{{element.maxWidthLimit}}">
         {% if element.headline %}
-        <div class="component_headline">
+        <div class="mb16">
             {{ element.headline }}
         </div>
         {% endif %}

templates/components/facts.twig

-<h2>
-    {% if craft.app.language == 'de' %}
-    Facts zur Daseinsvorsorge
-    {% elseif craft.app.language == 'en' %}
-    Facts about Daseinsvorsorge
-    {% endif %}</h2>
 <div class="news mt16">
     {% for newsElement in craft.entries.section('facts').limit(3) %}
     {% set image = newsElement.teaserImage.one() %}
@@ -14,9 +8,9 @@
                 {{newsElement.title}}
             </a>
         </h3>
-        <div class="wm-card__media center-image">
-            <img class="wm-image   wm-card__image" loading="lazy" src="{{ craft.app.sites.primarySite.baseUrl}}/{{image.url}}" height="195"
-                data-src="" alt="Bildbeschreibung">
+        <div class="wm-card__media ">
+            <img class="wm-image   wm-card__image" loading="lazy" src="{{ craft.app.sites.primarySite.baseUrl}}/{{image.url}}" width="350"
+                height="197" data-src="" alt="Bildbeschreibung">
         </div>
         <div class="wm-card__content wm-rich-text ">
             {{ newsElement.teaser }}

templates/components/footer.twig

@@ -4,8 +4,16 @@
         <ul class="wm-h-links--noline wm-u-mbxxs wm-list--reset wm-list--pipe-lg">
             <li><a href="{{links.impressum.one().url}}">{{links.impressum.one().title}}</a></li>
             <li><a href="{{links.datenschutz.one().url}}">{{links.datenschutz.one().title}}</a></li>
-            <li><a href="{{links.barrierefreiheit.one().url}}">{{links.barrierefreiheit.one().title}}</a></li>
         </ul>
-        <div>© Stadt Wien, Rathaus, A-1010 Wien</div>
+        <small>
+            {% if currentSite.language=="en" %}
+            Responsible for content: Office for Services of <br />
+            General Interest - City of Vienna <br />
+            &copy; City of Vienna, Rathaus, A-1010 Wien
+            {% else %}
+            Verantwortlich für Inhalte: Büro für Daseinsvorsorge und <br />
+            Kommunalwirtschaft der Stadt Wien<br />
+            &copy; Stadt Wien, Rathaus, A-1010 Wien
+            {% endif %}</small>
     </div>
 </footer>
\ No newline at end of file

templates/components/navigation.twig

@@ -6,9 +6,13 @@
         </a><a href="https://www.wien.gv.at/info/barrierefreiheit.html"
             class="wm-btn wm-btn--small wm-btn--i js-wm-skip-link">Barrierefreiheit auf wien.gv.at</a></div>
     <div class="wm-site-header__inner">
-        <div class="wm-site-header__title"><a href="/" class="wm-link--unstyled">BDK</a></div><span class="wm-site-header__logo"><a
-                class="wm-site-header__logo-link" href="/"><span class="wm-h-vh">Startseite
-                    wien.gv.at</span> <img src="{{asseturl}}/assets/logo.png"></a></span>
+        <div class="wm-site-header__title"><a href="{{baseurl}}" class="wm-link--unstyled">{{ "Daseinsvorsorge in Wien" |t }}</a></div><span
+            class="wm-site-header__logo"><a class="wm-site-header__logo-link" href="/"><span class="wm-h-vh">Startseite
+                    wien.gv.at</span>
+                {% if currentSite.language=="en" %} <img src="{{companyInfo.logoen.one().url}}">
+                {% else %} <img src="{{companyInfo.logo.one().url}}">
+                {% endif %}
+            </a></span>
     </div>
     <div data-wm-nav-main-wrapper="" class="wm-nav-wrapper wm-nav-wrapper--h wm-nav-wrapper--nebelgrau">
         <div class="wm-nav-wrapper__inner wm-nav-wrapper__inner--h">

templates/components/videos.twig

@@ -8,8 +8,8 @@
             </a>
         </h3>
         <div class="wm-card__media ">
-            <img class="wm-image   wm-card__image" loading="lazy" src="{{ craft.app.sites.primarySite.baseUrl}}/{{image.url}}" height="195"
-                data-src="" alt="Bildbeschreibung">
+            <img class="wm-image   wm-card__image" loading="lazy" src="{{ craft.app.sites.primarySite.baseUrl}}/{{image.url}}" width="350"
+                height="197" data-src="" alt="Bildbeschreibung">
             <svg class="wm-icon wm-card__icon" width="60" height="60" aria-hidden="true" focusable="false">
                 <use xlink:href="/assets/icons/sprite.symbol.svg#play"></use>
             </svg>

templates/facts/_entry.twig

@@ -18,7 +18,7 @@
 			<div>{{entry.teaser}}</div>
 			<div><img class="wm-image wm-card__image" loading="lazy" src="{{ baseurl }}/{{image.url}}" height="200" data-src=""
 					alt="Bildbeschreibung">
-				<figcaption>{{image.caption}}</figcaption>
+				{% if image.caption %}<figcaption>{{image.caption}}</figcaption>{% endif %}
 			</div>
 		</div>
 		<div class="wm-row column mt32">

templates/facts/index.twig

 {% extends "index" %}
 {% set baseurl = craft.app.sites.primarySite.baseUrl %}
+{% set title = "Downloads" %}
 {% block content %}
 <div class="maxWidthLimit">
 	{% set category = craft.app.request.param('category') %}
 	{% set factsQuery = craft.entries().section('facts').kategorien(category|t(language="de")) %}
 
 	<h1 class="mt32">
-		{{ "Facts"|t }}
+		{{ "Downloads"|t }}
 	</h1>
 	<form class="fact-filters wm-nav-tag__list">
 		{% set allFilterEnabled = true %}

templates/index.twig

@@ -6,13 +6,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% if title is defined %}{{ title }} -
         {% elseif entry.title is defined %}{{ entry.title }} - {% endif %}Daseinsvorsorge</title>
-
+    </title>
     <link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
     {% css "/assets/css/style.css" %}
     {% css "/assets/css/main.css" %}
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.css" />
 
-
     <!-- TRUENDO Privacy Center -->
     <script id="truendoAutoBlock" type="text/javascript" src="https://cdn.priv.center/pc/truendo_cmp.pid.js"
         data-siteid="2e825ab9-e7e6-468f-b48d-5f34675f33d9"></script><!-- End TRUENDO Privacy Center -->
@@ -32,6 +31,21 @@
 
     <script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
     {% js "@web/assets/js/menu.js" %}
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function () {
+            var u = "https://stats.wh-i.at/";
+            _paq.push(['setTrackerUrl', u + 'matomo.php']);
+            _paq.push(['setSiteId', '29']);
+            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+            g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
 </body>
 
 </html>
\ No newline at end of file

templates/themen/index.twig

 {% extends "index" %}
+{% if craft.app.language == 'de' %}
+{% set title = "Themen" %}
+{% elseif craft.app.language == 'en' %}
+{% set title = "Topics" %}
+{% endif %}
 {% block content %}
 <h1 class="maxWidthLimit mt32">{% if craft.app.language == 'de' %}Themen{% elseif craft.app.language == 'en' %}Topics{% endif %}</h1>
 <div class="news mt16 maxWidthLimit">

translations/en/app.php

@@ -4,7 +4,7 @@ return [
     'field.kategorien.option.abfallwirtschaftundentsorgung.label' => 'Wastemanagement- and Disposal',
     'field.kategorien.option.bildung.label' => 'Education',
     'field.kategorien.option.digitalisierung.label' => 'Digitalization',
-    'Abfall' => 'Waste',
+    'Abfallwirtschaft' => 'Wastemanagement',
     'Digitalisierung' => 'digitalization',
     'Bildung' => 'education',
     'Impressum' => 'Legal notice',

translations/en/site.php

@@ -4,10 +4,18 @@ return [
     'field.kategorien.option.abfallwirtschaftundentsorgung.label' => 'Wastemanagement- and Disposal',
     'field.kategorien.option.bildung.label' => 'Education',
     'field.kategorien.option.digitalisierung.label' => 'Digitalization',
-    'abfallwirtschaftundentsorgung' => 'wastemanagementanddisposal',
-    'digitalisierung' => 'digitalization',
+    'abfallwirtschaft' => 'wastemanagement',
+    'wastemanagement' => "abfallwirtschaft",
     'bildung' => 'education',
-    'abfallwirtschaftundentsorgung' => 'wastemanagementanddisposal',
+    'digitalisierung' => 'digitalization',
+    'energieversorgung' => 'energysupply',
+    'freizeit' => 'leisure',
+    'gesundheitsversorgungundsoziales' => 'healthcareandsocialaffairs',
+    'kunstundkultur' => 'artandculture',
+    'mobilität' => 'mobility',
+    'wasserversorgung' => 'watersupplyandwastewaterdisposal',
+    'wohnen' => 'housing',
+    'Abfallwirtschaftundentsorgung' => 'wastemanagementanddisposal',
     'Abfall' => 'Waste',
     'Digitalisierung' => 'Digitalization',
     'Bildung' => 'Education',