EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2020.10-04'

Browse Source
This commit is contained in:
Björn Fromme
2020-10-14 15:37:09 +02:00
parent 22c62ef9da 4a7330de83
commit 0c91328ea2
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+5 -5
View File
@@ -1071,16 +1071,16 @@
}, },
{ {
"name": "helhum/typo3-console", "name": "helhum/typo3-console",
"version": "v5.8.5", "version": "v5.8.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/TYPO3-Console/TYPO3-Console.git", "url": "https://github.com/TYPO3-Console/TYPO3-Console.git",
"reference": "448a2ac57b9bb2f63af84256e7e84441e83fe1a9" "reference": "49dbcc9183b99878f8f8c91a51fc9dbf04b16f54"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/448a2ac57b9bb2f63af84256e7e84441e83fe1a9", "url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/49dbcc9183b99878f8f8c91a51fc9dbf04b16f54",
"reference": "448a2ac57b9bb2f63af84256e7e84441e83fe1a9", "reference": "49dbcc9183b99878f8f8c91a51fc9dbf04b16f54",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1171,7 +1171,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-04-23T09:35:12+00:00" "time": "2020-10-13T12:23:32+00:00"
}, },
{ {
"name": "helhum/typo3-console-plugin", "name": "helhum/typo3-console-plugin",
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Details.html
+1 -1
View File
@@ -2,7 +2,7 @@
<f:variable name="hotelTitle">{hotel.name -> f:format.raw()}{f:if(condition: hotel.categoryLabel, then: ' ({hotel.categoryLabel -> f:format.raw()})')}</f:variable> <f:variable name="hotelTitle">{hotel.name -> f:format.raw()}{f:if(condition: hotel.categoryLabel, then: ' ({hotel.categoryLabel -> f:format.raw()})')}</f:variable>
<f:if condition="{bars}"> <f:if condition="{bars}">
<f:then><div class="ep-headbar">{hotelTitle}</div></f:then> <f:then><div class="ep-headbar">{hotelTitle}</div></f:then>
<f:else><h2>{hotelTitle}</h2></f:else> <f:else><h1>{hotelTitle}</h1></f:else>
</f:if> </f:if>
<div class="hotel-details hotel-details--description"> <div class="hotel-details hotel-details--description">
{hotel.description -> f:format.html()} {hotel.description -> f:format.html()}
public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
+1 -1
View File
@@ -24,7 +24,7 @@
</f:if> </f:if>
<f:render partial="Detail/Opengraph" arguments="{newsItem: newsItem, settings:settings}" /> <f:render partial="Detail/Opengraph" arguments="{newsItem: newsItem, settings:settings}" />
</n:format.nothing> </n:format.nothing>
<h2 class="headline headline--primary headline--underlined" itemprop="headline">{newsItem.title}</h2> <h1 class="headline headline--primary headline--underlined" itemprop="headline">{newsItem.title}</h1>
<p class="blog-entry__info"> <p class="blog-entry__info">
<f:if condition="{newsItem.author}">{newsItem.author} am </f:if> <f:if condition="{newsItem.author}">{newsItem.author} am </f:if>
<time itemprop="datePublished" datetime="{f:format.date(date:newsItem.datetime, format:'Y-m-d')}"><f:format.date format="{f:translate(key:'dateFormat')}">{newsItem.datetime}</f:format.date></time> <time itemprop="datePublished" datetime="{f:format.date(date:newsItem.datetime, format:'Y-m-d')}"><f:format.date format="{f:translate(key:'dateFormat')}">{newsItem.datetime}</f:format.date></time>
public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/List.html
+8 -7
View File
@@ -8,13 +8,14 @@
<f:if condition="{news}"> <f:if condition="{news}">
<f:then> <f:then>
<f:if condition="{contentObjectData.header}"> <f:if condition="{contentObjectData.header}">
<h2 class="headline headline--primary headline--underlined{f:if(condition: tags, then: ' headline--has-subline')}"> <f:if condition="{tags.0}">
<f:if condition="{tags}"> <f:then>
<span class="headline__subline">{tags.0.title}</span> <h1 class="headline headline--primary headline--underlined">Blog: {tags.0.title}</h1>
<br> </f:then>
</f:if> <f:else>
{contentObjectData.header} <h1 class="headline headline--primary headline--underlined">Blog</h1>
</h2> </f:else>
</f:if>
</f:if> </f:if>
<f:if condition="{settings.hidePagination}"> <f:if condition="{settings.hidePagination}">
<f:then> <f:then>