From 8fd4d2f9bc3a14684fff40f765d0197eb10e5dbc Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Mon, 19 Aug 2024 16:44:08 +0200
Subject: [PATCH] slide 7.0

---
 CHANGES.md                         |  2 +-
 module/slider/changes.md           |  5 +++--
 module/slider/slider.php           | 14 ++++++++++----
 module/slider/view/index/index.css | 14 ++++++++++++++
 module/slider/view/index/index.php | 11 +++++++----
 module/slider/view/theme/theme.php | 15 +++++++++++----
 6 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ab3aaff5..ac43abd2 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,7 +4,7 @@
 ** Corrections : **
 - Corrige la génération des miniatures au format avif et webp.
 - Corrige le filtre FLOAT du helper qui supprimait la virgule flottante.
-- Corrige des bugs dans le module Slider qui passe en version 6.6
+- Corrige des bugs dans le module Slider qui passe en version 7.0, ajout d'une option d'étiquette sous les images.
 
 ** Modifications: **
 - Mise à jour du module News 5.9, taille d'un bouton.
diff --git a/module/slider/changes.md b/module/slider/changes.md
index ba15bbb7..3beebf2e 100644
--- a/module/slider/changes.md
+++ b/module/slider/changes.md
@@ -1,6 +1,7 @@
-# Version 6.6
+# Version 7.0
+- Ajoute un affichage de la légende sous l'image
 - Corrige un tri inversé
-- Erreur dans la feuille de styme de la vue index
+- Erreur dans la feuille de style de la vue index
 - Bug de calcul de la largeur maximale du slide dans la vue index
 # Version 6.5
 - Contrôle de la variable de session liée au contenu. Evite des erreurs lorsque plusieurs onglets sont ouverts.
diff --git a/module/slider/slider.php b/module/slider/slider.php
index 05ffb40e..fc05844d 100644
--- a/module/slider/slider.php
+++ b/module/slider/slider.php
@@ -27,7 +27,7 @@ class slider extends common
 		'index' => self::GROUP_VISITOR
 	];
 
-	const VERSION = '6.6';
+	const VERSION = '7.0';
 	const REALNAME = 'Carrousel';
 	const DELETE = true;
 	const UPDATE = '0.0';
@@ -57,6 +57,7 @@ class slider extends common
 		false => 'Puces invisibles'
 	];
 
+
 	public static $auto = [
 		true => 'Active',
 		false => 'Inactive'
@@ -131,6 +132,11 @@ class slider extends common
 		'none' => 'Par défaut, sans tri',
 	];
 
+	public static $caption = [
+		'bottom' => 'En bas de l\'image',
+		'alt' => 'Uniquement dans le texte alternatif'
+	];
+
 	/**
 	 * Mise à jour du dossier
 	 */
@@ -343,7 +349,8 @@ class slider extends common
 							'speed' => $speed,
 							'timeout' => $timeout,
 							'namespace' => $this->getInput('sliderThemeNameSpace', helper::FILTER_STRING_SHORT),
-							'sort' => $this->getInput('sliderThemeTri', helper::FILTER_STRING_SHORT),
+							'sort' => $this->getInput('sliderThemeSort', helper::FILTER_STRING_SHORT),
+							'caption' => $this->getInput('sliderThemeCaption', helper::FILTER_STRING_SHORT),
 						],
 						'directory' => $this->getData(['module', $this->getUrl(0), 'directory']),
 						'legends' => $this->getData(['module', $this->getUrl(0), 'legends']),
@@ -390,9 +397,8 @@ class slider extends common
 				if ($fileInfos->isDot() === false and $fileInfos->isFile() and @getimagesize($fileInfos->getPathname())) {
 					self::$pictures[$directory . '/' . $fileInfos->getFilename()] = [
 						'legend' => $this->getData(['module', $galleryId, 'legends', str_replace('.', '', $fileInfos->getFilename())]),
-						'uri' => $this->getData(['module', $galleryId, 'uri', str_replace('.', '', $fileInfos->getFilename())]),
+						'uri' => $this->getData(['module', $galleryId, 'uri', str_replace('.', '', $fileInfos->getFilename())])
 					];
-					//self::$pictures['uri'][$directory . '/' . $fileInfos->getFilename()] = ;
 				}
 			}
 
diff --git a/module/slider/view/index/index.css b/module/slider/view/index/index.css
index 2fae0146..da8bfe5f 100644
--- a/module/slider/view/index/index.css
+++ b/module/slider/view/index/index.css
@@ -232,4 +232,18 @@
    background: #222;
    background: rgba(0, 0, 0, .8);
  }
+
+ .caption {
+  position: absolute;
+  display: block;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 15px;
+  text-align: center;
+  background: #000;
+  background: rgba(0,0,0, .8);
+  color: #fff;
+  margin: inherit;
+}
  
\ No newline at end of file
diff --git a/module/slider/view/index/index.php b/module/slider/view/index/index.php
index dfc18cd8..06dc297b 100644
--- a/module/slider/view/index/index.php
+++ b/module/slider/view/index/index.php
@@ -5,11 +5,14 @@
 				<?php foreach ($module::$pictures as $picture => $options): ?>
 					<?php if (!empty($options['uri'])): ?>
 						<a href="<?php echo helper::baseUrl() . $options['uri']; ?>">
+					<?php endif; ?>
+					<li>
+						<img src="<?php echo helper::baseUrl(false) . $picture; ?>" alt="<?php echo $options['legend']; ?>">
+						<?php if ($this->getData(['module', $this->getUrl(0), 'theme', 'caption']) === 'bottom'): ?>
+							<p class="caption"><?php echo $options['legend']; ?></p>
 						<?php endif; ?>
-						<li>
-							<img src="<?php echo helper::baseUrl(false) . $picture; ?>" alt="<?php echo $options['legend']; ?>">
-						</li>
-						<?php if (!empty($options['uri'])): ?>
+					</li>
+					<?php if (!empty($options['uri'])): ?>
 						</a>
 					<?php endif; ?>
 				<?php endforeach; ?>
diff --git a/module/slider/view/theme/theme.php b/module/slider/view/theme/theme.php
index 38ad332a..6b0baa73 100644
--- a/module/slider/view/theme/theme.php
+++ b/module/slider/view/theme/theme.php
@@ -53,26 +53,33 @@
 		<div class="block">
 			<h4>Navigation</h4>
 			<div class="row">
-				<div class="col4">
-					<?php echo template::select('sliderThemeTri', $module::$sort, [
+				<div class="col3">
+					<?php echo template::select('sliderThemeSort', $module::$sort, [
 						'label' => 'Tri des images',
 						'selected' => $this->getData(['module', $this->getUrl(0), 'theme', 'sort'])
 					]); ?>
 				</div>
-				<div class="col4">
+				<div class="col3">
 					<?php echo template::select('sliderThemePager', $module::$pager, [
 						'label' => 'Puces horizontales',
 						'selected' => $this->getData(['module', $this->getUrl(0), 'theme', 'pager']),
 					]); ?>
 				</div>
-				<div class="col4">
+				<div class="col3">
 					<?php echo template::select('sliderThemeNameSpace', $module::$namespace, [
 						'label' => 'Boutons latéraux',
 						'selected' => $this->getData(['module', $this->getUrl(0), 'theme', 'namespace'])
 					]); ?>
 				</div>
+				<div class="col3">
+					<?php echo template::select('sliderThemeCaption', $module::$caption, [
+						'label' => 'Légendes',
+						'selected' => $this->getData(['module', $this->getUrl(0), 'theme', 'caption'])
+					]); ?>
+				</div>
 			</div>
 		</div>
 	</div>
 </div>
+</div>
 <?php echo template::formClose(); ?>
\ No newline at end of file