Merge pull request #82 from PrestaShop/dev

Release version 3.1.2
PrestaShop · Mar 15, 2023 · c5980fe · c5980fe
2 parents ffc0818 + dbc305c
commit c5980fe
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 109 deletions.
diff --git a/Ps_HomeSlide.php b/Ps_HomeSlide.php
@@ -49,7 +49,7 @@ class Ps_HomeSlide extends ObjectModel
             'description' => ['type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 4000],
             'title' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 255],
             'legend' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 255],
-            'url' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isUrl', 'required' => true, 'size' => 255],
+            'url' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isUrl', 'size' => 255],
             'image' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 255],
         ],
     ];

diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_imageslider</name>
     <displayName><![CDATA[Image slider]]></displayName>
-    <version><![CDATA[3.1.1]]></version>
+    <version><![CDATA[3.1.2]]></version>
     <description><![CDATA[Adds an image slider to your site.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

diff --git a/images/sample-1_rtl.jpg b/images/sample-1_rtl.jpg
diff --git a/images/sample-2_rtl.jpg b/images/sample-2_rtl.jpg
diff --git a/images/sample-3_rtl.jpg b/images/sample-3_rtl.jpg
diff --git a/js/Sortable.min.js b/js/Sortable.min.js
diff --git a/ps_imageslider.php b/ps_imageslider.php
diff --git a/views/templates/hook/list.tpl b/views/templates/hook/list.tpl
@@ -32,9 +32,9 @@
 	</span>
 	</h3>
 	<div id="slidesContent">
-		<div id="slides">
+		<div id="slides" class="list-group">
 			{foreach from=$slides item=slide}
-				<div id="slides_{$slide.id_slide}" class="panel">
+				<div id="slides_{$slide.id_slide}" class="panel list-group-item" data-id="slides[]={$slide.id_slide}">
 					<div class="row">
 						<div class="col-lg-1">
 							<span><i class="icon-arrows "></i></span>

diff --git a/views/templates/hook/slider.tpl b/views/templates/hook/slider.tpl
@@ -28,15 +28,15 @@
     <ul class="rslides">
       {foreach from=$homeslider.slides item=slide}
         <li class="slide">
-          <a href="{$slide.url}">
+          {if !empty($slide.url)}<a href="{$slide.url}">{/if}
             <img src="{$slide.image_url}" alt="{$slide.legend|escape}" />
             {if $slide.title || $slide.description }
               <span class="caption">
                 <h2>{$slide.title}</h2>
                 <div>{$slide.description nofilter}</div>
               </span>
             {/if}
-          </a>
+          {if !empty($slide.url)}</a>{/if}
         </li>
       {/foreach}
     </ul>