From 69633ab938fb0bdccef689b1ce2d9575ad13a911 Mon Sep 17 00:00:00 2001 From: AlekVolsk Date: Fri, 22 Feb 2019 20:23:31 +0400 Subject: [PATCH] v1.2.0 --- README.md | 20 +++++++------------ README.ru.md | 11 ++++++++++ languages/en-GB/en-GB.mod_uk_accordion.ini | 2 +- .../en-GB/en-GB.mod_uk_accordion.sys.ini | 2 +- languages/ru-RU/ru-RU.mod_uk_accordion.ini | 2 +- .../ru-RU/ru-RU.mod_uk_accordion.sys.ini | 2 +- mod_uk_accordion.php | 14 +++++++------ mod_uk_accordion.xml | 18 ++++++++--------- tmpl/default.php | 2 +- 9 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 README.ru.md diff --git a/README.md b/README.md index db90da0..e8ea9fc 100644 --- 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. -
- -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..27cf91d --- /dev/null +++ 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 index 59d1262..96d701a 100644 --- 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 index ab119ab..a3c4e8b 100644 --- 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 index e069ed8..1f1b5eb 100644 --- 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 index 3966a19..5b4f841 100644 --- 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 index de1bd26..ae7dba2 100644 --- a/mod_uk_accordion.php +++ b/mod_uk_accordion.php @@ -1,18 +1,19 @@ get($var); } @@ -24,8 +25,7 @@ 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; @@ -33,4 +33,6 @@ } $accordion_params = $accordion_params ? '="' . implode(';', $accordion_params) . '"' : ''; -require(JModuleHelper::getLayoutPath('mod_uk_accordion', $params->get('layout', 'default'))); \ No newline at end of file +if ($items) { + require(ModuleHelper::getLayoutPath('mod_uk_accordion', $params->get('layout', 'default'))); +} diff --git a/mod_uk_accordion.xml b/mod_uk_accordion.xml index 236de44..72945cd 100644 --- a/mod_uk_accordion.xml +++ b/mod_uk_accordion.xml @@ -1,11 +1,11 @@ - + UIkit 3 Accordion - 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 - May 2018 + Aleksey A. Morozov (AlekVolsk) + (C) 2019 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_accordion.php @@ -20,7 +20,7 @@ - +
@@ -49,11 +49,11 @@
- +
- +
diff --git a/tmpl/default.php b/tmpl/default.php index bf32cdd..01ef365 100644 --- a/tmpl/default.php +++ b/tmpl/default.php @@ -1,7 +1,7 @@