v1.2.0

master3-blank-template · Feb 22, 2019 · 69633ab · 69633ab
1 parent 34da4c2
commit 69633ab
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -1,19 +1,13 @@
 # UIkit 3 Accordion
 
-### 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)
 
-Accordion of content, 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
+Accordion of content, 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 accordion.
 
-<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 Accordion
+
+![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_accordion.ini b/languages/en-GB/en-GB.mod_uk_accordion.ini
@@ -1,5 +1,5 @@
 ; @package     mod_uk_accordion
-; @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_ACCORDION="UIkit 3 Accordion"

diff --git a/languages/en-GB/en-GB.mod_uk_accordion.sys.ini b/languages/en-GB/en-GB.mod_uk_accordion.sys.ini
@@ -1,5 +1,5 @@
 ; @package     mod_uk_accordion
-; @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_ACCORDION="UIkit 3 Accordion"

diff --git a/languages/ru-RU/ru-RU.mod_uk_accordion.ini b/languages/ru-RU/ru-RU.mod_uk_accordion.ini
@@ -1,5 +1,5 @@
 ; @package     mod_uk_accordion
-; @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_ACCORDION="UIkit 3 Accordion"

diff --git a/languages/ru-RU/ru-RU.mod_uk_accordion.sys.ini b/languages/ru-RU/ru-RU.mod_uk_accordion.sys.ini
@@ -1,5 +1,5 @@
 ; @package     mod_uk_accordion
-; @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_ACCORDION="UIkit 3 Accordion"

diff --git a/mod_uk_accordion.php b/mod_uk_accordion.php
@@ -1,18 +1,19 @@
 <?php defined('_JEXEC') or die;
 /*
  * @package     mod_uk_accordion
- * @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 = [
     'accordeon_class', 'title_class', 'content_class',
     'active', 'multiple', 'collapsible', 'animation', 'duration', 'transition',
     'items'
 ];
 
-foreach ($vars as $var)
-{
+foreach ($vars as $var) {
     $$var = $params->get($var);
 }
 
@@ -24,13 +25,14 @@
 if ((int)$active > 0) $accordion_params[] = 'active:' . $active;
 if ($multiple) $accordion_params[] = 'multiple:true';
 if (!$collapsible && !$multiple) $accordion_params[] = 'collapsible:false';
-if (!$animation)
-{
+if (!$animation) {
     $accordion_params[] = 'animation:false';
 } else {
     if ($duration > 0 && (int)$duration != 200) $accordion_params[] = 'duration:' . $duration;
     if ($transition != 'ease') $accordion_params[] = 'transition:' . $transition;
 }
 $accordion_params = $accordion_params ? '="' . implode(';', $accordion_params) . '"' : '';
 
-require(JModuleHelper::getLayoutPath('mod_uk_accordion', $params->get('layout', 'default')));
+if ($items) {
+    require(ModuleHelper::getLayoutPath('mod_uk_accordion', $params->get('layout', 'default')));
+}
diff --git a/mod_uk_accordion.xml b/mod_uk_accordion.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 Accordion</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>May 2018</creationDate>
+    <author>Aleksey A. Morozov (AlekVolsk)</author>
+    <copyright>(C) 2019 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_ACCORDION_XML_DESCRIPTION]]></description>
     <files>
         <filename module="mod_uk_accordion">mod_uk_accordion.php</filename>
@@ -20,7 +20,7 @@
     </languages>
     <config>
         <fields name="params">
-            
+
             <fieldset name="basic">
                 <field name="accordeon_class" type="text" label="MOD_UK_ACCORDION_CLASS" class="input-xlarge" />
                 <field name="title_class" type="text" label="MOD_UK_ACCORDION_TITLE_CLASS" class="input-xlarge" />
@@ -49,11 +49,11 @@
                     <option value="step-end">step-end</option>
                 </field>
             </fieldset>
-            
+
             <fieldset name="els">
                 <field name="items" type="subform" label="COM_MODULES_ELS_FIELDSET_LABEL" formsource="/modules/mod_uk_accordion/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_accordion
- * @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
  */