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

Merge branch 'release/2020.08-01'

Browse Source
This commit is contained in:
Björn Fromme
2020-08-03 20:08:55 +02:00
parent a8f372eddd d3993c14b5
commit add5becc7b
5 changed files with 284 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+261 -261
View File
File diff suppressed because it is too large Load Diff
public/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php
+1 -1
View File
@@ -66,7 +66,7 @@ class SliderProcessor implements DataProcessorInterface
$qb = $this->getDbConnection()->createQueryBuilder();
$query = $qb
->select('uid', 'headline', 'subline', 'button', 'page_uid')
->select('uid', 'headline', 'subline', 'button', 'page_uid', 'skipass')
->from('tx_eptheme_domain_model_slide')
->where('page = :pageUid')
->andWhere('deleted = 0')
public/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_slide.php
+20 -11
View File
@@ -23,37 +23,39 @@ return [
'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, headline, subline, button,
page_uid, image',
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, headline, subline, skipass,
button, page_uid, image',
],
'types' => [
'1' => [
'showitem' => 'hidden, headline, subline, --palette--;;linkbutton, image',
'showitem' => '--palette--;;top, --palette--;;headlines, --palette--;;linkbutton, image',
],
],
'palettes' => [
'top' => ['showitem' => 'hidden, skipass'],
'headlines' => ['showitem' => 'headline, subline'],
'linkbutton' => ['showitem' => 'button, page_uid'],
],
'columns' => [
'sys_language_uid' => [
'exclude' => 0,
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
'type' => 'select',
'renderType' => 'selectSingle',
'foreign_table' => 'sys_language',
'foreign_table_where' => 'ORDER BY sys_language.title',
'items' => [
['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
],
],
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 0,
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
'renderType' => 'selectSingle',
@@ -71,7 +73,7 @@ return [
],
't3ver_label' => [
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
'config' => [
'type' => 'input',
'size' => 30,
@@ -81,14 +83,14 @@ return [
'hidden' => [
'exclude' => 0,
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
'config' => [
'type' => 'check',
],
],
'starttime' => [
'exclude' => 0,
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
'config' => [
'type' => 'input',
'size' => 13,
@@ -106,7 +108,7 @@ return [
],
'endtime' => [
'exclude' => 0,
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
'config' => [
'type' => 'input',
'size' => 13,
@@ -155,6 +157,13 @@ return [
'eval' => 'trim'
],
],
'skipass' => [
'exclude' => 0,
'label' => 'Skipass Badge',
'config' => [
'type' => 'check',
],
],
'page_uid' => [
'exclude' => 0,
'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_slide.page_uid',
public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
+1 -1
View File
@@ -25,7 +25,7 @@
</f:if>
</div>
</div>
<f:if condition="{settings.showSkipassBadge}">
<f:if condition="{slide.skipass}">
<f:link.typolink parameter="{settings.skipassPageUid}" title="Skipass inklusive">
<f:image src="EXT:ep_theme/Resources/Public/images/badge_skipass.png"
alt="Skipass inklusive" class="herounit__badge herounit__badge--skipass" />
public/typo3conf/ext/ep_theme/ext_tables.sql
+1
View File
@@ -12,6 +12,7 @@ CREATE TABLE tx_eptheme_domain_model_slide
subline varchar(255) DEFAULT '' NOT NULL,
button varchar(255) DEFAULT '' NOT NULL,
page_uid varchar(255) DEFAULT '' NOT NULL,
skipass tinyint(4) unsigned DEFAULT '1' NOT NULL,
image int(11) unsigned NOT NULL default '0',
page int(11) unsigned DEFAULT '0',
sorting int(11) unsigned DEFAULT '0' NOT NULL,