Skip to content

B
bdk
Commit 8e641aaf authored by Florian Heder's avatar Florian Heder
Browse files
Options

Merge branch 'develop' into 'master' 

Develop

See merge request !1
parents 4b0c55e9 17abb83f
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 34 deletions
config/general.php
View file @ 8e641aaf
......@@ -30,4 +30,5 @@ return GeneralConfig::create()
->aliases([
'@webroot' => dirname(__DIR__) . '/web',
])
->maxUploadFileSize(33554432)
;
config/project/fields/deactivateLinking--e3f68a02-fa20-4a1b-b5dd-1b22cde27610.yaml 0 → 100644
View file @ 8e641aaf
columnSuffix: ddwlsptq
contentColumnType: string
fieldGroup: b6fcef38-d001-4b61-9d45-a1a088df18ba # Channel Types
handle: deactivateLinking
instructions: null
name: 'Deactivate Linking'
searchable: false
settings:
options:
-
__assoc__:
-
- label
- 'Yes'
-
- value
- 'yes'
-
- default
- ''
translationKeyFormat: null
translationMethod: none
type: craft\fields\Checkboxes
config/project/fields/videoLink--2e7ca1ae-5a2f-4f08-97a5-51b45ec3e855.yaml 0 → 100644
View file @ 8e641aaf
columnSuffix: sxkpjzpm
contentColumnType: string(255)
fieldGroup: b6fcef38-d001-4b61-9d45-a1a088df18ba # Channel Types
handle: videoLink
instructions: null
name: 'Video link'
searchable: false
settings:
maxLength: 255
types:
- url
translationKeyFormat: null
translationMethod: none
type: craft\fields\Url
templates/components/facts.twig
View file @ 8e641aaf
<h2>
{% if craft.app.language == 'de' %}
Facts zur Daseinsvorsorge
Facts zur Daseinsvorsorge
{% elseif craft.app.language == 'en' %}
Facts about Daseinsvorsorge
Facts about Daseinsvorsorge
{% endif %}</h2>
<div class="news mt16">
{% for newsElement in craft.entries.section('facts').limit(3) %}
{% set image = newsElement.teaserImage.one() %}
<div class="wm-card wm-card--m wm-card--linked" data-wm-card>
<h3 class="wm-card__heading ">
<a href="{{newsElement.url}}" class="wm-card__link wm-link--unstyled ">
{{newsElement.title}}
</a>
</h3>
<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 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>
<div class="wm-card__content wm-rich-text ">
{{ newsElement.teaser }}
......
templates/components/videos.twig
View file @ 8e641aaf
......@@ -8,14 +8,14 @@
</a>
</h3>
<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">
<img class="wm-image wm-card__image" loading="lazy" src="{{ craft.app.sites.primarySite.baseUrl}}/{{image.url}}" height="195"
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>
</div>
<div class="wm-card__content wm-rich-text ">
{{ newsElement.teaser }}
{{ newsElement.teaser }}
</div>
</div>
{% endfor %}
......
templates/facts/_entry.twig
View file @ 8e641aaf
......@@ -3,23 +3,27 @@
{% set baseurl = craft.app.sites.primarySite.baseUrl %}
{% set siteurl = currentSite.baseUrl %}
{% block content %}
<div class="mt32">
<div class="maxWidthLimit wm-rich-text">
<h1>{{entry.title}}</h1>
<div class="fact-filters wm-nav-tag__list mt16">
{% for thema in craft.entries.section('themen') %}
{% if thema.slug|t in entry.kategorien %}
<a id="{{thema.slug}}" href="{{siteurl}}facts?category={{thema.slug}}" class="wm-nav-tag__link" value="{{thema.slug}}">{{thema.title}}</a>
{% endif %}
{% endfor %}
</div>
<div class="wm-row mt32">
<div>{{entry.teaser}}</div>
<div><img class="wm-image wm-card__image" loading="lazy" src="{{ baseurl }}/{{image.url}}" width="350" height="197" data-src="" alt="Bildbeschreibung"></div>
</div>
<div class="wm-row column mt32">
{{entry.richText}}
<div class="mt32">
<div class="maxWidthLimit wm-rich-text">
<h1>{{entry.title}}</h1>
<div class="fact-filters wm-nav-tag__list mt16">
{% for thema in craft.entries.section('themen') %}
{% if (thema.slug|t(language="de") in entry.kategorien) %}
<a id="{{thema.slug}}" href="{{siteurl}}facts?category={{thema.slug}}" class="wm-nav-tag__link"
value="{{thema.slug}}">{{thema.title}}</a>
{% endif %}
{% endfor %}
</div>
<div class="wm-row mt32">
<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>
</div>
</div>
<div class="wm-row column mt32">
{{entry.richText}}
</div>
</div>
{% endblock %}
</div>
{% endblock %}
\ No newline at end of file
templates/facts/index.twig
View file @ 8e641aaf
......@@ -10,7 +10,7 @@
</h1>
<form class="fact-filters wm-nav-tag__list">
{% set allFilterEnabled = true %}
{% for thema in craft.entries.section('themen') %}
{% for thema in craft.entries.section('themen').orderBy('title') %}
{% if (category == thema.slug) or (category|t == thema.slug) %}
<button id="{{thema.slug}}" type="submit" class="wm-nav-tag__link" name="category" value="{{thema.slug}}"
disabled>{{thema.title}}</button>
......@@ -28,13 +28,16 @@
{% for entry in entries %}
{% set image = entry.images.one() %}
<div class="wm-card wm-card--m wm-card--linked" data-wm-card>
{% for ket in entry.kategorien %}
<span class="wm-badge wm-card__badge">{{ket.label|t}}</span>
{% endfor %}
<h3 class="wm-card__heading ">
{% if entry.videoLink %}
<a href="{{entry.videoLink}}" target="_blank" class="wm-card__link wm-link--unstyled ">
{{entry.title}}
</a>
{% else %}
<a href="{{entry.url}}" class="wm-card__link wm-link--unstyled ">
{{entry.title}}
</a>
{% endif %}
</h3>
<div class="wm-card__media ">
<img class="wm-image wm-card__image" loading="lazy" src="{{ baseurl }}/{{image.url}}" width="350" height="197" data-src=""
......@@ -44,9 +47,15 @@
<p>{{ entry.teaser}}</p>
</div>
<div>
{% if entry.videoLink %}
<a href="{{entry.videoLink}}" target="_blank" class="wm-em-link">
<span class="wm-em-link__content">{{ "Video ansehen"|t }}</span>
</a>
{% else %}
<a href="{{entry.url}}" class="wm-em-link">
<span class="wm-em-link__content">{{ "Mehr lesen"|t }}</span>
</a>
{% endif %}
</div>
</div>
{% endfor %}
......
templates/themen/index.twig
View file @ 8e641aaf
......@@ -4,15 +4,26 @@
<div class="news mt16 maxWidthLimit">
{% for newsElement in craft.entries.section('themen').all() %}
{% set image = newsElement.image.one() %}
<div class="wm-card wm-card--m wm-card--linked" data-wm-card>
<div class="wm-card wm-card--m" data-wm-card>
<h3 class="wm-card__heading ">
{% if newsElement.deactivateLinking.contains('yes') %}
{{newsElement.title}}
{% else %}
<a href="{{newsElement.url}}" class="wm-card__link wm-link--unstyled ">
{{newsElement.title}}
</a>
{% endif %}
</h3>
<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">
{% do image.setTransform({ height: 300 }) %}
{{ tag('img', {
src: image.url,
width: image.width,
height: image.height,
srcset: image.getSrcset(['1.5x', '2x', '3x']),
alt: image.title,
}) }}
</div>
<div class="wm-card__content wm-rich-text ">
{{ newsElement.teaser }}
......
web/assets/css/style.css
View file @ 8e641aaf
......@@ -577,7 +577,14 @@ iframe {
.wm-rich-text p {
margin-bottom: 16px;
}
.center-image {
display: flex;
justify-content: center;
}
.center-image img {
width: auto !important;
height: auto !important;
}
.mt32 {
margin-top: 32px;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment