v1.2.0

master3-blank-template · Feb 22, 2019 · f07b361 · f07b361
1 parent 98a1338
commit f07b361
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 43 deletions.
diff --git 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.
 
-<hr>
-
-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,19 +1,20 @@
 <?php defined('_JEXEC') or die;
 /*
  * @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
  */
 
+use Joomla\CMS\Helper\ModuleHelper;
+
 $vars = [
-    'slider_class', 'item_class', 'dotnav', 'slidenav', 
-    'velocity', 'autoplay', 'autoplay_interval', 'finite', 'pause_on_hover', 'index', 'center', 'sets', 
+    'slider_class', 'item_class', 'dotnav', 'slidenav',
+    'velocity', 'autoplay', 'autoplay_interval', 'finite', 'pause_on_hover', 'index', 'center', 'sets',
     'grid', 'grid_divider', 'cols', 'cols_all', 'cols_s', 'cols_m', 'cols_l', 'cols_xl',
     'items'
 ];
 
-foreach ($vars as $var)
-{
+foreach ($vars as $var) {
     $$var = $params->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
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<extension type="module" version="3.6" method="upgrade" client="site">
+<extension type="module" version="3.7" method="upgrade" client="site">
     <name>UIkit 3 Slider</name>
-	<author>Aleksey A. Morozov (AlekVolsk)</author>
-	<copyright>(C) 2018 Aleksey A. Morozov. All rights reserved.</copyright>
-	<license>GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt</license>
-	<version>1.1.0</version>
-	<creationDate>April 2018</creationDate>
+    <author>Aleksey A. Morozov (AlekVolsk)</author>
+    <copyright>© 2018 Aleksey A. Morozov. All rights reserved.</copyright>
+    <license>GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt</license>
+    <version>1.2.0</version>
+    <creationDate>February 2019</creationDate>
     <description><![CDATA[MOD_UK_SLIDER_XML_DESCRIPTION]]></description>
     <files>
         <filename module="mod_uk_slider">mod_uk_slider.php</filename>
@@ -20,7 +20,7 @@
     </languages>
     <config>
         <fields name="params">
-            
+
             <fieldset name="basic">
                 <field name="slider_class" type="text" label="MOD_UK_SLIDER_CLASS" class="input-xlasrge" />
                 <field name="item_class" type="text" label="MOD_UK_SLIDER_ITEM_CLASS" class="input-xlasrge" />
@@ -55,9 +55,9 @@
                     <option value="1">JYES</option>
                     <option value="0">JNO</option>
                 </field>
-                
+
                 <field type="spacer" name="spacer" hr="true" />
-                
+
                 <field name="grid" type="list" label="MOD_UK_SLIDER_GRID" default="">
                     <option value="">MOD_UK_SLIDER_GRID_NONE</option>
                     <option value="uk-grid">MOD_UK_SLIDER_GRID_DEFAULT</option>
@@ -70,9 +70,9 @@
                     <option value="1">JYES</option>
                     <option value="0">JNO</option>
                 </field>
-                
+
                 <field type="spacer" name="spacer2" hr="true" />
-                
+
                 <field name="cols" type="radio" label="MOD_UK_SLIDER_COLS" default="0" class="btn-group">
                     <option value="1">JYES</option>
                     <option value="0">JNO</option>
@@ -128,11 +128,11 @@
                     <option value="uk-child-width-1-6@xl">MOD_UK_SLIDER_COL_6</option>
                 </field>
             </fieldset>
-            
+
             <fieldset name="slides">
                 <field name="items" type="subform" label="COM_MODULES_SLIDES_FIELDSET_LABEL" formsource="/modules/mod_uk_slider/forms/form.xml" multiple="true" min="0" layout="joomla.form.field.subform.repeatable" />
             </fieldset>
-            
+
             <fieldset name="advanced">
                 <field name="layout" type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL" description="JFIELD_ALT_MODULE_LAYOUT_DESC"/>
                 <field name="cache" type="list" label="COM_MODULES_FIELD_CACHING_LABEL" description="COM_MODULES_FIELD_CACHING_DESC" default="1">

diff --git a/tmpl/default.php b/tmpl/default.php
@@ -1,7 +1,7 @@
 <?php defined('_JEXEC') or die;
 /*
  * @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
  */