update relationship vars and widget headline var

shared/vtl/widgets/common template/news-listing.vtl

@@ -8,35 +8,36 @@
 ## --------------------------------------------------
 ## SETTING THE SORT ORDER ---------------------------
 ## --------------------------------------------------
-#set ($sortBy = "Article.datePublished desc")
+##set ($sortBy = "Article.datePublished desc")
+#set ($sortBy = "Article.datePublished desc, modDate desc")
 
 
 ## --------------------------------------------------
 ## SETTING RELATIONSHIP FILTERS ---------------------
 ## --------------------------------------------------
-#if($UtilMethods.isSet($organization))
-	#set($organizationRel = '+Organization-Article:')
-	#set($organizationID = $organization)
+#if($UtilMethods.isSet($organizationArticle))
+	#set($organizationArticleRel = '+Organization-Article:')
+	#set($organizationArticleID = $organizationArticle)
 #end
-#if($UtilMethods.isSet($featuredPerson))
-	#set($featuredPersonRel = '+Featured-Person:')
-	#set($featuredPersonID = $featuredPerson)
+#if($UtilMethods.isSet($featuredPersonArticle))
+	#set($featuredPersonArticleRel = '+Featured-Person:')
+	#set($featuredPersonArticleID = $featuredPersonArticle)
 #end
-#if($UtilMethods.isSet($contentLocation))
+#if($UtilMethods.isSet($contentLocationArticle))
 	#set($locationRel = '+Location-Content:')
-	#set($locationID = $contentLocation)
+	#set($locationID = $contentLocationArticle)
 #end
-#if($UtilMethods.isSet($dataset))
+#if($UtilMethods.isSet($datasetArticle))
 	#set($datasetRel = '+Dataset-Article:')
-	#set($datasetID = $dataset)
+	#set($datasetID = $datasetArticle)
 #end
-#if($UtilMethods.isSet($series))
+#if($UtilMethods.isSet($seriesArticle))
 	#set($seriesRel = '+Series-Article:')
-	#set($seriesID = $series)
+	#set($seriesID = $seriesArticle)
 #end
-#if($UtilMethods.isSet($author))
+#if($UtilMethods.isSet($authorArticle))
 	#set($authorRel = '+Author-Article:')
-	#set($authorID = $author)
+	#set($authorID = $authorArticle)
 #end
 
 ## news pull
@@ -57,50 +58,34 @@
 
 	#set($newsListing = $dotcontent.pullPerPage("
 		+contentType:Article
-		$!{datasetRel}$!{datasetID}
-		$!{locationRel}$!{locationID}
-		$!{organizationRel}$!{organizationID}
-		$!{authorRel}$!{authorID}
-		$!{seriesRel}$!{seriesID}
-		$!{featuredPersonRel}$!{featuredPersonID}
+		$!{datasetArticleRel}$!{datasetArticleID}
+		$!{locationArticleRel}$!{locationArticleID}
+		$!{organizationArticleArticleRel}$!{organizationArticleArticleID}
+		$!{authorArticleRel}$!{authorArticleID}
+		$!{seriesArticleRel}$!{seriesArticleID}
+		$!{featuredPersonArticleArticleRel}$!{featuredPersonArticleArticleID}
 		",$!{page}, $!{itemsPerPage},"$!{sortBy}"
 	))
 
 #else
 	#set($newsListing = $dotcontent.pull("
 		+contentType:Article
-		$!{datasetRel}$!{datasetID}
-		$!{locationRel}$!{locationID}
-		$!{organizationRel}$!{organizationID}
-		$!{authorRel}$!{authorID}
-		$!{seriesRel}$!{seriesID}
-		$!{featuredPersonRel}$!{featuredPersonID}
+		$!{datasetArticleRel}$!{datasetArticleID}
+		$!{locationArticleRel}$!{locationArticleID}
+		$!{organizationArticleArticleRel}$!{organizationArticleArticleID}
+		$!{authorArticleRel}$!{authorArticleID}
+		$!{seriesArticleRel}$!{seriesArticleID}
+		$!{featuredPersonArticleArticleRel}$!{featuredPersonArticleArticleID}
 		", $!{numberOfResults},"$!{sortBy}"
 	))
 #end
 
-<p>Dataset: $datasetRel $datasetID </p>
-<p>Place “contentLocation”: $locationRel $locationID</p>
-<p>Organization: $organizationRel $organizationID </p>
-<p>Person “author”: $authorRel $authorID </p>
-<p>Series: $seriesRel $seriesID</p>
-<p>Person “featuredPerson”: $featuredPersonRel $featuredPersonID </p>
-
-
 <section itemscope itemtype="http://schema.org/Article">
-#if ($UtilMethods.isSet($headline))
-  #if (!$UtilMethods.isSet($headlineFontSize))
-    #set ($headlineFontSize = '1')
+#if ($UtilMethods.isSet($widgetHeadline))
+  #if (!$UtilMethods.isSet($headlineType))
+    #set ($headlineType = '1')
   #end
-  <h$!{headlineFontSize}>
-  	#if($UtilMethods.isSet($newsHomepageUrl))
-  		<a href="${newssHomepageUrl}">
-  	#end
-  	$!{headline}
-  	#if($UtilMethods.isSet($newsHomepageUrl))
-  		</a>
-  	#end
-  </h$!{headlineFontSize}>
+  <h$!{headlineType}>$!{widgetHeadline}</h$!{headlineType}>
 #end
 #if($newsListing.size() > 0)
 	<ul class="">