From 83b41037888cdd6958a2dd1ca1bba76d93a1bef6 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 19 Aug 2024 10:11:29 +0200 Subject: [PATCH] 13.3.05 Bugs module Sliders --- CHANGES.md | 1 + module/slider/changes.md | 4 + module/slider/slider.php | 25 +- module/slider/view/index/index.css | 385 +++++++++++++------------- module/slider/view/index/index.js.php | 13 - 5 files changed, 202 insertions(+), 226 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 606a80e9..a1ed4309 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +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 ** 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 7949f1f6..ba15bbb7 100644 --- a/module/slider/changes.md +++ b/module/slider/changes.md @@ -1,3 +1,7 @@ +# Version 6.6 +- Corrige un tri inversé +- Erreur dans la feuille de styme 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. # Version 6.4 diff --git a/module/slider/slider.php b/module/slider/slider.php index df1f6eda..178e06ae 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.4'; + const VERSION = '6.6'; const REALNAME = 'Carrousel'; const DELETE = true; const UPDATE = '0.0'; @@ -76,7 +76,7 @@ class slider extends common 1920 => '1920 pixels', 0 => 'Largeur de l\'écran' ]; - public static $selectedMaxwidth = 0; + public static $selectedMaxwidth = 640; // Transition public static $speed = [ @@ -125,8 +125,8 @@ class slider extends common //Choix du tri public static $sort = [ - 'asc' => 'Alphabétique naturel', - 'dsc' => 'Alphabétique naturel inverse', + 'dsc' => 'Alphabétique naturel', + 'asc' => 'Alphabétique naturel inverse', 'rand' => 'Aléatoire', 'none' => 'Par défaut, sans tri', ]; @@ -236,22 +236,8 @@ class slider extends common ]; } } - // Tri des images pour affichage de la liste dans la page d'édition - switch ($this->getData(['module', $this->getUrl(0), 'theme', 'sort'])) { - case 'dsc': - ksort(self::$pictures, SORT_NATURAL | SORT_FLAG_CASE); - break; - case 'asc': - krsort(self::$pictures, SORT_NATURAL | SORT_FLAG_CASE); - break; - case 'rand': - case 'none': - default: - break; - } } - // Valeurs en sortie $this->addOutput([ 'title' => 'Configuration du module', @@ -353,7 +339,7 @@ class slider extends common // Sélection largeur de l'écran self::$selectedMaxwidth = array_key_exists($this->getData(['module', $this->getUrl(0), 'theme', 'maxWidth']), self::$screenWidth) ? $this->getData(['module', $this->getUrl(0), 'theme', 'maxWidth']) - : 0; + : 640; // Valeurs en sortie $this->addOutput([ @@ -448,7 +434,6 @@ class slider extends common private function init() { if (is_null($this->getData(['module', $this->getUrl(0), 'theme']))) { - $this->setData([ 'module', $this->getUrl(0), diff --git a/module/slider/view/index/index.css b/module/slider/view/index/index.css index 9fb90446..33b8beaa 100644 --- a/module/slider/view/index/index.css +++ b/module/slider/view/index/index.css @@ -15,222 +15,221 @@ /*! http://responsiveslides.com v1.55 by @arielsalminen */ .rslides { - position: relative; - list-style: none; - overflow: hidden; - width: 100%; - padding: 0; - margin: 0 auto; -} + position: relative; + list-style: none; + overflow: hidden; + width: 100%; + padding: 0; + margin: 0 auto; + } -.rslides li { - -webkit-backface-visibility: hidden; - position: absolute; - display: none; - width: 100%; - left: 0; - top: 0; -} + .rslides li { + -webkit-backface-visibility: hidden; + position: absolute; + display: none; + width: 100%; + left: 0; + top: 0; + } -.rslides li:first-child { - position: relative; - display: block; - float: left; -} + .rslides li:first-child { + position: relative; + display: block; + float: left; + } -.rslides img { - display: block; - height: auto; - float: left; - width: 100%; - border: 0; -} + .rslides img { + display: block; + height: auto; + float: left; + width: 100%; + border: 0; + } + + #wrapper { + margin: 0 auto; + width: 100%; + margin-bottom: 50px; + } + + h1 { + font: 600 28px/36px sans-serif; + margin: 50px 0; + } + + h3 { + font: 600 18px/24px sans-serif; + color: #999; + margin: 0 0 20px; + } + + a { + color: #222; + } + + .rslides { + margin: 0 auto; + } + + .rslides_container { + margin-bottom: 50px; + position: relative; + float: left; + width: 100%; + } + + .centered-btns_nav { + z-index: 3; + position: absolute; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + top: 50%; + left: 0; + opacity: 0.7; + text-indent: -9999px; + overflow: hidden; + text-decoration: none; + height: 61px; + width: 38px; + background: transparent url("module/slider/view/index/black.gif") no-repeat left top; + margin-top: -45px; + } + + .centered-btns_nav:active { + opacity: 1.0; + } + + .centered-btns_nav.next { + left: auto; + background-position: right top; + right: 0; + } + + .transparent-btns_nav { + z-index: 3; + position: absolute; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + top: 0; + left: 0; + display: block; + background: #fff; + /* Fix for IE6-9 */ + opacity: 0; + filter: alpha(opacity=1); + width: 48%; + text-indent: -9999px; + overflow: hidden; + height: 91%; + } + + .transparent-btns_nav.next { + left: auto; + right: 0; + } + + .large-btns_nav { + z-index: 3; + position: absolute; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + opacity: 0.6; + text-indent: -9999px; + overflow: hidden; + top: 0; + bottom: 0; + left: 0; + background: #000 url("module/slider/view/index/black.gif") no-repeat left 50%; + width: 38px; + } + + .large-btns_nav:active { + opacity: 1.0; + } + + .large-btns_nav.next { + left: auto; + background-position: right 50%; + right: 0; + } - #wrapper { - margin: 0 auto; - width: 100%; - margin-bottom: 50px; - } - - h1 { - font: 600 28px/36px sans-serif; - margin: 50px 0; - } - - h3 { - font: 600 18px/24px sans-serif; - color: #999; - margin: 0 0 20px; - } - - a { - color: #222; - } - - .rslides { - margin: 0 auto; - } - - .rslides_container { - margin-bottom: 50px; - position: relative; - float: left; - width: 100%; - } - - .centered-btns_nav { - z-index: 3; - position: absolute; - -webkit-tap-highlight-color: rgba(0,0,0,0); - top: 50%; - left: 0; - opacity: 0.7; - text-indent: -9999px; - overflow: hidden; - text-decoration: none; - height: 61px; - width: 38px; - background: transparent url("module/slider/view/index/black.gif") no-repeat left top; - margin-top: -45px; - } - - .centered-btns_nav:active { - opacity: 1.0; - } - - .centered-btns_nav.next { - left: auto; - background-position: right top; - right: 0; - } - - .transparent-btns_nav { - z-index: 3; - position: absolute; - -webkit-tap-highlight-color: rgba(0,0,0,0); - top: 0; - left: 0; - display: block; - background: #fff; /* Fix for IE6-9 */ - opacity: 0; - filter: alpha(opacity=1); - width: 48%; - text-indent: -9999px; - overflow: hidden; - height: 91%; - } - - .transparent-btns_nav.next { - left: auto; - right: 0; - } - - .large-btns_nav { - z-index: 3; - position: absolute; - -webkit-tap-highlight-color: rgba(0,0,0,0); - opacity: 0.6; - text-indent: -9999px; - overflow: hidden; - top: 0; - bottom: 0; - left: 0; - background: #000 url("module/slider/view/index/black.gif") no-repeat left 50%; - width: 38px; - } - - .large-btns_nav:active { - opacity: 1.0; - } - - .large-btns_nav.next { - left: auto; - background-position: right 50%; - right: 0; - } - /** Boutons blancs */ .white-btns_nav { - z-index: 3; - position: absolute; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - opacity: 0.6; - text-indent: -9999px; - overflow: hidden; - top: 0; - bottom: 0; - left: 0; - background: transparent url("module/slider/view/index/white.gif") no-repeat left 50%; - width: 38px; -} + z-index: 3; + position: absolute; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + opacity: 0.6; + text-indent: -9999px; + overflow: hidden; + top: 0; + bottom: 0; + left: 0; + background: transparent url("module/slider/view/index/white.gif") no-repeat left 50%; + width: 38px; + } -.white-btns_nav:active { - opacity: 1.0; -} + .white-btns_nav:active { + opacity: 1.0; + } -.white-btns_nav.next { - left: auto; - background-position: right 50%; - right: 0; -} + .white-btns_nav.next { + left: auto; + background-position: right 50%; + right: 0; + } /** Boutons blancs */ - .centered-btns_nav:focus, - .transparent-btns_nav:focus, + .centered-btns_nav:focus, + .transparent-btns_nav:focus, .large-btns_nav:focus, .white-btns_nav:focus { - outline: none; - } - - .centered-btns_tabs, - .transparent-btns_tabs, + outline: none; + } + + .centered-btns_tabs, + .transparent-btns_tabs, .large-btns_tabs, - .white-btns_tabs { - margin-top: 10px; - text-align: center; - } - - .centered-btns_tabs li, - .transparent-btns_tabs li, + .white-btns_tabs { + margin-top: 10px; + text-align: center; + } + + .centered-btns_tabs li, + .transparent-btns_tabs li, .large-btns_tabs li, .white-btns_tabs li { - display: inline; - float: none; - _float: left; - *float: left; - margin-right: 5px; - } - - .centered-btns_tabs a, - .transparent-btns_tabs a, + display: inline; + float: none; + float: left; + margin-right: 5px; + } + + .centered-btns_tabs a, + .transparent-btns_tabs a, .large-btns_tabs a, - .white-btns_tabs a { - text-indent: -9999px; - overflow: hidden; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - background: #ccc; + .white-btns_tabs a { + text-indent: -9999px; + overflow: hidden; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + background: #ccc; background: rgba(0, 0, 0, .2); - display: inline-block; - _display: block; - *display: block; + display: inline-block; + display: block; -webkit-box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, .3); -moz-box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, .3); box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, .3); - width: 9px; - height: 9px; - } - - .centered-btns_here a, - .transparent-btns_here a, + width: 9px; + height: 9px; + } + + .centered-btns_here a, + .transparent-btns_here a, .large-btns_here a, .white-btns_here a { - background: #222; - background: rgba(0,0,0, .8); - } - \ No newline at end of file + background: #222; + background: rgba(0, 0, 0, .8); + } + \ No newline at end of file diff --git a/module/slider/view/index/index.js.php b/module/slider/view/index/index.js.php index 82daf402..059a7d32 100644 --- a/module/slider/view/index/index.js.php +++ b/module/slider/view/index/index.js.php @@ -39,19 +39,6 @@ $(document).ready(function () { var screenwidth = "getData(['theme', 'site', 'width']), 'px')); ?>"; var sort = "getData(['module', $this->getUrl(0),'theme', 'sort']); ?>"; // Réduction de la taille maximale selon la largeur de la section - - // Limiter à la largeur de l'écran - if ( - screenwidth !== '100%' && - maxwidth > screenwidth - ) { - mawwidth = screenwidth - 40; - } - // Largeur 100% - maxwidth = $("#site").width(); - - - console.log(maxwidth); $("#wrapper").css('width', "100%"); $(function () { $("#sliders").responsiveSlides({