v1.2.10

master3-blank-template · Feb 27, 2020 · 7f16b33 · 7f16b33
1 parent 55a49c3
commit 7f16b33
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@
 [![Documentation](https://img.shields.io/badge/-documentation-28A5F5.svg?style=for-the-badge)](https://master3.alekvolsk.info/documentation)
 [![Suppurt](https://img.shields.io/badge/-support-28A5F5.svg?style=for-the-badge)](https://master3.alekvolsk.info/support)
 
-![Last Update](https://img.shields.io/badge/last_update-2020.02.05-28A5F5.svg?style=for-the-badge)
-![Version](https://img.shields.io/badge/version-1.2.9-28A5F5.svg?style=for-the-badge)
-![UIkit](https://img.shields.io/badge/UIkit-3.3.1-1e87f0.svg?style=for-the-badge)
+![Last Update](https://img.shields.io/badge/last_update-2020.02.27-28A5F5.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-1.2.10-28A5F5.svg?style=for-the-badge)
+![UIkit](https://img.shields.io/badge/UIkit-3.3.3-1e87f0.svg?style=for-the-badge)
 
 ![Joomla](https://img.shields.io/badge/joomla-3.9+-1A3867.svg?style=for-the-badge)
 ![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge)

diff --git a/html/mod_menu/navbar.php b/html/mod_menu/navbar.php
@@ -14,7 +14,7 @@
 JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php');
 
 if (!function_exists('getL2Items')) {
-    function getL2Items($items, $id)
+    function getL2Items($items, $id, $firstLevel)
     {
         $result = 0;
         foreach ($items as $item) {
@@ -45,8 +45,6 @@ function getL2Items($items, $id)
 foreach ($list as $i => &$item) {
     if ((int) $item->level === $firstLevel) {
         $miParams = $templateConfig->getMenuItemParams($item->id);
-    } else {
-        unset($miParams);
     }
 
     $class = 'item-' . $item->id;
@@ -101,7 +99,7 @@ function getL2Items($items, $id)
             if ($miParams->cols === 1) {
                 echo '<div class="uk-navbar-dropdown' . $dropdownClass . '"' . $boundary . '><ul class="uk-nav uk-navbar-dropdown-nav">';
             } else {
-                $l2_ic = getL2Items($list, (int) $item->id);
+                $l2_ic = getL2Items($list, (int) $item->id, (int)$firstLevel);
                 $l2_cnt = (int) floor($l2_ic / $miParams->cols);
                 $l2_rod = (int) ($l2_ic % $miParams->cols);
                 $l2_i = 0;

diff --git a/language/en-GB/en-GB.tpl_master3.ini b/language/en-GB/en-GB.tpl_master3.ini
@@ -156,7 +156,7 @@ TPL_MASTER3_TAB_MODULES_LABEL="Modules"
 TPL_MASTER3_MODULES_NOTE_LABEL="Important"
 TPL_MASTER3_MODULES_NOTE_DESC="A special <code>master3</code> style is used to display module positions. However, some elements use the <code>none</code> or <code>navbar</code> style, for which there is no module header output, and do not apply their own template parameters. By default, this is the position of the <strong>logo</strong>, <strong>navbar-left</strong>, <strong>navbar-center</strong>, <strong>navbar-right</strong> and <strong>breadcrumb</strong>."
 TPL_MASTER3_MODULE_FORM_FIELDSET_INFO="Module information"
-TPL_MASTER3_MODULE_FORM_FIELDSET_BOX="Module enveroment"
+TPL_MASTER3_MODULE_FORM_FIELDSET_BOX="Module enviroment"
 TPL_MASTER3_MODULE_FORM_FIELDSET_TITLE="Module title"
 TPL_MASTER3_MODULE_FORM_NAME="Module title"
 TPL_MASTER3_MODULE_FORM_ID="Module ID"

diff --git a/templateDetails.xml b/templateDetails.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.9" type="template" client="site" method="upgrade">
     <name>Master3</name>
-    <version>1.2.9</version>
+    <version>1.2.10</version>
     <creationDate>February 2020</creationDate>
     <author>Aleksey A. Morozov</author>
     <authorEmail>alekvolsk@yandex.ru</authorEmail>
@@ -11,13 +11,13 @@
     <description><![CDATA[
         <span style="display:inline-flex;align-items:center;margin:30px 0;color:#1E87F0;text-decoration:none;"><svg height="50" viewBox="0 0 122 141" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M61 0L84.6129 13.6266L61 27.2631L37.3871 13.6266L61 0ZM97.4032 21.0155L73.7805 34.6421L98.3871 48.8492V77.2634L122 63.6368V35.2127L97.4032 21.0155ZM36.3934 99.4005V126.664L61 140.871L84.6129 127.244L36.3934 99.4005ZM73.7805 106.229C73.7805 106.229 65.0339 101.181 97.3934 119.855H97.4032L122 105.658V78.385L73.7805 106.229ZM0 105.658V48.8689L23.6129 62.5053V119.285L0 105.658Z" fill="#1E87F0"/></svg><span style="margin-left:20px;font-weight:400;"><span style="display:block;font-size:20px;line-height:20px;margin-bottom:10px;"><strong>Master3</strong></span><span style="display:block;font-size:15px;line-height:20px;"><strong>The Joomla! 3 site template based on UIkit 3.</strong></span></span></span>
         <span style="display:block;margin-bottom:20px;">
-            <img src="https://img.shields.io/badge/VERSION-1.2.9-28A5F5.svg?style=for-the-badge" alt="Master3 version" style="margin-right:10px">
+            <img src="https://img.shields.io/badge/VERSION-1.2.10-28A5F5.svg?style=for-the-badge" alt="Master3 version" style="margin-right:10px">
             <a href="https://master3.alekvolsk.info/" target="_blank" style="margin-right:10px"><img src="https://img.shields.io/badge/-official_page-28A5F5.svg?style=for-the-badge" alt="Official page"></a>
             <a href="https://master3.alekvolsk.info/documentation" target="_blank" style="margin-right:10px"><img src="https://img.shields.io/badge/-documentation-28A5F5.svg?style=for-the-badge" alt="Documentation"></a>
             <a href="https://master3.alekvolsk.info/positions" target="_blank"><img src="https://img.shields.io/badge/-positions-28A5F5.svg?style=for-the-badge" alt="Positions"></a>
         </span>
         <span style="display:block;margin-bottom:30px;font-weight:400">
-            <span style="display:block;margin-bottom:10px;">&copy; 2019 <a href="https://alekvolsk.pw" target="_blank"><u>Aleksey A. Morozov</u></a>. All right reserved.</span>
+            <span style="display:block;margin-bottom:10px;">&copy; 2019 <a href="https://alekvolsk.pw" target="_blank"><u>Aleksey A. Morozov</u></a>. All rights reserved.</span>
             <span style="display:block;margin-bottom:10px;">If you want to support the project, you can donate us via <a href="https://www.paypal.me/alekvolsk" target="_blank"><u>PayPal</u></a> or <a href="https://money.yandex.ru/to/410011461392459" target="_blank"><u>Yandex</u></a>.</span>
             <span style="display:block;">The template changelog is available on the <a href="https://master3.alekvolsk.info/download" target="_blank"><u>download page</u></a>.</span>
         </span>