Reupload

Simplr v2.3.
cara-tm · Jan 5, 2019 · 00a095f · 00a095f
1 parent 321a7f0
commit 00a095f
Show file tree

Hide file tree

Showing 20 changed files with 73 additions and 49 deletions.
diff --git a/dist/Simplr/forms/article/default_halftone.txp b/dist/Simplr/forms/article/default_halftone.txp
@@ -22,7 +22,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
 			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
-				<picture<txp:if_plugin name="smd_thumbnail"><txp:smd_if_thumbnail type="w_tiny27"> class="halftone" 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></txp:if_plugin>min-height:150px;min-height:44vw">
+				<picture<txp:if_plugin name="smd_thumbnail"><txp:smd_if_thumbnail type="w_tiny27"> class="halftone" 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%;background-blend-mode:overlay;background-color:rgba(20,86,113,.5);</txp:smd_if_thumbnail></txp:if_plugin>min-height:150px;min-height:44vw">
 				<txp:if_plugin name="smd_thumbnail">
 					<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" />" sizes="(min-width: 1200px) 1140px, (min-width: 992px) 940px, (min-width: 768px) 720px, calc(100vw - 20px)" alt="<txp:image_info type='alt' />" />
 				<txp:else />
@@ -36,7 +36,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		</figure>
 	</txp:images>
 <txp:else />
-	<txp:variable name="device" value="mobile" />
+
 </txp:if_article_image>
 
 <txp:output_form form="article_metas" />

diff --git a/dist/Simplr/forms/misc/hello.js.txp b/dist/Simplr/forms/misc/hello.js.txp
diff --git a/dist/Simplr/forms/misc/picture_tags.txp b/dist/Simplr/forms/misc/picture_tags.txp
@@ -2,10 +2,6 @@
 Dependencies: 'images' form
 </txp:hide>
 
-<picture style="background:url(<txp:image_url id='<txp:variable name="first_pic" />' link="0" />), url(<txp:php>
-$id = variable(array('name'=>'first_pic'));
-$ext = image_info(array('id'=>$id,'type'=>'ext'));
-echo hu."images/w_tiny27/".$id.$ext;
-</txp:php>) center center no-repeat"><txp:images id="" break="">
+<picture><txp:images id="" break="">
 	<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:images></picture>
diff --git a/dist/css/default.min.css b/dist/css/default.min.css
diff --git a/dist/simplr/forms/article/default.txp b/dist/simplr/forms/article/default.txp
@@ -13,7 +13,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
 			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
-				<picture<txp:if_plugin name="smd_thumbnail"><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></txp:if_plugin>min-height:150px;min-height:44vw">
+				<picture<txp:if_plugin name="smd_thumbnail"><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%;background-blend-mode:overlay;background-color:rgba(20,86,113,.5);</txp:smd_if_thumbnail></txp:if_plugin>min-height:150px;min-height:44vw">
 				<txp:if_plugin name="smd_thumbnail">
 					<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" />" sizes="(min-width: 1200px) 1140px, (min-width: 992px) 940px, (min-width: 768px) 720px, calc(100vw - 20px)" alt="<txp:image_info type='alt' />" />
 				<txp:else />
@@ -27,7 +27,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		</figure>
 	</txp:images>
 <txp:else />
-	<variable name="device" value="mobile" />
+
 </txp:if_article_image>
 
 <txp:output_form form="article_metas" />

diff --git a/dist/simplr/forms/article/default_black_white.txp b/dist/simplr/forms/article/default_black_white.txp
@@ -20,7 +20,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
 			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
-				<picture<txp:if_plugin name="smd_thumbnail"><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></txp:if_plugin>min-height:150px;min-height:44vw">
+				<picture<txp:if_plugin name="smd_thumbnail"><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%;background-blend-mode:overlay;background-color:rgba(20,86,113,.5);</txp:smd_if_thumbnail></txp:if_plugin>min-height:150px;min-height:44vw">
 				<txp:if_plugin name="smd_thumbnail">
 					<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" />" sizes="(min-width: 1200px) 1140px, (min-width: 992px) 940px, (min-width: 768px) 720px, calc(100vw - 20px)" alt="<txp:image_info type='alt' />" />
 				<txp:else />
@@ -34,7 +34,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		</figure>
 	</txp:images>
 <txp:else />
-	<txp:variable name="device" value="mobile" />
+
 </txp:if_article_image>
 
 <txp:output_form form="article_metas" />

diff --git a/dist/simplr/forms/article/default_no_lightbox.txp b/dist/simplr/forms/article/default_no_lightbox.txp
@@ -15,7 +15,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
 			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
-				<picture<txp:if_plugin name="smd_thumbnail"><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></txp:if_plugin>min-height:150px;min-height:44vw">
+				<picture<txp:if_plugin name="smd_thumbnail"><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%;background-blend-mode:overlay;background-color:rgba(20,86,113,.5);</txp:smd_if_thumbnail></txp:if_plugin>min-height:150px;min-height:44vw">
 				<txp:if_plugin name="smd_thumbnail">
 					<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" />" sizes="(min-width: 1200px) 1140px, (min-width: 992px) 940px, (min-width: 768px) 720px, calc(100vw - 20px)" alt="<txp:image_info type='alt' />" />
 				<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
@@ -19,7 +19,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
 			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
-				<picture<txp:if_plugin name="smd_thumbnail"><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></txp:if_plugin>min-height:150px;min-height:44vw">
+				<picture<txp:if_plugin name="smd_thumbnail"><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%;background-blend-mode:overlay;background-color:rgba(20,86,113,.5);</txp:smd_if_thumbnail></txp:if_plugin>min-height:150px;min-height:44vw">
 				<txp:if_plugin name="smd_thumbnail">
 					<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" />" sizes="(min-width:1200px) 1140px,(min-width:992px) 940px,(min-width:768px) 720px,calc(100vw-20px)" alt="<txp:image_info type='alt' />" />
 				<txp:else />

diff --git a/dist/simplr/forms/article/default_no_lightbox_saturated.txp b/dist/simplr/forms/article/default_no_lightbox_saturated.txp
@@ -19,7 +19,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
 			<a href="<txp:permlink />/" title="<txp:text item="read_more" />">
-				<picture<txp:if_plugin name="smd_thumbnail"><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></txp:if_plugin>min-height:150px;min-height:44vw">
+				<picture<txp:if_plugin name="smd_thumbnail"><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%;background-blend-mode:overlay;background-color:rgba(20,86,113,.5);</txp:smd_if_thumbnail></txp:if_plugin>min-height:150px;min-height:44vw">
 				<txp:if_plugin name="smd_thumbnail">
 					<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" />" sizes="(min-width: 1200px) 1140px, (min-width: 992px) 940px, (min-width: 768px) 720px, calc(100vw - 20px)" alt="<txp:image_info type='alt' />" />
 				<txp:else />

diff --git a/dist/simplr/forms/article/default_saturated.txp b/dist/simplr/forms/article/default_saturated.txp
@@ -19,7 +19,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		<txp:images form="images" limit="1" id='<txp:variable name="first_pic" />' break="">
 		<figure class="aspect-ratio">
 			<a href="<txp:permlink />/">
-				<picture<txp:if_plugin name="smd_thumbnail"><txp:smd_if_thumbnail type="w_tiny27"> style="<txp:variable name="custom_styles" />;background: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></txp:if_plugin>min-height:150px;min-height:44vw">
+				<picture<txp:if_plugin name="smd_thumbnail"><txp:smd_if_thumbnail type="w_tiny27"> style="<txp:variable name="custom_styles" />;background:url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;background-blend-mode:overlay;background-color:rgba(20,86,113,.5);</txp:smd_if_thumbnail></txp:if_plugin>min-height:150px;min-height:44vw">
 				<txp:if_plugin name="smd_thumbnail">
 					<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 />
@@ -33,7 +33,7 @@ $variable['first_pic'] = strtok(custom_field(array('name'=>'article_image')), ',
 		</figure>
 	</txp:images>
 <txp:else />
-	<txp:variable name="device" value="mobile" />
+
 </txp:if_article_image>
 
 <txp:output_form form="article_metas" /> 

diff --git a/dist/simplr/forms/misc/image_count.txp b/dist/simplr/forms/misc/image_count.txp
@@ -5,5 +5,5 @@
 $list = custom_field(array('name'=>'article_image'));
 $nb = explode(',', $list);
 $nb = count($nb);
-echo( ($nb > 1 ? '<span>Total<b class="colon">:</b> '.$nb.' photos.</span>' : '') );
+echo( ($nb > 1 ? '<span>Total: '.$nb.' photos.</span>' : '') );
 </txp:php>
diff --git a/dist/simplr/forms/misc/no_lightbox_images.txp b/dist/simplr/forms/misc/no_lightbox_images.txp
@@ -1,19 +1,11 @@
-<txp:images break="">
-		<figure class="aspect-ratio<txp:if_section name=""> mt6</txp:if_section> tiny<txp:variable name="full" />">
-
-<txp:if_plugin name="smd_thumbnail">
-		<picture style="<txp:variable name="custom_styles" />;background:url(<txp:smd_thumbnail type='w_tiny27' display='url' id='<txp:image_info type="id" />' />) center center no-repeat;background-size:100% 100%;min-height:100%" class="<txp:variable name="halftone" />">
-			<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' />" />
-		</picture>
-<txp:else />
-
+<txp:hide>
+Dependencies: 'default' form
+</txp:hide>
+<txp:images break=""><figure class="aspect-ratio<txp:if_section name=""> mt6</txp:if_section> tiny">
+	<picture>
 	<img src="<txp:image_url />" 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>
-
-			<figcaption>
-				<txp:output_form form="image_count" /> <txp:image_info escape="" /> 
-			</figcaption>
-
-</figure>
-</txp:images>
+</picture>
+	<txp:variable name="caption" value='<txp:image_info />' /><txp:if_variable name="caption" value=""><figcaption>
+		<txp:image_info type="caption" escape="" />
+	</figcaption></txp:if_variable>
+</figure></txp:images>
diff --git a/dist/simplr/forms/misc/shrink_text.txp b/dist/simplr/forms/misc/shrink_text.txp
@@ -15,8 +15,6 @@ $input = body(array());
 if ($strip_html) {
 	$input = strip_tags($input);
 }
-// Remove all table tags
-$input = preg_replace('/\<[\/]?(table)([^\>]*)\>/i', '', $input);
 // Trim if longer than trim length.
 if (strlen($input) > $length) {
 	// Special signs found?

diff --git a/dist/simplr/forms/section/copyright_date.txp b/dist/simplr/forms/section/copyright_date.txp
@@ -4,7 +4,7 @@
  * into readable copyright dates notice
  */
 
-// This website date creation
+// This website date creation or $first = '2019'
 $first = date('Y', get_pref('sql_now_created'));
 // The current year
 $now = date('Y', time());