diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index 192a885ad..5dfc113d0 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -559,6 +559,7 @@ class HomeSlider extends Module $this->context->smarty->assign('homeslider_slides', $slides); $this->context->smarty->assign('homeslider', $slider); + return $this->display(__FILE__, 'homeslider.tpl'); } @@ -568,8 +569,8 @@ class HomeSlider extends Module return; $this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js'); $this->context->controller->addJS($this->_path.'js/jquery.bxSlider.min.js'); - $this->context->controller->addJS($this->_path.'js/homeslider.js'); $this->context->controller->addCSS($this->_path.'bx_styles.css'); + $this->context->controller->addJS($this->_path.'js/homeslider.js'); } public function hookBackOfficeTop() diff --git a/modules/homeslider/js/homeslider.js b/modules/homeslider/js/homeslider.js index 0f63b18b0..f308023d0 100644 --- a/modules/homeslider/js/homeslider.js +++ b/modules/homeslider/js/homeslider.js @@ -1,11 +1,17 @@ $(function(){ - $('#homeslider').bxSlider({ - infiniteLoop: true, - hideControlOnEnd: true, - pager: true, - autoHover: true, - auto: true, - speed: homeslider_speed, - pause: homeslider_pause - }); + + if (!homeslider_speed == undefined) + var homeslider_speed = 300; + if (!homeslider_pause == undefined) + var homeslider_pause = 6000; + + $('#homeslider').bxSlider({ + infiniteLoop: true, + hideControlOnEnd: true, + pager: true, + autoHover: true, + auto: true, + speed: homeslider_speed, + pause: homeslider_pause + }); }); \ No newline at end of file diff --git a/modules/productcomments/productcomments-extra.tpl b/modules/productcomments/productcomments-extra.tpl index 2805bd600..04046aa8a 100644 --- a/modules/productcomments/productcomments-extra.tpl +++ b/modules/productcomments/productcomments-extra.tpl @@ -77,6 +77,7 @@