Merge branch 'develop'

public/typo3conf/ext/ep_products/Classes/Domain/Model/AbstractDestination.php

@@ -93,6 +93,11 @@ class AbstractDestination extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      */
     protected $description = '';
 
+    /**
+     * @var string
+     */
+    protected $descriptionExtended = '';
+
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
      */
@@ -322,6 +327,22 @@ class AbstractDestination extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
         $this->description = $description;
     }
 
+    /**
+     * @return string
+     */
+    public function getDescriptionExtended()
+    {
+        return $this->descriptionExtended;
+    }
+
+    /**
+     * @param string $descriptionExtended
+     */
+    public function setDescriptionExtended($descriptionExtended)
+    {
+        $this->descriptionExtended = $descriptionExtended;
+    }
+
     /**
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> $images
      */

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php

@@ -23,7 +23,9 @@ return [
 	],
 	'types' => [
 		'1' => [
-			'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;destinations, teaser, keywords, description, party, leisure, facts, officetip, --div--;Bilder/Dateien, teaser_images, header_images, images',
+			'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;destinations, teaser,
+			        keywords, description, description_extended, party, leisure, facts, officetip,
+			    --div--;Bilder/Dateien, teaser_images, header_images, images',
 		],
 	],
 	'palettes' => [
@@ -209,7 +211,18 @@ return [
         ],
 		'description' => [
 			'exclude' => 0,
-			'label' => 'Der Ort',
+			'label' => 'Der Ort (oben)',
+			'config' => [
+				'type' => 'text',
+				'cols' => 40,
+				'rows' => 15,
+				'eval' => 'trim',
+                'enableRichtext' => true,
+			],
+		],
+		'description_extended' => [
+			'exclude' => 0,
+			'label' => 'Der Ort (unten)',
 			'config' => [
 				'type' => 'text',
 				'cols' => 40,

public/typo3conf/ext/ep_products/ext_tables.sql

@@ -714,6 +714,7 @@ CREATE TABLE tx_epproducts_domain_model_city
     header_subtitle           varchar(255)        DEFAULT ''  NOT NULL,
     keywords                  text                            NOT NULL,
     description               text                            NOT NULL,
+    description_extended      text                            NOT NULL,
     party                     text                            NOT NULL,
     leisure                   text                            NOT NULL,
     teaser_images             int(11) unsigned                NOT NULL default '0',

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html

@@ -71,24 +71,18 @@
             <ul class="product-teaser__list-included flex-1 list-none m-0 text-zinc-800 divide-y divide-zinc-400">
                 <li class="flex items-center space-x-1 py-1">
                     {ep:icon(class: 'w-6 h-6 text-ep-primary-light', icon: 'check')}
-                    <span class="block flex-1 leading-none">
+                    <span class="block flex-1 leading-none">{f:if(condition: '{season} == "s"', then: 'Bergbahnticket', else: 'Skipass')}</span>
-                        {f:if(condition: '{season} == "s"', then: 'Bergbahnticket', else: 'Skipass')}
-                    </span>
                 </li>
                 <f:if condition="{product.feature}">
                     <li class="flex items-center space-x-1 py-1">
                         {ep:icon(class: 'w-6 h-6 text-ep-primary-light', icon: 'check')}
-                        <span class="block flex-1 leading-tight">
+                        <span class="block flex-1 leading-tight">{product.feature}</span>
-                            {product.feature}
-                        </span>
                     </li>
                 </f:if>
                 <f:if condition="{board}">
                     <li class="flex items-center space-x-1 py-1">
                         {ep:icon(class: 'w-6 h-6 text-ep-primary-light', icon: 'check')}
-                        <span class="block flex-1 leading-tight">
+                        <span class="block flex-1 leading-tight">Verpflegung</span>
-                            {board}
-                        </span>
                     </li>
                 </f:if>
             </ul>

public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Detail.html

@@ -75,7 +75,7 @@
                         </div>
                         <f:if condition="{settings.hideMoreLink}">
                             <f:else>
-                                <f:link.typolink class="button bg-button"
+                                <f:link.typolink class="button bg-button ml-4"
                                                  parameter="{settings.defaultSearchPageUid}"
                                                  additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}"
                                                  additionalAttributes="{rel: 'nofollow'}">
@@ -84,6 +84,11 @@
                             </f:else>
                         </f:if>
                     </f:if>
+                    <f:if condition="{city.descriptionExtended}">
+                        <div class="p-4 mt-4" data-rte-content>
+                            {city.descriptionExtended -> f:format.html()}
+                        </div>
+                    </f:if>
                 </div>
                 <div class="col-span-3 lg:col-span-1">
                     <f:if condition="{teasers}">

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html

@@ -32,7 +32,7 @@
                     <f:if condition="{teasers}">
                         <p class="hidden lg:block">
                             <button type="button"
-                                    class="button bg-button w-full mb-8"
+                                    class="button bg-button w-full mb-8 ml-4"
                                     data-controller="scroll-to"
                                     data-scroll-to-target-value="teasers"
                                     data-action="scroll-to#scroll">