From 2d0c219d0dcb1d16440ffd56d517d4e5ca3a2dd8 Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 14 Mar 2012 16:03:26 +0000 Subject: [PATCH] // Updated homeslider module : added loop configuration --- modules/homeslider/homeslider.php | 21 ++++++++++++++++++--- modules/homeslider/homeslider.tpl | 8 ++++++++ modules/homeslider/js/homeslider.js | 4 ++-- modules/homeslider/translations/fr.php | 5 +++-- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index f28d5bc67..af0624de8 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -27,7 +27,7 @@ /** * @since 1.5.0 - * @version 1.1 (2011-11-23) + * @version 1.2 (2012-03-14) */ if (!defined('_PS_VERSION_')) @@ -43,7 +43,7 @@ class HomeSlider extends Module { $this->name = 'homeslider'; $this->tab = 'front_office_features'; - $this->version = '1.1'; + $this->version = '1.2'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->secure_key = Tools::encrypt($this->name); @@ -67,6 +67,7 @@ class HomeSlider extends Module $res &= Configuration::updateValue('HOMESLIDER_HEIGHT', '300'); $res &= Configuration::updateValue('HOMESLIDER_SPEED', '1300'); $res &= Configuration::updateValue('HOMESLIDER_PAUSE', '7700'); + $res &= Configuration::updateValue('HOMESLIDER_LOOP', '1'); /* Creates tables */ $res &= $this->createTables(); @@ -117,6 +118,7 @@ class HomeSlider extends Module $res &= Configuration::deleteByName('HOMESLIDER_HEIGHT'); $res &= Configuration::deleteByName('HOMESLIDER_SPEED'); $res &= Configuration::deleteByName('HOMESLIDER_PAUSE'); + $res &= Configuration::deleteByName('HOMESLIDER_LOOP'); return $res; } return false; @@ -236,6 +238,17 @@ class HomeSlider extends Module
ms
'; + /* Loop field */ + $this->_html .= ' + +
+ Yes + + + No + + +
'; /* Save */ $this->_html .= '
@@ -505,6 +518,7 @@ class HomeSlider extends Module $res &= Configuration::updateValue('HOMESLIDER_HEIGHT', (int)Tools::getValue('HOMESLIDER_HEIGHT')); $res &= Configuration::updateValue('HOMESLIDER_SPEED', (int)Tools::getValue('HOMESLIDER_SPEED')); $res &= Configuration::updateValue('HOMESLIDER_PAUSE', (int)Tools::getValue('HOMESLIDER_PAUSE')); + $res &= Configuration::updateValue('HOMESLIDER_LOOP', (int)Tools::getValue('HOMESLIDER_LOOP')); if (!$res) $errors .= $this->displayError($this->l('Configuration could not be updated')); $this->_html .= $this->displayConfirmation($this->l('Configuration updated')); @@ -616,7 +630,8 @@ class HomeSlider extends Module 'width' => Configuration::get('HOMESLIDER_WIDTH'), 'height' => Configuration::get('HOMESLIDER_HEIGHT'), 'speed' => Configuration::get('HOMESLIDER_SPEED'), - 'pause' => Configuration::get('HOMESLIDER_PAUSE') + 'pause' => Configuration::get('HOMESLIDER_PAUSE'), + 'loop' => Configuration::get('HOMESLIDER_LOOP'), ); $slides = $this->getSlides(true); diff --git a/modules/homeslider/homeslider.tpl b/modules/homeslider/homeslider.tpl index d430713bd..ea175f613 100644 --- a/modules/homeslider/homeslider.tpl +++ b/modules/homeslider/homeslider.tpl @@ -27,7 +27,15 @@ {if isset($homeslider)} diff --git a/modules/homeslider/js/homeslider.js b/modules/homeslider/js/homeslider.js index 8d3655e40..bdebedd7f 100644 --- a/modules/homeslider/js/homeslider.js +++ b/modules/homeslider/js/homeslider.js @@ -32,11 +32,11 @@ $(function(){ var homeslider_pause = 6000; $('#homeslider').bxSlider({ - infiniteLoop: true, + infiniteLoop: homeslider_loop, hideControlOnEnd: true, pager: true, autoHover: true, - auto: true, + auto: homeslider_loop, speed: homeslider_speed, pause: homeslider_pause }); diff --git a/modules/homeslider/translations/fr.php b/modules/homeslider/translations/fr.php index 104ae2dbc..c86115e99 100644 --- a/modules/homeslider/translations/fr.php +++ b/modules/homeslider/translations/fr.php @@ -9,6 +9,9 @@ $_MODULE['<{homeslider}prestashop>homeslider_e933dc24fb245d863a43b4fefe9b45f5'] $_MODULE['<{homeslider}prestashop>homeslider_48ccf48dcf2218a413ce473262f21a0c'] = 'Largeur :'; $_MODULE['<{homeslider}prestashop>homeslider_2c526c645bca9542ba1598835d46b753'] = 'Vitesse :'; $_MODULE['<{homeslider}prestashop>homeslider_154e6bcf4e3b49a424323cb9021ef851'] = 'Pause :'; +$_MODULE['<{homeslider}prestashop>homeslider_9ce04a5715756f9c0fece348db9b7da1'] = 'Boucle : '; +$_MODULE['<{homeslider}prestashop>homeslider_93cba07454f06a4a960172bbd6e2a435'] = 'Oui'; +$_MODULE['<{homeslider}prestashop>homeslider_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non'; $_MODULE['<{homeslider}prestashop>homeslider_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer'; $_MODULE['<{homeslider}prestashop>homeslider_571988492824e57070d78e6c86333f20'] = 'Configuration d\'une diapositive'; $_MODULE['<{homeslider}prestashop>homeslider_02023fc24279454047fd419ecd1db9af'] = 'Ajouter une diapositive'; @@ -25,8 +28,6 @@ $_MODULE['<{homeslider}prestashop>homeslider_3b3d06023f6353f8fd05f859b298573e'] $_MODULE['<{homeslider}prestashop>homeslider_8046c95f98fc714db47978092bb24264'] = 'Légende :'; $_MODULE['<{homeslider}prestashop>homeslider_d0042a700e9bdf79689d63ee6846dc0e'] = 'Description :'; $_MODULE['<{homeslider}prestashop>homeslider_3d091e856cb7615d1ccb96bc759b5a92'] = 'Active :'; -$_MODULE['<{homeslider}prestashop>homeslider_93cba07454f06a4a960172bbd6e2a435'] = 'Oui'; -$_MODULE['<{homeslider}prestashop>homeslider_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non'; $_MODULE['<{homeslider}prestashop>homeslider_ea4788705e6873b424c65e91c2846b19'] = 'Annuler'; $_MODULE['<{homeslider}prestashop>homeslider_70397c4b252a5168c5ec003931cea215'] = 'Champs requis'; $_MODULE['<{homeslider}prestashop>homeslider_3f80dc2cdd06939d4f5514362067cd86'] = 'Valeur non valables';