Merge pull request #49 from Sofatraining/v12-dev

v.3.0.3
Sofatraining · Jun 3, 2024 · 9418506 · 9418506
2 parents caff530 + f56e9af
commit 9418506
Show file tree

Hide file tree

Showing 39 changed files with 466 additions and 78 deletions.
diff --git a/Build/package.json b/Build/package.json
@@ -7,7 +7,7 @@
   },
   "homepage": "https://ohnesorge.live",
   "author": "Jürgen Ohnesorge",
-  "version": "1.0.0",
+  "version": "3.0.3",
   "license": "GPL-2.0-or-later",
   "devDependencies": {
     "grunt": "^1.0.4",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -80,5 +80,8 @@ New Lib for Sitetitle (Site-Config -> Language -> Title), New Element "FAQ", Bug
 ***
 #### v3.0.2
 Bugfixes
+***
+#### v3.0.3
+Bugfixes, Font Awesome to Version 6.5.2, Update to Bootstrap 5.3.3, Adding CE Stoerer.html
 
 ***   
diff --git a/Configuration/TsConfig/Page/TCEFORM.tsconfig b/Configuration/TsConfig/Page/TCEFORM.tsconfig
@@ -107,6 +107,22 @@ TCEFORM {
 		header_layout.types.liepstypo3defaults_carousel-image.disabled = 1
 		date.types.liepstypo3defaults_carousel-image.disabled = 1
 		subheader.types.liepstypo3defaults_carousel-image.disabled = 1
+		# Testimonials
+		header.types.liepstypo3defaults_testimonials.disabled = 1
+		header.types.types.liepstypo3defaults_testimonials.disabled = 1
+		header_link.types.liepstypo3defaults_testimonials.disabled = 1
+		header_position.types.liepstypo3defaults_testimonials.disabled = 1
+		header_layout.types.liepstypo3defaults_testimonials.disabled = 1
+		date.types.liepstypo3defaults_testimonials.disabled = 1
+		subheader.types.liepstypo3defaults_testimonials.disabled = 1
+		# Störer
+		header.types.liepstypo3defaults_stoerer.disabled = 1
+		header.types.types.liepstypo3defaults_stoerer.disabled = 1
+		header_link.types.liepstypo3defaults_stoerer.disabled = 1
+		header_position.types.liepstypo3defaults_stoerer.disabled = 1
+		header_layout.types.liepstypo3defaults_stoerer.disabled = 1
+		date.types.liepstypo3defaults_stoerer.disabled = 1
+		subheader.types.liepstypo3defaults_stoerer.disabled = 1
 	}
 	sys_file_reference {
 		crop.config.cropVariants {

diff --git a/Configuration/TypoScript/Setup/Page/page.typoscript b/Configuration/TypoScript/Setup/Page/page.typoscript
@@ -70,7 +70,12 @@ page {
 	}
 
 	includeJSLibs {
-		file1 = EXT:liepstypo3defaults/Resources/Public/Js/jquery.min.js
+		#file1 = https://ccm.lieps.de/public/app.js?apiKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX&amp;domain=XXXXXXX
+		#file1.external = 1
+		#file1.disableCompression = 1
+		#file1.excludeFromConcatenation = 1
+		#file1.referrerpolicy = origin
+		file2 = EXT:liepstypo3defaults/Resources/Public/Js/jquery.min.js
 	}
 
 	includeJS {

diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
@@ -96,15 +96,6 @@
 			<trans-unit id="flux.section-100.fields.repeatY">
 				<source>Image Background-Repeat (Y)</source>
 			</trans-unit>
-			<trans-unit id="flux.section-100.fields.settings.section.sectionClasses">
-				<source>zusätzliche CSS-Klassen für div.section</source>
-			</trans-unit>
-			<trans-unit id="flux.section-100.fields.settings.section.overlayClasses">
-				<source>zusätzliche CSS-Klassen für div.section -> overlay (Nur bei Bildhintergrund!)</source>
-			</trans-unit>			
-			<trans-unit id="flux.section-100.fields.settings.section.containerClasses">
-				<source>zusätzliche CSS-Klassen für div.section -> overlay -> container/container-fluid</source>
-			</trans-unit>
 			<trans-unit id="flux.teaser">
 				<source>Teaser</source>
 			</trans-unit>
@@ -319,10 +310,10 @@
 				<source>Scroll Spy</source>
 			</trans-unit>
 			<trans-unit id="flux.faq.description">
-				<source>Das Bootstrap5 Scroll-Spy-Element</source>
+				<source>Ein Scroll-Spy Element</source>
 			</trans-unit>
 			<trans-unit id="flux.faq.fields.faq-headline">
-				<source>Titel Scroll Spys</source>
+				<source>Titel Scroll Spy</source>
 			</trans-unit>
 			<trans-unit id="flux.faq.fields.faq-title">
 				<source>Titel des Elements</source>
@@ -336,6 +327,39 @@
 			<trans-unit id="flux.faq.fields.settings.section.col2Classes">
 				<source>CSS-Klassen für den FAQ-List-Container</source>
 			</trans-unit>
+			<trans-unit id="flux.testimonials">
+				<source>Testimonials</source>
+			</trans-unit>
+			<trans-unit id="flux.testimonials.description">
+				<source>Anlegen und Bearbeiten von Testimonials</source>
+			</trans-unit>
+			<trans-unit id="flux.linklist">
+				<source>Linkliste</source>
+			</trans-unit>
+			<trans-unit id="flux.linklist.description">
+				<source>Anlegen / Bearbeiten einer Liste von Links oder Sprungmarken</source>
+			</trans-unit>
+			<trans-unit id="flux.stoerer">
+				<source>Störer</source>
+			</trans-unit>
+			<trans-unit id="flux.stoerer.description">
+				<source>Fixe Störerkarte</source>
+			</trans-unit>
+			<trans-unit id="flux.stoerer.fields.subheadline">
+				<source>Subheadline</source>
+			</trans-unit>
+			<trans-unit id="flux.stoerer.fields.headline">
+				<source>Headline</source>
+			</trans-unit>
+			<trans-unit id="flux.stoerer.fields.teasertext">
+				<source>Kurztext</source>
+			</trans-unit>
+			<trans-unit id="flux.stoerer.fields.link">
+				<source>Link</source>
+			</trans-unit>
+			<trans-unit id="flux.stoerer.fields.buchen">
+				<source>Buchen Link</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>
diff --git a/Resources/Private/Templates/Content/100-Section-100.html b/Resources/Private/Templates/Content/100-Section-100.html
@@ -33,9 +33,9 @@
 					<h3>Adding CSS-Classes</h3>
 					<p>Below you can enter a few classes to be used for this specific section instance.</p>
 				</flux:field.custom>
-				<flux:field.input name="settings.section.sectionClasses" default="" />
-				<flux:field.input name="settings.section.overlayClasses" default="" />
-				<flux:field.input name="settings.section.containerClasses" default="" />
+				<flux:field.input name="settings.section.sectionClasses" default="" label="zusätzliche CSS-Klassen für div.section" />
+				<flux:field.input name="settings.section.overlayClasses" default="" label="zusätzliche CSS-Klassen für div.section -> overlay (Nur bei Bildhintergrund!)" />
+				<flux:field.input name="settings.section.containerClasses" default="" label="zusätzliche CSS-Klassen für div.section -> overlay -> container/container-fluid" />
 			</flux:form.sheet>
 		</flux:form>
 	</f:section>

diff --git a/Resources/Private/Templates/Content/106-Columns-25-25-25-25.html b/Resources/Private/Templates/Content/106-Columns-25-25-25-25.html
@@ -100,7 +100,7 @@ <h4><b>CSS Klassen</b></h4>
 					<div class="{settings.col2xxl} {settings.col2xl} {settings.col2lg} {settings.col2md} {settings.col2sm} {settings.col2xs}{f:if(condition: settings.section.col2Classes, then: ' {settings.section.col2Classes}')}">
 						<flux:content.render area="column2"/>
 					</div>
-					<div class="{settings.col3xxl} {settings.col3xl} {settings.col3lg} {settings.col3md} {settings.col3sm} {settings.col3xs}{settings.col3xxl} {settings.col3xl} {settings.col3lg} {settings.col3md} {settings.col3sm} {settings.col3xs}{f:if(condition: settings.section.col3Classes, then: ' {settings.section.col3Classes}')}">
+					<div class="{settings.col3xxl} {settings.col3xl} {settings.col3lg} {settings.col3md} {settings.col3sm} {settings.col3xs}{f:if(condition: settings.section.col3Classes, then: ' {settings.section.col3Classes}')}">
 						<flux:content.render area="column3"/>
 					</div>
 					<div class="{settings.col4xxl} {settings.col4xl} {settings.col4lg} {settings.col4md} {settings.col4sm} {settings.col4xs}{f:if(condition: settings.section.col4Classes, then: ' {settings.section.col4Classes}')}">

diff --git a/Resources/Private/Templates/Content/FAQ.html b/Resources/Private/Templates/Content/FAQ.html
@@ -17,10 +17,7 @@
 			<flux:form.sheet name="xxl" label="XXL (≥1400px)">
 				<flux:field.custom name="warningxxl">
 					<h4><b>XXL (ab 1400px Breite des Browserfensters)</b></h4>
-					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/"
-								target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du
-						weisst was
-						Du machst!)</p>
+					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/" target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du weisst was Du machst!)</p>
 				</flux:field.custom>
 				<flux:field.checkbox name="settings.offsetxxl" label="Abstand zwischen den Spalten (offset-xxl-1)"
 					default="0" />
@@ -32,10 +29,7 @@ <h4><b>XXL (ab 1400px Breite des Browserfensters)</b></h4>
 			<flux:form.sheet name="xl" label="XL (≥1200px)">
 				<flux:field.custom name="warningxl">
 					<h4><b>XL (zwischen 1200px und 1399px Breite des Browserfensters)</b></h4>
-					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/"
-								target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du
-						weisst was
-						Du machst!)</p>
+					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/" target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du weisst was Du machst!)</p>
 				</flux:field.custom>
 				<flux:field.checkbox name="settings.offsetxl" label="Abstand zwischen den Spalten (offset-xl-1)"
 					default="0" />
@@ -47,10 +41,7 @@ <h4><b>XL (zwischen 1200px und 1399px Breite des Browserfensters)</b></h4>
 			<flux:form.sheet name="lg" label="LG (≥992px)">
 				<flux:field.custom name="warninglg">
 					<h4><b>LG (zwischen 992px und 1199px Breite des Browserfensters)</b></h4>
-					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/"
-								target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du
-						weisst was
-						Du machst!)</p>
+					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/" target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du weisst was Du machst!)</p>
 				</flux:field.custom>
 				<flux:field.checkbox name="settings.offsetlg" label="Abstand zwischen den Spalten (offset-lg-1)"
 					default="0" />
@@ -62,10 +53,7 @@ <h4><b>LG (zwischen 992px und 1199px Breite des Browserfensters)</b></h4>
 			<flux:form.sheet name="md" label="MD (≥768px)">
 				<flux:field.custom name="warningmd">
 					<h4><b>MD (zwischen 768px und 991px Breite des Browserfensters)</b></h4>
-					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/"
-								target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du
-						weisst was
-						Du machst!)</p>
+					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/" target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du weisst was Du machst!)</p>
 				</flux:field.custom>
 				<flux:field.checkbox name="settings.offsetmd" label="Abstand zwischen den Spalten (offset-md-1)"
 					default="0" />
@@ -77,10 +65,7 @@ <h4><b>MD (zwischen 768px und 991px Breite des Browserfensters)</b></h4>
 			<flux:form.sheet name="sm" label="SM (≥576px)">
 				<flux:field.custom name="warningsm">
 					<h4><b>SM (zwischen 576px und 767px Breite des Browserfensters)</b></h4>
-					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/"
-								target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du
-						weisst was
-						Du machst!)</p>
+					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/" target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du weisst was Du machst!)</p>
 				</flux:field.custom>
 				<flux:field.checkbox name="settings.offsetsm" label="Abstand zwischen den Spalten (offset-sm-1)"
 					default="0" />
@@ -92,10 +77,7 @@ <h4><b>SM (zwischen 576px und 767px Breite des Browserfensters)</b></h4>
 			<flux:form.sheet name="xs" label="XS (<576px)">
 				<flux:field.custom name="warningxs">
 					<h4><b>XS (bis 575px Breite des Browserfensters)</b></h4>
-					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/"
-								target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du
-						weisst was
-						Du machst!)</p>
+					<p><b>Mehr Informationen unter: <a href="https://getbootstrap.com/docs/5.2/layout/grid/" target="_blank">https://getbootstrap.com/docs/5.2/layout/grid/</a></b> (Es sei denn, Du weisst was Du machst!)</p>
 				</flux:field.custom>
 				<flux:field.select name="settings.col1xs" label="Breite der Spalte 1" default="col-xs-12"
 					items="{0:{0:'1 - (col-xs-1)',1:'col-xs-1'},1:{0:'2 - (col-xs-2)',1:'col-xs-2'},2:{0:'3 - (col-xs-3)',1:'col-xs-3'},3:{0:'4 - (col-xs-4)',1:'col-xs-4'},4:{0:'5 - (col-xs-5)',1:'col-xs-5'},5:{0:'6 - (col-xs-6)',1:'col-xs-6'},6:{0:'7 - (col-xs-7)',1:'col-xs-7'},7:{0:'8 - (col-xs-8)',1:'col-xs-8'},8:{0:'9 - (col-xs-9)',1:'col-xs-9'},9:{0:'10 - (col-xs-10)',1:'col-xs-10'},10:{0:'11 - (col-xs-11)',1:'col-xs-11'},11:{0:'12 - (col-xs-12)',1:'col-xs-12'}}" />
@@ -105,8 +87,7 @@ <h4><b>XS (bis 575px Breite des Browserfensters)</b></h4>
 			<flux:form.sheet name="styles" label="CSS Klassen">
 				<flux:field.custom name="css">
 					<h4><b>CSS Klassen</b></h4>
-					<p>Hier können für die FAQ-Selector-Container und den FAQ-List-Container <b>eigene CSS-Klassen</b>
-						definiert werden.</p>
+					<p>Hier können für die FAQ-Selector-Container und den FAQ-List-Container <b>eigene CSS-Klassen</b> definiert werden.</p>
 				</flux:field.custom>
 				<flux:field.input name="settings.section.col1Classes" default="" />
 				<flux:field.input name="settings.section.col2Classes" default="" />
@@ -160,4 +141,4 @@ <h3>
 			</div>
 		</div>
 	</f:section>
-</div>
+</div>
diff --git a/Resources/Private/Templates/Content/Gallery.html b/Resources/Private/Templates/Content/Gallery.html
@@ -1,17 +1,17 @@
 <div xmlns:flux="http://typo3.org/ns/FluidTYPO3/Flux/ViewHelpers"
 	 xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
 	 xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
-     xmlns:ce="http://typo3.org/ns/TYPO3/CMS/FluidStyledContent/ViewHelpers">
+	 xmlns:ce="http://typo3.org/ns/TYPO3/CMS/FluidStyledContent/ViewHelpers">
 	{namespace lieps=LiepsGmbH\Liepstypo3defaults\ViewHelpers}
 
 <f:layout name="Content"/>
 
 <f:section name="Configuration">
 	<flux:form id="gallery">
 		<flux:form.option.group value="content" />
-        <flux:field.select name="selectCol" default="col-xl-4 col-lg-6" items="{0:{0:'2 Spalten',1:'col-lg-6'},1:{0:'3 Spalten',1:'col-xl-4 col-lg-6'},2:{0:'4 Spalten',1:'col-xl-3 col-lg-6'}}"/>
+		<flux:field.select name="selectCol" default="col-xl-4 col-lg-6" items="{0:{0:'2 Spalten',1:'col-lg-6'},1:{0:'3 Spalten',1:'col-xl-4 col-lg-6'},2:{0:'4 Spalten',1:'col-xl-3 col-lg-6'},3:{0:'6 Spalten',1:'col-xxl-2 col-xl-3 col-lg-3 col-md-4 col-sm-6'}}"/>
 		<flux:field.checkbox name="lightbox" default="0" />
-        <flux:field.inline.fal name="settings.files" minItems="1" maxItems="30" required="1" allowedExtensions="jpg" collapseAll="TRUE" />
+		<flux:field.inline.fal name="settings.files" minItems="1" maxItems="30" required="1" allowedExtensions="jpg,png" collapseAll="TRUE" />
 	</flux:form>
 </f:section>
 
@@ -20,7 +20,7 @@
 		<tr>
 			<td>
 				<strong>Bilder-Galerie</strong><br />
-                Spalten: <strong><f:if condition="{selectCol} == 'col-lg-6'">2</f:if><f:if condition="{selectCol} == 'col-lg-4'">3</f:if><f:if condition="{selectCol} == 'col-lg-3'">4</f:if></strong><br>
+				Spalten: <strong><f:if condition="{selectCol} == 'col-lg-6'">2</f:if><f:if condition="{selectCol} == 'col-lg-4'">3</f:if><f:if condition="{selectCol} == 'col-lg-3'">4</f:if></strong><br>
 				<v:content.resources.fal field="settings.files" as="images" record="{record}">
 					<f:for each="{images}" as="image">
 						<f:if condition="{image}">
@@ -35,22 +35,31 @@
 
 <f:section name="Main">
 	<v:content.resources.fal field="settings.files" as="images" record="{record}">
-        <div class="row">
-            <f:for each="{images}" as="image">
-                <div class="{selectCol}">
-                    <f:if condition="{lightbox} == 0">
-                        <f:then>
-                            <f:image treatIdAsReference="1" src="{image.id}" title="{image.title}" alt="{image.alternative}" class="d-block w-100 img-fluid img-gallery" cropVariant="default" crop="{image.crop}" />
-                        </f:then>
-                        <f:else>
-                            <f:link.typolink parameter="{image.url}" class="image-link" additionalAttributes="{rel: 'lightbox[{record.uid}]'}">
-                                <f:image treatIdAsReference="1" src="{image.id}" title="{image.title}" alt="{image.alternative}" class="d-block w-100 img-fluid img-gallery" cropVariant="default" crop="{image.crop}" />
-                            </f:link.typolink>   
-                        </f:else>
-                    </f:if>
-                </div>
-            </f:for>
-        </div>
+		<div class="row px-5">
+			<f:for each="{images}" as="image">
+				<div class="{selectCol} px-5">
+					<f:if condition="{lightbox} == 0">
+						<f:then>
+							<f:if condition="{image.link}">
+								<f:then>
+									<f:link.typolink parameter="{image.link}">
+										<f:image treatIdAsReference="1" src="{image.id}" title="{image.title}" alt="{image.alternative}" class="d-block w-100 img-fluid img-gallery" cropVariant="default" crop="{image.crop}" />
+									</f:link.typolink>
+								</f:then>
+								<f:else>
+									<f:image treatIdAsReference="1" src="{image.id}" title="{image.title}" alt="{image.alternative}" class="d-block w-100 img-fluid img-gallery" cropVariant="default" crop="{image.crop}" />
+								</f:else>
+							</f:if>
+						</f:then>
+						<f:else>
+							<f:link.typolink parameter="{image.url}" class="image-link" additionalAttributes="{rel: 'lightbox[{record.uid}]'}">
+								<f:image treatIdAsReference="1" src="{image.id}" title="{image.title}" alt="{image.alternative}" class="d-block w-100 img-fluid img-gallery" cropVariant="default" crop="{image.crop}" />
+							</f:link.typolink>   
+						</f:else>
+					</f:if>
+				</div>
+			</f:for>
+		</div>
 	</v:content.resources.fal>
 </f:section>
 

diff --git a/Resources/Private/Templates/Content/Linklist.html b/Resources/Private/Templates/Content/Linklist.html
@@ -0,0 +1,40 @@
+<div xmlns:flux="http://typo3.org/ns/FluidTYPO3/Flux/ViewHelpers"
+    xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers">
+
+    <f:layout name="Content" />
+
+    <f:section name="Configuration">
+        <flux:form id="linklist">
+            <flux:form.option.group value="content" />
+            <flux:form.section name="sectionlinks" label="Links">
+                <flux:form.object name="objectlinks" label="Link">
+                    <flux:field.input name="linktitle" label="Linktitel" required="1" />
+                    <flux:field.input name="inputlink" config="{renderType: 'inputLink'}" required="1" />                       
+                </flux:form.object>
+            </flux:form.section>
+        </flux:form>
+    </f:section>
+
+    <f:section name="Preview">
+        <ul class="list-group">
+            <f:for each="{sectionlinks}" as="item">
+                <li class="list-group-item">{item.objectlinks.linktitle}</li>
+            </f:for>
+        </ul>
+    </f:section>
+
+    <f:section name="Main">
+
+        <div class="menu-links">
+            <ul class="menu-pages d-flex flex-column align-items-center">
+                <f:for each="{sectionlinks}" as="item" key="index">
+                    <f:debug>{item}</f:debug>
+                    <li class="menu-pages-item text-uppercase">
+                        <p class="text-center"><f:link.typolink parameter="{item.objectlinks.inputlink}" class="menu-pages-navitem">{item.objectlinks.linktitle}</f:link.typolink></p>
+                    </li>
+                </f:for>
+            </ul>
+        </div> 
+    </f:section>
+
+</div>