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

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2022-08-22 16:33:25 +02:00
parent 440d3f2df4 23d5f7f008
commit d05d2d7132
5 changed files with 126 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Domain/Model/Concept.php
+22
View File
@@ -90,6 +90,11 @@ class Concept extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements
*/ */
protected $headerImages; protected $headerImages;
/**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
*/
protected $images;
/** /**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EP\EpProducts\Domain\Model\Product> * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EP\EpProducts\Domain\Model\Product>
*/ */
@@ -110,6 +115,7 @@ class Concept extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements
$this->products = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage(); $this->products = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
$this->teaserImages = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage(); $this->teaserImages = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
$this->headerImages = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage(); $this->headerImages = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
$this->images = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
} }
/** /**
@@ -326,6 +332,22 @@ class Concept extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements
$this->headerImages = $headerImages; $this->headerImages = $headerImages;
} }
/**
* @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage
*/
public function getImages()
{
return $this->images;
}
/**
* @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $images
*/
public function setImages($images)
{
$this->images = $images;
}
/** /**
* @param \EP\EpProducts\Domain\Model\Product $product * @param \EP\EpProducts\Domain\Model\Product $product
*/ */
public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php
+50 -1
View File
@@ -25,7 +25,7 @@ return [
'types' => [ 'types' => [
'1' => [ '1' => [
'showitem' => '--palette--;;top, --palette--;;naming, --palette--;;header, teaser, description, description_extended, 'showitem' => '--palette--;;top, --palette--;;naming, --palette--;;header, teaser, description, description_extended,
--div--;Bilder/Dateien, teaser_images, header_images', --div--;Bilder/Dateien, teaser_images, header_images, images',
], ],
], ],
'palettes' => [ 'palettes' => [
@@ -310,6 +310,55 @@ return [
], ],
$GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
), ),
],
'images' => [
'exclude' => 0,
'label' => 'Galeriebilder',
'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
'images',
[
'appearance' => [
'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
],
'overrideChildTca' => [
'types' => [
\TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
'showitem' => '
--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
--palette--;;filePalette',
],
],
'columns' => [
'crop' => [
'config' => [
'cropVariants' => [
'default' => [
'title' => 'Preview',
'allowedAspectRatios' => [
'preview' => [
'title' => 'Standard',
'value' => 1.8,
],
],
],
'zoom' => [
'title' => 'Zoom',
'allowedAspectRatios' => [
'free' => [
'title' => 'frei',
'value' => 'NaN',
],
],
],
],
],
],
],
],
'maxitems' => 10
],
$GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
),
], ],
'products' => [ 'products' => [
'exclude' => 0, 'exclude' => 0,
public/typo3conf/ext/ep_products/ext_tables.sql
+1
View File
@@ -529,6 +529,7 @@ CREATE TABLE tx_epproducts_domain_model_concept
header_subtitle varchar(255) DEFAULT '' NOT NULL, header_subtitle varchar(255) DEFAULT '' NOT NULL,
teaser_images int(11) unsigned NOT NULL default '0', teaser_images int(11) unsigned NOT NULL default '0',
header_images int(11) unsigned NOT NULL default '0', header_images int(11) unsigned NOT NULL default '0',
images int(11) unsigned NOT NULL default '0',
tstamp int(11) unsigned DEFAULT '0' NOT NULL, tstamp int(11) unsigned DEFAULT '0' NOT NULL,
crdate int(11) unsigned DEFAULT '0' NOT NULL, crdate int(11) unsigned DEFAULT '0' NOT NULL,
public/typo3conf/ext/ep_theme/Classes/Domain/Repository/PageRepository.php
+2 -1
View File
@@ -26,7 +26,8 @@ class PageRepository extends Repository
; ;
$query->matching($query->logicalAnd([ $query->matching($query->logicalAnd([
$query->equals('pid', $pid), $query->equals('pid', $pid),
$query->equals('doktype', CorePageRepository::DOKTYPE_DEFAULT) $query->equals('doktype', CorePageRepository::DOKTYPE_DEFAULT),
$query->equals('navHide', false),
])); ]));
return $query->execute(); return $query->execute();
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
+50 -38
View File
@@ -18,32 +18,33 @@
{concept.description -> f:format.html()} {concept.description -> f:format.html()}
</div> </div>
<f:if condition="{teasers}"> <f:if condition="{teasers}">
<a class="anchor" id="teasers"></a> <f:then>
<div class="bg-zinc-50 p-4 mb-4" <a class="anchor" id="teasers"></a>
data-controller="teasergrid" <div class="bg-zinc-50 p-4 mb-4"
data-teasergrid-grid-class="grid-cols-2" data-controller="teasergrid"
data-teasergrid-disabled-value="false"> data-teasergrid-grid-class="grid-cols-2"
<div class="flex items-center space-x-1 mb-2 sm:hidden"> data-teasergrid-disabled-value="false">
<button type="button" <div class="flex items-center space-x-1 mb-2 sm:hidden">
class="opacity-50" <button type="button"
data-action="teasergrid#grid" class="opacity-50"
data-teasergrid-target="button"> data-action="teasergrid#grid"
<svg class="w-5 h-5 text-ep-primary"> data-teasergrid-target="button">
<use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-grid"></use> <svg class="w-5 h-5 text-ep-primary">
</svg> <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-grid"></use>
</button> </svg>
<button type="button" </button>
data-action="teasergrid#block" <button type="button"
data-teasergrid-target="button"> data-action="teasergrid#block"
<svg class="w-5 h-5 text-ep-primary"> data-teasergrid-target="button">
<use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-single"></use> <svg class="w-5 h-5 text-ep-primary">
</svg> <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-single"></use>
</button> </svg>
</div> </button>
<div class="grid grid-cols-2 xl:grid-cols-3 gap-4 md:gap-8" </div>
data-teasergrid-target="container"> <div class="grid grid-cols-2 xl:grid-cols-3 gap-4 md:gap-8"
<f:for each="{teasers}" as="teaser" iteration="iteration"> data-teasergrid-target="container">
<f:render partial="Product/Teaser" section="Teaser" arguments="{ <f:for each="{teasers}" as="teaser" iteration="iteration">
<f:render partial="Product/Teaser" section="Teaser" arguments="{
concept: teaser.concept, concept: teaser.concept,
hotel: teaser.hotel, hotel: teaser.hotel,
product: teaser.product, product: teaser.product,
@@ -60,26 +61,37 @@
dateTo: dateTo, dateTo: dateTo,
index: iteration.index index: iteration.index
}"/> }"/>
</f:for> </f:for>
</div>
<f:if condition="{settings.hideMoreLink}">
<f:else>
<div class="text-right mt-4">
<f:link.typolink class="button bg-button"
parameter="{settings.defaultSearchPageUid}"
additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}">
Alle anzeigen
</f:link.typolink>
</div>
</f:else>
</f:if>
</div> </div>
<f:if condition="{settings.hideMoreLink}"> </f:then>
<f:else> <f:else>
<div class="text-right mt-4"> <f:if condition="{concept.images -> f:count()} > 0">
<f:link.typolink class="button bg-button" <f:render partial="ImageGallery" arguments="{images: concept.images, id: 'concept-{concept.uid}', thumbnails: 1}"/>
parameter="{settings.defaultSearchPageUid}"
additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}">
Alle anzeigen
</f:link.typolink>
</div>
</f:else>
</f:if> </f:if>
</div> </f:else>
</f:if> </f:if>
<f:if condition="{concept.descriptionExtended}"> <f:if condition="{concept.descriptionExtended}">
<div data-rte-content> <div data-rte-content>
{concept.descriptionExtended -> f:format.html()} {concept.descriptionExtended -> f:format.html()}
</div> </div>
</f:if> </f:if>
<f:if condition="{teasers}">
<f:if condition="{concept.images -> f:count()} > 0">
<f:render partial="ImageGallery" arguments="{images: concept.images, id: 'concept-{concept.uid}', thumbnails: 1}"/>
</f:if>
</f:if>
</div> </div>
<div class="col-span-3 lg:col-span-1"> <div class="col-span-3 lg:col-span-1">
<ul class="list-none p-0 m-0 space-y-2"> <ul class="list-none p-0 m-0 space-y-2">