diff --git a/Block/Adminhtml/Preview.php b/Block/Adminhtml/Preview.php index de55498..f62be9e 100644 --- a/Block/Adminhtml/Preview.php +++ b/Block/Adminhtml/Preview.php @@ -85,6 +85,7 @@ public function setStyleSlidePreviewTemplate($styleslideParam) case SliderModel::STYLESLIDE_FLEXSLIDER_TWO: case SliderModel::STYLESLIDE_FLEXSLIDER_THREE: case SliderModel::STYLESLIDE_FLEXSLIDER_FOUR: + case SliderModel::STYLESLIDE_FLEXSLIDER_FIVE: $this->setTemplate(self::STYLESLIDE_FLEXSLIDER_PREVIEW_TEMPLATE); break; } diff --git a/Block/Adminhtml/Slider/Edit/Tab/Form.php b/Block/Adminhtml/Slider/Edit/Tab/Form.php index 8f2f37c..46e6a75 100644 --- a/Block/Adminhtml/Slider/Edit/Tab/Form.php +++ b/Block/Adminhtml/Slider/Edit/Tab/Form.php @@ -411,6 +411,11 @@ public function getMappingFieldDependence() 'fieldNameFrom' => 'style_slide', 'refField' => '1,2,3,4,5', ], + [ + 'fieldName' => ['width'], + 'fieldNameFrom' => 'style_slide', + 'refField' => '11', + ], [ 'fieldName' => 'category_ids', 'fieldNameFrom' => 'position', @@ -476,7 +481,7 @@ public function getMappingFieldDependence() [ 'fieldName' => 'slider_speed', 'fieldNameFrom' => 'style_slide', - 'refField' => '5,10,', + 'refField' => '5,10,11', 'negative' => true, ], ]; diff --git a/Helper/Data.php b/Helper/Data.php index d86ef39..a8cfa1c 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -150,6 +150,7 @@ public function getSliderModeAvailable() Slider::STYLESLIDE_FLEXSLIDER_TWO => 'FlexSlider 2', Slider::STYLESLIDE_FLEXSLIDER_THREE => 'FlexSlider 3', Slider::STYLESLIDE_FLEXSLIDER_FOUR => 'FlexSlider 4', + Slider::STYLESLIDE_FLEXSLIDER_FIVE => 'FlexSlider 5', ]; } @@ -211,6 +212,10 @@ public function getStyleSlider() 'label' => __('FlexSlider 4'), 'value' => Slider::STYLESLIDE_FLEXSLIDER_FOUR, ], + [ + 'label' => __('FlexSlider 5'), + 'value' => Slider::STYLESLIDE_FLEXSLIDER_FIVE, + ], ], ], ]; @@ -463,6 +468,10 @@ public function getCoreSlider() 'label' => __('FlexSlider 4'), 'value' => Slider::STYLESLIDE_FLEXSLIDER_FOUR, ], + [ + 'label' => __('FlexSlider 5'), + 'value' => Slider::STYLESLIDE_FLEXSLIDER_FIVE, + ], ]; } } diff --git a/Model/Slider.php b/Model/Slider.php index 58a7a6f..6784c1e 100644 --- a/Model/Slider.php +++ b/Model/Slider.php @@ -76,6 +76,7 @@ class Slider extends \Magento\Framework\Model\AbstractModel const STYLESLIDE_FLEXSLIDER_TWO = 8; const STYLESLIDE_FLEXSLIDER_THREE = 9; const STYLESLIDE_FLEXSLIDER_FOUR = 10; + const STYLESLIDE_FLEXSLIDER_FIVE = 11; /** * position code of note slider. diff --git a/view/adminhtml/templates/slider/preview/flexslider.phtml b/view/adminhtml/templates/slider/preview/flexslider.phtml index 9565cfa..e9cc0f7 100644 --- a/view/adminhtml/templates/slider/preview/flexslider.phtml +++ b/view/adminhtml/templates/slider/preview/flexslider.phtml @@ -30,6 +30,7 @@ require(['jquery', 'magestore/flexslider'], function($) { var STYLESLIDE_FLEXSLIDER_ONE = ; var STYLESLIDE_FLEXSLIDER_TWO = ; var STYLESLIDE_FLEXSLIDER_THREE = ; + var STYLESLIDE_FLEXSLIDER_FIVE = ; switch () { case STYLESLIDE_FLEXSLIDER_ONE: @@ -62,6 +63,15 @@ require(['jquery', 'magestore/flexslider'], function($) { sync: "#carousel" }); break; + case STYLESLIDE_FLEXSLIDER_FIVE: + $('.flexslider').flexslider({ + animation: 'slide', + animationLoop: true, + itemWidth: 200, + slideshow: true, + itemMargin: 5 + }); + break; default: $('.flexslider').flexslider({ animation: "slide", diff --git a/view/frontend/templates/slider/flexslider.phtml b/view/frontend/templates/slider/flexslider.phtml index be2df5a..d42d4fb 100644 --- a/view/frontend/templates/slider/flexslider.phtml +++ b/view/frontend/templates/slider/flexslider.phtml @@ -45,10 +45,12 @@ $bannerCollection = $block->getBannerCollection(); $(slider[0]).find('.slides li,.slides li a,.slides li img').css('height', height + 'px'); } } + $(document).ready(function($) { var STYLESLIDE_FLEXSLIDER_ONE = ; var STYLESLIDE_FLEXSLIDER_TWO = ; var STYLESLIDE_FLEXSLIDER_THREE = ; + var STYLESLIDE_FLEXSLIDER_FIVE = ; switch () { case STYLESLIDE_FLEXSLIDER_ONE: @@ -90,6 +92,15 @@ $bannerCollection = $block->getBannerCollection(); slideshow: true, sync: '#'+flexSliderSelector + '-carousel', slideshowSpeed: getSliderSpeed() ?>, + }); + break; + case STYLESLIDE_FLEXSLIDER_FIVE: + $('.' + flexSliderSelector).flexslider({ + animation: 'slide', + animationLoop: true, + itemWidth: getWidth() ?>, + slideshow: true, + itemMargin: 5, start: function (slider) { fitImageSlider(slider); } @@ -165,4 +176,4 @@ $bannerCollection = $block->getBannerCollection(); .flex-viewport .slides li{ margin-bottom: 0px !important; } - \ No newline at end of file +