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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2019-10-28 18:48:41 +01:00
parent 96f47caa89 7be64d4f54
commit 6dabe833de
6 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -20,7 +20,7 @@
"gridelementsteam/gridelements": "^9.2",
"helhum/typo3-console": "^5.6",
"league/csv": "^9.2",
"pixelant/pxa-social-feed": "^1.10",
"pixelant/pxa-social-feed": "^2.0",
"symfony/http-client": "^4.3",
"symfony/options-resolver": "^4.2",
"symfony/property-access": "^4.3",
composer.lock
Generated
+14 -17
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "52a24229034a16de11c1cc47597e1df1",
"content-hash": "e68b342d4ca7a1c8f297b4e17a055dc5",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -1177,9 +1177,9 @@
"authors": [
{
"name": "Helmut Hummel",
"role": "Developer",
"email": "[email protected]",
"homepage": "http://helhum.io",
"role": "Developer"
"homepage": "http://helhum.io"
}
],
"description": "A reliable and powerful command line interface for TYPO3 CMS",
@@ -1368,30 +1368,26 @@
},
{
"name": "pixelant/pxa-social-feed",
"version": "v1.10.0",
"version": "v2.0.3",
"source": {
"type": "git",
"url": "https://github.com/pixelant/pxa_social_feed.git",
"reference": "94ffd4a197e47e03227b6ecdb7af7227a67a16fc"
"reference": "d612540c186994197b0d433a0d468191104fe673"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pixelant/pxa_social_feed/zipball/94ffd4a197e47e03227b6ecdb7af7227a67a16fc",
"reference": "94ffd4a197e47e03227b6ecdb7af7227a67a16fc",
"url": "https://api.github.com/repos/pixelant/pxa_social_feed/zipball/d612540c186994197b0d433a0d468191104fe673",
"reference": "d612540c186994197b0d433a0d468191104fe673",
"shasum": ""
},
"require": {
"facebook/graph-sdk": "^5.6.3",
"facebook/graph-sdk": "~5.7.0",
"php": ">=7.1",
"typo3/cms-core": "^8.7 || ^9.5"
},
"replace": {
"pxa_social_feed": "self.version",
"typo3-ter/pxa-social-feed": "self.version"
},
"require-dev": {
"nimut/testing-framework": "^2.0",
"squizlabs/php_codesniffer": "2.*",
"symfony/finder": "^3.0"
"nimut/testing-framework": "^4.1",
"squizlabs/php_codesniffer": "^3.4"
},
"type": "typo3-cms-extension",
"extra": {
@@ -1399,6 +1395,7 @@
"dev-master": "0.0.x-dev"
},
"typo3/cms": {
"extension-key": "pxa_social_feed",
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/Web"
}
@@ -1410,7 +1407,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
"GPL-2.0-or-later"
],
"authors": [
{
@@ -1421,7 +1418,7 @@
}
],
"description": "Add Facebook, Instagram, and Twitter feeds to your site.",
"time": "2019-03-13T09:49:44+00:00"
"time": "2019-10-02T07:06:54+00:00"
},
{
"name": "psr/cache",
public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php
+8
View File
@@ -75,6 +75,14 @@ class Product
$product['description'] = SerializationUtility::sanitizeText($entity->getTeaser());
$product['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages(), $imageProcessingInstructions);
$product['video'] = $entity->getVideo();
$product['journey'] = null;
if ($entity->getJourney()) {
$product['journey'] = [
'byBus' => SerializationUtility::sanitizeText($entity->getJourney()->getByBus()),
'byCar' => SerializationUtility::sanitizeText($entity->getJourney()->getByCar()),
];
}
$link = $entity->getExternalLink() ?: $entity->getDetailPage();
$product['link'] = SerializationUtility::generateLink($link, $queryData);
public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript
+7
View File
@@ -19,3 +19,10 @@ page.includeJSFooter {
pxa_social_feed_4 >
pxa_social_feed_5 >
}
page.includeJSFooterlibs {
pxa_social_feed_1 >
pxa_social_feed_2 >
pxa_social_feed_3 >
pxa_social_feed_4 >
}
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html
+11 -5
View File
@@ -20,13 +20,19 @@
<f:render section="CollapsibleCity" arguments="{id: 4, label: 'Ort', city: productData.city}"/>
<f:render section="CollapsibleSimple" arguments="{id: 5, label: 'Party', description: productData.city.party}"/>
<f:render section="CollapsibleSimple" arguments="{id: 6, label: 'Freizeitangebot', description: productData.city.leisure}"/>
<f:render section="CollapsibleSimple" arguments="{id: 7, label: 'Skipass', description: productData.skipass}"/>
<f:render section="CollapsibleSimple" arguments="{id: 8, label: 'Verpflegung', description: productData.board}"/>
<f:render section="CollapsibleSimple" arguments="{id: 9, label: 'Programm', description: productData.programme}"/>
<f:if condition="{productData.journey.byCar}">
<f:render section="CollapsibleSimple" arguments="{id: 7, label: 'Anreise mit dem Auto', description: productData.journey.byCar}"/>
</f:if>
<f:if condition="{productData.journey.byBus}">
<f:render section="CollapsibleSimple" arguments="{id: 8, label: 'Anreise mit dem Bus', description: productData.journey.byBus}"/>
</f:if>
<f:render section="CollapsibleSimple" arguments="{id: 9, label: 'Skipass', description: productData.skipass}"/>
<f:render section="CollapsibleSimple" arguments="{id: 10, label: 'Verpflegung', description: productData.board}"/>
<f:render section="CollapsibleSimple" arguments="{id: 11, label: 'Programm', description: productData.programme}"/>
<f:for each="{productData.hotels.hotel}" as="hotel" iteration="iteration">
<f:render section="CollapsibleHotel" arguments="{id: '10-{iteration.cycle}', label: 'Unterkunft{f:if(condition: \'{productData.hotels.hotel -> f:count()} > 1\', then: \' {iteration.cycle}\')} (Termine, Zimmer, Leistungen, Anreise, Bilder)', hotel: hotel}"/>
<f:render section="CollapsibleHotel" arguments="{id: '12-{iteration.cycle}', label: 'Unterkunft{f:if(condition: \'{productData.hotels.hotel -> f:count()} > 1\', then: \' {iteration.cycle}\')} (Termine, Zimmer, Leistungen, Anreise, Bilder)', hotel: hotel}"/>
</f:for>
<f:render section="CollapsibleImages" arguments="{id: 11, label: 'Allgemeine Bilder/Video', images: productData.images.image, video: productData.video}"/>
<f:render section="CollapsibleImages" arguments="{id: 13, label: 'Allgemeine Bilder/Video', images: productData.images.image, video: productData.video}"/>
</div>
<div class="row">
<div class="col-xs-12">
public/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html
+2 -1
View File
@@ -1,4 +1,5 @@
<div xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:pxa="http://typo3.org/ns/Pixelant/PxaSocialFeed/ViewHelpers"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers">
<f:layout name="Default"/>
@@ -24,7 +25,7 @@
</div>
<div class="teaserbox__main teaserbox__main--fixed-height">
<p>{feed.postDate -> f:format.date(format: 'd.m.Y')} @{feed.configuration.name}</p>
{feed.message -> f:format.crop(maxCharacters: '120') -> f:format.nl2br()}
<f:format.raw>{feed.decodedMessage -> f:format.crop(maxCharacters: '120') -> pxa:parseMessage(type: feed.configuration.token.type) -> f:format.nl2br()}</f:format.raw>
</div>
<button class="button button--full teaserbox__button">{f:translate(key: 'tx_eptheme.label.teaserbutton.to_post', extensionName: 'ep_theme')}</button>
</f:link.typolink>