From f07b3611d61edd09ba3c3e824c2adcb36e2f24f0 Mon Sep 17 00:00:00 2001 From: AlekVolsk Date: Fri, 22 Feb 2019 19:56:12 +0400 Subject: [PATCH] v1.2.0 --- README.md | 20 ++++++---------- README.ru.md | 11 +++++++++ languages/en-GB/en-GB.mod_uk_slider.ini | 2 +- languages/en-GB/en-GB.mod_uk_slider.sys.ini | 2 +- languages/ru-RU/ru-RU.mod_uk_slider.ini | 2 +- languages/ru-RU/ru-RU.mod_uk_slider.sys.ini | 2 +- mod_uk_slider.php | 24 +++++++++---------- mod_uk_slider.xml | 26 ++++++++++----------- tmpl/default.php | 2 +- 9 files changed, 48 insertions(+), 43 deletions(-) create mode 100644 README.ru.md diff --git a/README.md b/README.md index 632acf2..285f493 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,13 @@ # UIkit 3 Slider -### EN: +![Version](https://img.shields.io/badge/VERSION-1.2.0-0366d6.svg?style=for-the-badge) +![Joomla](https://img.shields.io/badge/joomla-3.7+-1A3867.svg?style=for-the-badge) +![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge) -Slider of images, based on the UIkit 3 framework. Module for Joomla! 3 +_description in Russian [here](README.ru.md)_ -**Warning!** The module does not contain scripts and framework styles, connect them yourself in your template (it is assumed that your template is already based on this framework). - -### RU: - -Слайдер изображений, основанный на фреймворке UIkit 3. Модуль для Joomla! 3 +Slider, based on the UIkit 3 framework. Module for Joomla! 3. -**Внимание!** Модуль не содержит скриптов и стилей фреймворка, подключите их самостоятельно в вашем шаблоне (подразумевается, что ваш шаблон уже основан на данном фреймворке). +The module contains all the basic settings implemented in the UIkit 3 framework, necessary for displaying a full-fledged slider. -
- -PHP 5.6+ - -Joomla 3.6+ +**Warning!** The module does not contain scripts and framework styles, connect them yourself in your template (it is assumed that your template is already based on this framework). diff --git a/README.ru.md b/README.ru.md new file mode 100644 index 0000000..d655251 --- /dev/null +++ b/README.ru.md @@ -0,0 +1,11 @@ +# UIkit 3 Slider + +![Version](https://img.shields.io/badge/VERSION-1.2.0-0366d6.svg?style=for-the-badge) +![Joomla](https://img.shields.io/badge/joomla-3.7+-1A3867.svg?style=for-the-badge) +![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge) + +Слайдер, основанный на фреймворке UIkit 3. Модуль для Joomla! 3. + +Модуль содержит все базовые настройки, реализованные в фреймворке UIkit 3, необходимые для вывода полноценного слайдера. + +**Внимание!** Модуль не содержит скриптов и стилей фреймворка, подключите их самостоятельно в вашем шаблоне (подразумевается, что ваш шаблон уже основан на данном фреймворке). diff --git a/languages/en-GB/en-GB.mod_uk_slider.ini b/languages/en-GB/en-GB.mod_uk_slider.ini index 5b30ed4..2e32f5e 100644 --- a/languages/en-GB/en-GB.mod_uk_slider.ini +++ b/languages/en-GB/en-GB.mod_uk_slider.ini @@ -1,5 +1,5 @@ ; @package mod_uk_slider -; @copyright Copyright (C) 2018 Aleksey A. Morozov (AlekVolsk). All rights reserved. +; @copyright Copyright (C) 2019 Aleksey A. Morozov (AlekVolsk). All rights reserved. ; @license GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt MOD_UK_SLIDER="UIkit 3 Slider" diff --git a/languages/en-GB/en-GB.mod_uk_slider.sys.ini b/languages/en-GB/en-GB.mod_uk_slider.sys.ini index 6c85fb6..63598f1 100644 --- a/languages/en-GB/en-GB.mod_uk_slider.sys.ini +++ b/languages/en-GB/en-GB.mod_uk_slider.sys.ini @@ -1,5 +1,5 @@ ; @package mod_uk_slider -; @copyright Copyright (C) 2018 Aleksey A. Morozov (AlekVolsk). All rights reserved. +; @copyright Copyright (C) 2019 Aleksey A. Morozov (AlekVolsk). All rights reserved. ; @license GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt MOD_UK_SLIDER="UIkit 3 Slider" diff --git a/languages/ru-RU/ru-RU.mod_uk_slider.ini b/languages/ru-RU/ru-RU.mod_uk_slider.ini index a0fad5e..5507263 100644 --- a/languages/ru-RU/ru-RU.mod_uk_slider.ini +++ b/languages/ru-RU/ru-RU.mod_uk_slider.ini @@ -1,5 +1,5 @@ ; @package mod_uk_slider -; @copyright Copyright (C) 2018 Aleksey A. Morozov (AlekVolsk). All rights reserved. +; @copyright Copyright (C) 2019 Aleksey A. Morozov (AlekVolsk). All rights reserved. ; @license GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt MOD_UK_SLIDER="UIkit 3 Slider" diff --git a/languages/ru-RU/ru-RU.mod_uk_slider.sys.ini b/languages/ru-RU/ru-RU.mod_uk_slider.sys.ini index cb932c9..e24051c 100644 --- a/languages/ru-RU/ru-RU.mod_uk_slider.sys.ini +++ b/languages/ru-RU/ru-RU.mod_uk_slider.sys.ini @@ -1,5 +1,5 @@ ; @package mod_uk_slider -; @copyright Copyright (C) 2018 Aleksey A. Morozov (AlekVolsk). All rights reserved. +; @copyright Copyright (C) 2019 Aleksey A. Morozov (AlekVolsk). All rights reserved. ; @license GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt MOD_UK_SLIDER="UIkit 3 Slider" diff --git a/mod_uk_slider.php b/mod_uk_slider.php index a5cee8a..9a18028 100644 --- a/mod_uk_slider.php +++ b/mod_uk_slider.php @@ -1,19 +1,20 @@ get($var); } @@ -22,8 +23,7 @@ $sw_params = []; if ((int)$velocity > 1) $sw_params[] = 'velocity:' . (int)$velocity; -if ($autoplay) -{ +if ($autoplay) { $sw_params[] = 'autoplay:true'; if ((int)$autoplay_interval != 7000 && (int)$autoplay_interval > 0) $sw_params[] = 'autoplay_interval:' . (int)$autoplay_interval; } @@ -35,13 +35,11 @@ $sw_params = $sw_params ? '="' . implode(';', $sw_params) . '"' : ''; $classes = []; -if ($grid != '') -{ +if ($grid != '') { $classes[] = $grid; if ((int)$grid_divider) $classes[] = 'uk-grid-divider'; } -if ((int)$cols) -{ +if ((int)$cols) { $classes[] = $cols_all; $classes[] = $cols_s; $classes[] = $cols_m; @@ -50,4 +48,6 @@ } $classes = $classes ? ' ' . implode(' ', $classes) : ''; -require(JModuleHelper::getLayoutPath('mod_uk_slider', $params->get('layout', 'default'))); +if ($items) { + require(ModuleHelper::getLayoutPath('mod_uk_slider', $params->get('layout', 'default'))); +} diff --git a/mod_uk_slider.xml b/mod_uk_slider.xml index ac67adc..d96c781 100644 --- a/mod_uk_slider.xml +++ b/mod_uk_slider.xml @@ -1,11 +1,11 @@ - + UIkit 3 Slider - Aleksey A. Morozov (AlekVolsk) - (C) 2018 Aleksey A. Morozov. All rights reserved. - GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt - 1.1.0 - April 2018 + Aleksey A. Morozov (AlekVolsk) + © 2018 Aleksey A. Morozov. All rights reserved. + GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt + 1.2.0 + February 2019 mod_uk_slider.php @@ -20,7 +20,7 @@ - +
@@ -55,9 +55,9 @@ - + - + @@ -70,9 +70,9 @@ - + - + @@ -128,11 +128,11 @@
- +
- +
diff --git a/tmpl/default.php b/tmpl/default.php index 2344973..af721e5 100644 --- a/tmpl/default.php +++ b/tmpl/default.php @@ -1,7 +1,7 @@