From aa6507ab7fbe418f7e50e8c17ae399072b51b9e8 Mon Sep 17 00:00:00 2001
From: Huyngeng Ea <huyngeng@web-essential.asia>
Date: Mon, 23 Jan 2017 14:26:10 +0700
Subject: [PATCH] [BUG] News list structured data is missing

refs bug64
---
 .../TypoScript/Library/lib.siteTitle.setupts  |  2 +
 .../Extensions/News/Partials/List/Item.html   | 38 ++++++++++++++-----
 .../Extensions/News/TypoScript/setup.ts       | 28 ++++++++------
 3 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 Configuration/TypoScript/Library/lib.siteTitle.setupts

diff --git a/Configuration/TypoScript/Library/lib.siteTitle.setupts b/Configuration/TypoScript/Library/lib.siteTitle.setupts
new file mode 100644
index 00000000..1b730bbc
--- /dev/null
+++ b/Configuration/TypoScript/Library/lib.siteTitle.setupts
@@ -0,0 +1,2 @@
+lib.siteTitle = TEXT
+lib.siteTitle.data = leveltitle:0
diff --git a/Resources/Private/Extensions/News/Partials/List/Item.html b/Resources/Private/Extensions/News/Partials/List/Item.html
index eb505618..bce11dba 100644
--- a/Resources/Private/Extensions/News/Partials/List/Item.html
+++ b/Resources/Private/Extensions/News/Partials/List/Item.html
@@ -1,4 +1,7 @@
-{namespace n=GeorgRinger\News\ViewHelpers}<!--
+{namespace n=GeorgRinger\News\ViewHelpers}
+{namespace v=KayStrobach\Themes\ViewHelpers}
+{namespace xtools=T3kit\T3kitExtensionTools\ViewHelpers}
+<!--
 	=====================
 		Partials/List/Item.html
 -->
@@ -22,13 +25,13 @@ <h3>
 						<n:link newsItem="{newsItem}" settings="{settings}" title="{newsItem.title}">
 							<f:alias map="{mediaElement: newsItem.falMediaPreviews.0}">
 								<f:if condition="{mediaElement.originalResource.type} == 2">
-									<f:image src="{mediaElement.uid}" treatIdAsReference="1" title="{mediaElement.originalResource.title}" alt="{mediaElement.originalResource.alternative}" maxWidth="{settings.list.media.image.maxWidth}" maxHeight="{settings.list.media.image.maxHeight}"/>
+									<f:render section="renderImage" arguments="{src:mediaElement.uid, title:mediaElement.originalResource.title, alt:mediaElement.originalResource.alternative, settings:settings, treatIdAsReference:'1'}"/>
 								</f:if>
 								<f:if condition="{mediaElement.originalResource.type} == 4">
 									<f:render partial="Detail/FalMediaVideo" arguments="{mediaElement: mediaElement}"/>
 								</f:if>
 								<f:if condition="{mediaElement.originalResource.type} == 5">
-									<f:image src="{mediaElement.uid}" treatIdAsReference="1" title="{mediaElement.originalResource.title}" alt="{mediaElement.originalResource.alternative}" maxWidth="{settings.list.media.image.maxWidth}" maxHeight="{settings.list.media.image.maxHeight}"/>
+									<f:render section="renderImage" arguments="{src:mediaElement.uid, title:mediaElement.originalResource.title, alt:mediaElement.originalResource.alternative, settings:settings, treatIdAsReference:'1'}"/>
 								</f:if>
 							</f:alias>
 						</n:link>
@@ -37,7 +40,7 @@ <h3>
 						<f:if condition="{settings.displayDummyIfNoMedia}">
 							<span class="no-media-element">
 								<n:link newsItem="{newsItem}" settings="{settings}" title="{newsItem.title}">
-									<f:image src="{settings.list.media.dummyImage}" title="" alt="" maxWidth="{settings.list.media.image.maxWidth}" maxHeight="{settings.list.media.image.maxHeight}"/>
+									<f:render section="renderImage" arguments="{src:settings.list.media.dummyImage, title:'', alt:'', settings:settings, treatIdAsReference:'0'}"/>
 								</n:link>
 							</span>
 						</f:if>
@@ -57,7 +60,8 @@ <h3>
 								<n:link newsItem="{newsItem}" settings="{settings}" title="{newsItem.title}">
 									<f:alias map="{mediaElement: newsItem.mediaPreviews.0}">
 										<f:if condition="{mediaElement.type} == 0">
-											<f:image src="uploads/tx_news/{mediaElement.image}" title="{mediaElement.title}" alt="{mediaElement.alt}" maxWidth="{settings.list.media.image.maxWidth}" maxHeight="{settings.list.media.image.maxHeight}"/>
+											<v:variable.set name="src" value="uploads/tx_news/{mediaElement.image}" />
+											<f:render section="renderImage" arguments="{src:src, title:mediaElement.title, alt:mediaElement.alt, settings:settings, treatIdAsReference:'0'}"/>
 										</f:if>
 										<f:if condition="{mediaElement.type} == 1">
 											<f:render partial="Detail/MediaVideo" arguments="{mediaElement: mediaElement}"/>
@@ -72,7 +76,7 @@ <h3>
 								<f:if condition="{settings.displayDummyIfNoMedia}">
 									<span class="no-media-element">
 										<n:link newsItem="{newsItem}" settings="{settings}" title="{newsItem.title}">
-											<f:image src="{settings.list.media.dummyImage}" title="" alt="" maxWidth="{settings.list.media.image.maxWidth}" maxHeight="{settings.list.media.image.maxHeight}"/>
+											<f:render section="renderImage" arguments="{src:settings.list.media.dummyImage, title:'', alt:'', settings:settings, treatIdAsReference:'0'}"/>
 										</n:link>
 									</span>
 								</f:if>
@@ -87,7 +91,7 @@ <h3>
 							<div class="news-img-wrap">
 								<n:link newsItem="{newsItem}" settings="{settings}" title="{newsItem.title}">
 									<span class="no-media-element">
-										<f:image src="{settings.list.media.dummyImage}" title="" alt="" maxWidth="{settings.list.media.image.maxWidth}" maxHeight="{settings.list.media.image.maxHeight}"/>
+										<f:render section="renderImage" arguments="{src:settings.list.media.dummyImage, title:'', alt:'', settings:settings, treatIdAsReference:'0'}" />
 									</span>
 								</n:link>
 							</div>
@@ -95,7 +99,6 @@ <h3>
 					</f:if>
 				</f:else>
 			</f:if>
-
 		</f:else>
 	</f:if>
 
@@ -119,6 +122,12 @@ <h3>
 	<!-- footer information -->
 	<div class="news-article-footer">
 		<p>
+			<div itemscope itemtype="http://schema.org/Organization" itemprop="publisher">
+				<meta itemprop="name" content="{f:cObject(typoscriptObjectPath: 'lib.siteTitle')}" />
+				<div itemscope itemtype="http://schema.org/ImageObject" itemprop="logo">
+					<meta itemprop="url" content="{f:uri.image(src: settings.list.publisher.logo, absolute: 'true')}" />
+				</div>
+			</div>
 			<!-- date -->
 			<span class="news-list-date">
 				<time datetime="{f:format.date(date:newsItem.datetime, format:'Y-m-d')}">
@@ -143,10 +152,19 @@ <h3>
 
 			<!-- author -->
 			<f:if condition="{newsItem.author}">
-				<span class="news-list-author">
-					<f:translate key="author" arguments="{0:newsItem.author}"/>
+				<span class="news-list-author" itemscope itemtype="http://schema.org/Person" itemprop="author">
+					<f:translate key="author_simple" />
+					<span itemprop="name">{newsItem.author}</span>
 				</span>
 			</f:if>
 		</p>
 	</div>
 </div>
+
+<f:section name="renderImage">
+	<div itemscope itemtype="http://schema.org/ImageObject" itemprop="image">
+		<f:image src="{src}" treatIdAsReference="{treatIdAsReference}" title="{title}" alt="{alt}" maxWidth="{settings.list.media.image.maxWidth}" maxHeight="{settings.list.media.image.maxHeight}" additionalAttributes="{itemprop:'url'}" />
+		<meta itemprop="width" content="{xtools:get.imageDimension(src: src, treatIdAsReference: treatIdAsReference, maxWidth: settings.list.media.image.maxWidth, maxHeight: settings.list.media.image.maxHeight)}" />
+		<meta itemprop="height" content="{xtools:get.imageDimension(src: src, treatIdAsReference: treatIdAsReference, maxWidth: settings.list.media.image.maxWidth, maxHeight: settings.list.media.image.maxHeight, dimensionType: 'height')}" />
+	</div>
+</f:section>
diff --git a/Resources/Private/Extensions/News/TypoScript/setup.ts b/Resources/Private/Extensions/News/TypoScript/setup.ts
index 8c9c5414..c0282c55 100644
--- a/Resources/Private/Extensions/News/TypoScript/setup.ts
+++ b/Resources/Private/Extensions/News/TypoScript/setup.ts
@@ -1,12 +1,16 @@
-plugin.tx_news.settings.defaultDetailPid = {$themes.configuration.features.newsDefaultDetailPid}
-plugin.tx_news.settings.detail.media.image.lightbox.class = {$styles.content.textmedia.linkWrap.lightboxCssClass}
-
-plugin.tx_news.settings.newsCarousel.cropMaxCharacters = 136
-
-plugin.tx_news.settings.card.cropMaxCharacters = 200
-
-plugin.tx_news.settings.simpleList.cropMaxCharacters = 280
-
-plugin.tx_news.settings.timeline.cropMaxCharacters = 500
-
-plugin.tx_news.settings.list.media.dummyImage = typo3conf/ext/theme_t3kit/Resources/Public/Extensions/News/images/no_image.png
+plugin.tx_news {
+	settings {
+		defaultDetailPid = {$themes.configuration.features.newsDefaultDetailPid}
+		newsCarousel.cropMaxCharacters = 136
+		card.cropMaxCharacters = 200
+		simpleList.cropMaxCharacters = 280
+		timeline.cropMaxCharacters = 500
+		list {
+			media.dummyImage = typo3conf/ext/theme_t3kit/Resources/Public/Extensions/News/images/no_image.png
+			publisher.logo = {$themes.configuration.header.logo.main.file}
+		}
+		detail {
+			media.image.lightbox.class = {$styles.content.textmedia.linkWrap.lightboxCssClass}
+		}
+	}
+}