[FEATURE] Option to use image instead of media

t3kit · May 4, 2016 · e027cf4 · e027cf4
1 parent 5b87d41
commit e027cf4
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 13 deletions.
diff --git a/Configuration/ContentElements/ImageTextLink.setupts b/Configuration/ContentElements/ImageTextLink.setupts
@@ -8,6 +8,11 @@ tt_content {
                 references.fieldName = media
                 as = media
             }
+            15 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+            15 {
+                references.fieldName = image
+                as = image
+            }
             20 = T3kit\T3kitExtensionTools\DataProcessing\FlexFormProcessor
             20 {
                 fieldName = pi_flexform

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -319,6 +319,7 @@
                 --linebreak--,bodytext;' . $contentElementLanguageFilePrefix . 'imageTextLink.bodytext,
                 --linebreak--,subheader;' . $contentElementLanguageFilePrefix . 'imageTextLink.linkText,
                 --linebreak--,header_link;' . $cmsLanguageFilePrefix . 'header_link_formlabel,
+            --div--;' . $frontendLanguageFilePrefix . 'tabs.images,image,
             --div--;' . $contentElementLanguageFilePrefix . 'imageTextLink.tabs.media,media,
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
                 --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,

diff --git a/Resources/Private/Language/ContentElements.xlf b/Resources/Private/Language/ContentElements.xlf
@@ -85,7 +85,7 @@
                 <source>Image text and link</source>
             </trans-unit>
             <trans-unit id="imageTextLink.description">
-                <source>Image text and link</source>
+                <source>Image or media, text and link. Will use image image before media. Will only render one image or one media.</source>
             </trans-unit>
             <trans-unit id="imageTextLink.bodyText">
                 <source>Text</source>

diff --git a/Resources/Private/Templates/ContentElements/ImageTextLink.html b/Resources/Private/Templates/ContentElements/ImageTextLink.html
@@ -5,21 +5,27 @@
 	<f:debug>{data}</f:debug>
 
 	<f:section name="content">
+
 	<!-- theme_t3kit: Templates/ContentElements/ImageTextLink.html [begin] -->
 	<div class="img-text-link">
-		<f:if condition="{media}">
-			<f:for each="{media}" as="mediaItem" iteration="mediaIteration">
-				<f:if condition="{mediaIteration.isFirst}">
-					<f:media
-						file="{mediaItem}"
-						width="{data.imagewidth}"
-						height="{data.imageheight}"
-						alt="{mediaItem.media.alternative}"
-						title="{mediaItem.media.title}"
-						class="img-text-link__img img-responsive"
-					/>
+		<f:if condition="{image}">
+			<f:then>
+				<f:for each="{image}" as="mediaItem" iteration="imageIteration">
+					<f:if condition="{imageIteration.isFirst}">
+						<f:render section="imageType" arguments="{_all}" />
+					</f:if>
+				</f:for>
+			</f:then>
+
+			<f:else>
+				<f:if condition="{media}">
+					<f:for each="{media}" as="mediaItem" iteration="mediaIteration">
+						<f:if condition="{mediaIteration.isFirst}">
+							<f:render section="media" arguments="{_all}" />
+						</f:if>
+					</f:for>
 				</f:if>
-			</f:for>
+			</f:else>
 		</f:if>
 		<f:if condition="{data.header}">
 			<h3 class="img-text-link__header">{data.header}</h3>
@@ -33,4 +39,29 @@ <h3 class="img-text-link__header">{data.header}</h3>
 	</div>
 	<!-- theme_t3kit: Templates/ContentElements/ImageTextLink.html [end] -->
 	</f:section>
+
+	<f:section name="imageType">
+		<f:if condition="{mediaItem.link}">
+			<f:then>
+				<f:link.typolink parameter="{mediaItem.link}">
+					<f:render section="media" arguments="{_all}" />
+				</f:link.typolink>
+			</f:then>
+
+			<f:else>
+				<f:render section="media" arguments="{_all}" />
+			</f:else>
+
+		</f:if>
+	</f:section>
+	<f:section name="media">
+		<f:media
+			file="{mediaItem}"
+			width="{data.imagewidth}"
+			height="{data.imageheight}"
+			alt="{mediaItem.media.alternative}"
+			title="{mediaItem.media.title}"
+			class="img-text-link__img img-responsive"
+		/>
+	</f:section>
 </div>