Update to v2.1.

Latest version 2.1.
cara-tm · Dec 26, 2018 · 7905fdf · 7905fdf
1 parent 0dc32f3
commit 7905fdf
Show file tree

Hide file tree

Showing 28 changed files with 544 additions and 166 deletions.
diff --git a/dist/simplr/forms/article/default.txp b/dist/simplr/forms/article/default.txp
@@ -7,10 +7,10 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 </txp:php>
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
-			<a href="<txp:permlink />">
-				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%"</txp:smd_if_thumbnail>min-height:150px">
+			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
+				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;</txp:smd_if_thumbnail>min-height:150px">
 				<txp:if_plugin name="smd_thumbnail">
-					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' />" 
+					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' form="img_sizes" />" 
 			srcset="<txp:smd_thumbnail type='w_320' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_1280' id='<txp:image_info type="id" />' form="img_srcset" />" 
@@ -40,7 +40,8 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 	<txp:else />
 		<p><txp:output_form form="shrink_text" /></p>
 	</txp:if_excerpt>
-	<span class="more"><a href="<txp:permlink />"><txp:text item="Continue reading" />&thinsp;&rarr;</a></span>
+	<span class="more"><a href="<txp:permlink />/"><txp:text item="continue_reading" />&thinsp;&rarr;</a></span>
+	<txp:if_last_article><txp:else /><hr class="bg-gray" /></txp:if_last_article>
 </div>
 
 <txp:else />

diff --git a/dist/simplr/forms/article/default_black_white.txp b/dist/simplr/forms/article/default_black_white.txp
@@ -1,6 +1,9 @@
 <txp:if_different>
-<noscript id="deferred-styles"><style>picture,#lightboxImage{filter:grayscale(1)}</style></noscript>
-<script>var loadDeferredStyles=function(){var addStylesNode=document.getElementById("deferred-styles");var replacement=document.createElement("div");replacement.innerHTML=addStylesNode.textContent;document.body.appendChild(replacement);addStylesNode.parentElement.removeChild(addStylesNode);};var raf=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame;if(raf)raf(function(){window.setTimeout(loadDeferredStyles,0);});else window.addEventListener('load',loadDeferredStyles);</script>
+	<txp:variable name="custom_styles" value="filter:grayscale(1)" />
+<txp:php>
+global $variable;
+$variable['full'] = (count(explode(',', custom_field(array('name'=>'article_image')))) > 1 ? '' : ' full');
+</txp:php>
 
 <txp:else /> 
 </txp:if_different>
@@ -14,10 +17,10 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 </txp:php>
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
-			<a href="<txp:permlink />">
-				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%"</txp:smd_if_thumbnail>min-height:150px">
+			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
+				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="<txp:variable name="custom_styles" />;background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;</txp:smd_if_thumbnail>min-height:150px">
 				<txp:if_plugin name="smd_thumbnail">
-					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' />" 
+					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' form="img_sizes" />" 
 			srcset="<txp:smd_thumbnail type='w_320' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_1280' id='<txp:image_info type="id" />' form="img_srcset" />" 
@@ -47,7 +50,8 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 	<txp:else />
 		<p><txp:output_form form="shrink_text" /></p>
 	</txp:if_excerpt>
-	<span class="more"><a href="<txp:permlink />"><txp:text item="Continue reading" />&thinsp;&rarr;</a></span>
+	<span class="more"><a href="<txp:permlink />/"><txp:text item="continue_reading" />&thinsp;&rarr;</a></span>
+	<txp:if_last_article><txp:else /><hr class="bg-gray" /></txp:if_last_article>
 </div>
 
 <txp:else />

diff --git a/dist/simplr/forms/article/default_no_lightbox.txp b/dist/simplr/forms/article/default_no_lightbox.txp
@@ -7,10 +7,10 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 </txp:php>
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
-			<a href="<txp:permlink />">
-				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%"</txp:smd_if_thumbnail>min-height:150px">
+			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
+				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;</txp:smd_if_thumbnail>min-height:150px">
 				<txp:if_plugin name="smd_thumbnail">
-					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' />" 
+					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' form="img_sizes" />" 
 			srcset="<txp:smd_thumbnail type='w_320' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_1280' id='<txp:image_info type="id" />' form="img_srcset" />" 
@@ -40,7 +40,8 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 	<txp:else />
 		<p><txp:output_form form="shrink_text" /></p>
 	</txp:if_excerpt>
-	<span class="more"><a href="<txp:permlink />"><txp:text item="Continue reading" />&thinsp;&rarr;</a></span>
+	<span class="more"><a href="<txp:permlink />/"><txp:text item="continue_reading" />&thinsp;&rarr;</a></span>
+	<txp:if_last_article><txp:else /><hr class="bg-gray" /></txp:if_last_article>
 </div>
 
 <txp:else />

diff --git a/dist/simplr/forms/article/default_no_lightbox_black_white.txp b/dist/simplr/forms/article/default_no_lightbox_black_white.txp
@@ -1,6 +1,5 @@
 <txp:if_different>
-<noscript id="deferred-styles"><style>picture,#lightboxImage{filter:grayscale(1)}</style></noscript>
-<script>var loadDeferredStyles=function(){var addStylesNode=document.getElementById("deferred-styles");var replacement=document.createElement("div");replacement.innerHTML=addStylesNode.textContent;document.body.appendChild(replacement);addStylesNode.parentElement.removeChild(addStylesNode);};var raf=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame;if(raf)raf(function(){window.setTimeout(loadDeferredStyles,0);});else window.addEventListener('load',loadDeferredStyles);</script>
+	<txp:variable name="custom_styles" value="filter:grayscale(1)" />
 
 <txp:else /> 
 </txp:if_different>
@@ -14,10 +13,10 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 </txp:php>
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
-			<a href="<txp:permlink />">
-				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%"</txp:smd_if_thumbnail>min-height:150px">
+			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
+				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="<txp:variable name="custom_styles" />;background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;</txp:smd_if_thumbnail>min-height:150px">
 				<txp:if_plugin name="smd_thumbnail">
-					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' />" 
+					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' form="img_sizes" />" 
 			srcset="<txp:smd_thumbnail type='w_320' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_1280' id='<txp:image_info type="id" />' form="img_srcset" />" 
@@ -47,7 +46,8 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 	<txp:else />
 		<p><txp:output_form form="shrink_text" /></p>
 	</txp:if_excerpt>
-	<span class="more"><a href="<txp:permlink />"><txp:text item="Continue reading" />&thinsp;&rarr;</a></span>
+	<span class="more"><a href="<txp:permlink />/"><txp:text item="continue_reading" />&thinsp;&rarr;</a></span>
+	<txp:if_last_article><txp:else /><hr class="bg-gray" /></txp:if_last_article>
 </div>
 
 <txp:else />

diff --git a/dist/simplr/forms/article/default_no_lightbox_black_white_copy.txp b/dist/simplr/forms/article/default_no_lightbox_black_white_copy.txp
@@ -0,0 +1,50 @@
+<txp:if_different>
+<style scoped>
+picture,#lightboxImage{filter:grayscale(1)}
+</style>
+<txp:else /> 
+</txp:if_different>
+<txp:if_article_list>
+
+	<txp:if_article_image><txp:php>
+// Get the first ID, store it into a TXP variable
+global $variable;
+$variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',');
+</txp:php>
+		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
+		<figure class="aspect-ratio">
+			<picture>
+				<img src="<txp:image_url link='0' />" width="<txp:image_info type="w" />" height="<txp:image_info type="h" />" alt="<txp:image_info type='alt' />" lazyload="on" class="no-select" />
+			</picture>
+			<figcaption>
+				<txp:output_form form="image_count" /> <txp:image_info escape="" />
+			</figcaption>
+		</figure>
+	</txp:images>
+</txp:if_article_image>
+
+<txp:output_form form="article_metas" />
+
+<div class="excerpt">
+	<txp:if_excerpt>
+		<txp:excerpt />
+	<txp:else />
+		<p><txp:output_form form="shrink_text" /></p>
+	</txp:if_excerpt>
+	<span class="more"><a href="<txp:permlink />"><txp:text item="more" />&thinsp;&rarr;</a></span>
+</div>
+
+<txp:else />
+
+	<txp:if_article_image><div class="gallery">
+		<txp:output_form form="no_lightbox_images" />
+	</div></txp:if_article_image>
+	<txp:output_form form="article_metas" />
+	<txp:body />
+
+<txp:output_form form="post_pager" />
+
+
+	<txp:output_form form="comments_display" />
+
+</txp:if_article_list>
diff --git a/dist/simplr/forms/article/default_no_lightbox_saturated.txp b/dist/simplr/forms/article/default_no_lightbox_saturated.txp
@@ -1,6 +1,5 @@
 <txp:if_different>
-<noscript id="deferred-styles"><style>picture,#lightboxImage{filter:-webkit-filter:contrast(1.2) saturate(1.35);filter:contrast(1.2) saturate(1.35)}</style></noscript>
-<script>var loadDeferredStyles=function(){var addStylesNode=document.getElementById("deferred-styles");var replacement=document.createElement("div");replacement.innerHTML=addStylesNode.textContent;document.body.appendChild(replacement);addStylesNode.parentElement.removeChild(addStylesNode);};var raf=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame;if(raf)raf(function(){window.setTimeout(loadDeferredStyles,0);});else window.addEventListener('load',loadDeferredStyles);</script>
+	<txp:variable name="custom_styles" value="filter:-webkit-filter:contrast(1.2) saturate(1.35);filter:contrast(1.2) saturate(1.35)" />
 
 <txp:else /> 
 </txp:if_different>
@@ -14,10 +13,10 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 </txp:php>
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
-			<a href="<txp:permlink />">
-				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%"</txp:smd_if_thumbnail>min-height:150px">
+			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
+				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="<txp:variable name="custom_styles" />;background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;</txp:smd_if_thumbnail>min-height:150px">
 				<txp:if_plugin name="smd_thumbnail">
-					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' />" 
+					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' form="img_sizes" />" 
 			srcset="<txp:smd_thumbnail type='w_320' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_srcset" />, 
 			<txp:smd_thumbnail type='w_1280' id='<txp:image_info type="id" />' form="img_srcset" />" 
@@ -47,7 +46,8 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 	<txp:else />
 		<p><txp:output_form form="shrink_text" /></p>
 	</txp:if_excerpt>
-	<span class="more"><a href="<txp:permlink />"><txp:text item="Continue reading" />&thinsp;&rarr;</a></span>
+	<span class="more"><a href="<txp:permlink />/"><txp:text item="continue_reading" />&thinsp;&rarr;</a></span>
+	<txp:if_last_article><txp:else /><hr class="bg-gray" /></txp:if_last_article>
 </div>
 
 <txp:else />

diff --git a/dist/simplr/forms/article/default_saturated.txp b/dist/simplr/forms/article/default_saturated.txp
@@ -1,6 +1,5 @@
 <txp:if_different>
-<noscript id="deferred-styles"><style>picture,#lightboxImage{filter:-webkit-filter:contrast(1.2) saturate(1.35);filter:contrast(1.2) saturate(1.35)}</style></noscript>
-<script>var loadDeferredStyles=function(){var addStylesNode=document.getElementById("deferred-styles");var replacement=document.createElement("div");replacement.innerHTML=addStylesNode.textContent;document.body.appendChild(replacement);addStylesNode.parentElement.removeChild(addStylesNode);};var raf=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame;if(raf)raf(function(){window.setTimeout(loadDeferredStyles,0);});else window.addEventListener('load',loadDeferredStyles);</script>
+	<txp:variable name="custom_styles" value="-webkit-filter:contrast(1.2) saturate(1.35);filter:contrast(1.2) saturate(1.35)" />
 
 <txp:else /> 
 </txp:if_different>
@@ -14,19 +13,10 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 </txp:php>
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
-			<a href="<txp:permlink />">
-				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%"</txp:smd_if_thumbnail>min-height:150px">
+			<a href="<txp:permlink />/">
+				<picture<txp:smd_if_thumbnail type="w_tiny27"> style="<txp:variable name="custom_styles">;background:url(),url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;</txp:smd_if_thumbnail>min-height:150px">
 				<txp:if_plugin name="smd_thumbnail">
-					<img src="<txp:smd_thumbnail type='w_320' display='url' id='<txp:image_info type="id" />' />" 
-			srcset="<txp:smd_thumbnail type='w_320' id='<txp:image_info type="id" />' form="img_srcset" />, 
-			<txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_srcset" />, 
-			<txp:smd_thumbnail type='w_1280' id='<txp:image_info type="id" />' form="img_srcset" />" 
-			sizes="(min-width: 1200px) 1140px, 
-			(min-width: 992px) 940px, 
-			(min-width: 768px) 720px, 
-			calc(100vw - 20px)" 
-			alt="<txp:image_info type='alt' />" />
-
+					<img <txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_sizes" /> srcset="<txp:smd_thumbnail type='w_320' id='<txp:image_info type="id" />' form="img_srcset" />, <txp:smd_thumbnail type='w_980' id='<txp:image_info type="id" />' form="img_srcset" />, <txp:smd_thumbnail type='w_1280' id='<txp:image_info type="id" />' form="img_srcset" />" sizes="(min-width: 1200px) 1140px, (min-width: 992px) 940px, (min-width: 768px) 720px, calc(100vw - 20px)" intrinsicsize="3x2" alt="<txp:image_info type='alt' />" />
 				<txp:else />
 					<img src="<txp:image_url link='0' />" width="<txp:image_info type="w" />" height="<txp:image_info type="h" />" alt="<txp:image_info type='alt' />" lazyload="on" class="no-select" />
 					</txp:if_plugin>
@@ -39,15 +29,17 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 	</txp:images>
 </txp:if_article_image>
 
-<txp:output_form form="article_metas" />
+<txp:output_form form="article_metas" /> 
 
 <div class="excerpt">
 	<txp:if_excerpt>
 		<txp:excerpt />
 	<txp:else />
 		<p><txp:output_form form="shrink_text" /></p>
-	</txp:if_excerpt>
-	<span class="more"><a href="<txp:permlink />"><txp:text item="Continue reading" />&thinsp;&rarr;</a></span>
+	</txp:if_excerpt> 
+	<span class="more"><a href="<txp:permlink />/"><txp:text item="Continue reading" />&thinsp;&rarr;</a></span>
+
+	<txp:if_last_article><txp:else /><hr class="bg-gray" /></txp:if_last_article>
 </div>
 
 <txp:else />

diff --git a/dist/simplr/forms/comment/comments.txp b/dist/simplr/forms/comment/comments.txp
@@ -5,7 +5,7 @@
 </txp:if_variable>
 
 	<h4>
-	<span class="comment-author"><span itemprop="name"><txp:comment_name /></span></span>
+	<span class="comment-author"><txp:comment_name /></span>
 
 	<txp:if_variable name="this_comment" value='<txp:author_email />'><span class="is-author">(<txp:text item="author" />)</span></txp:if_variable>