v1.2.17

master3-blank-template · Nov 26, 2020 · bc6f0fa · bc6f0fa
1 parent 7db9cc0
commit bc6f0fa
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@
 [![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.11.03-28A5F5.svg?style=for-the-badge)
-![Version](https://img.shields.io/badge/version-1.2.16-28A5F5.svg?style=for-the-badge)
+![Last Update](https://img.shields.io/badge/last_update-2020.11.26-28A5F5.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-1.2.17-28A5F5.svg?style=for-the-badge)
 ![UIkit](https://img.shields.io/badge/UIkit-3.5.9-1e87f0.svg?style=for-the-badge)
 
 ![Joomla](https://img.shields.io/badge/joomla-3.9+-1A3867.svg?style=for-the-badge)

diff --git a/html/com_contact/category/default_items.php b/html/com_contact/category/default_items.php
@@ -141,7 +141,7 @@ class="uk-input uk-form-width-small"
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
         <?php if ($show_pagination_results) { ?>
-        <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+        <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
 
     </div>

diff --git a/html/com_contact/featured/default.php b/html/com_contact/featured/default.php
@@ -35,7 +35,7 @@
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
         <?php if ($show_pagination_results) { ?>
-        <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+        <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
 
     </div>

diff --git a/html/com_content/archive/default_items.php b/html/com_content/archive/default_items.php
@@ -260,7 +260,7 @@
     <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
     <?php if ($show_pagination_results) { ?>
-    <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+    <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
     <?php } ?>
 
 </div>

diff --git a/html/com_content/article/default.php b/html/com_content/article/default.php
@@ -52,6 +52,8 @@
     <h1 class="uk-article-title uk-margin-medium-bottom" itemprop="headline"><?php echo $this->escape($params->get('page_heading')); ?></h1>
     <?php } elseif ($params->get('show_title') != false) { ?>
     <h1 class="uk-article-title uk-margin-medium-bottom" itemprop="headline"><?php echo $this->escape($this->item->title); ?></h1>
+    <?php } else { ?>
+    <h1 class="uk-hidden" itemprop="headline"><?php echo $this->escape($this->item->title); ?></h1>
     <?php } ?>
 
     <meta itemprop="inLanguage" content="<?php echo ($this->item->language === '*') ? Factory::getConfig()->get('language') : $this->item->language; ?>" />

diff --git a/html/com_content/category/blog.php b/html/com_content/category/blog.php
@@ -156,7 +156,7 @@
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
         <?php if ( $show_pagination_results ) { ?>
-        <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+        <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
 
     </div>

diff --git a/html/com_content/category/default_articles.php b/html/com_content/category/default_articles.php
@@ -264,7 +264,7 @@
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
         <?php if ( $show_pagination_results ) { ?>
-        <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+        <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
 
     </div>

diff --git a/html/com_content/featured/default.php b/html/com_content/featured/default.php
@@ -74,7 +74,7 @@
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
         <?php if ($show_pagination_results) { ?>
-        <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+        <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
 
     </div>

diff --git a/html/com_tags/tag/default.php b/html/com_tags/tag/default.php
@@ -72,7 +72,7 @@
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
         <?php if ($show_pagination_results) { ?>
-        <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+        <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
 
     </div>

diff --git a/html/com_tags/tag/list_items.php b/html/com_tags/tag/list_items.php
@@ -107,7 +107,7 @@
             <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
             <?php if ($show_pagination_results) { ?>
-            <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+            <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
             <?php } ?>
 
         </div>

diff --git a/html/com_tags/tags/default_items.php b/html/com_tags/tags/default_items.php
@@ -168,7 +168,7 @@
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
 
         <?php if ($show_pagination_results) { ?>
-        <div><?php echo $this->pagination->getPagesCounter(); ?></div>
+        <div class="pages-of"><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
 
     </div>

diff --git a/html/modules.php b/html/modules.php
@@ -70,7 +70,7 @@ function modChrome_navbar($module, &$params, &$attribs)
 
             if ($masterParams->offtoggle) {
                 $moduleClass .= ' uk-visible' . $sfx;
-                echo '<a class="uk-navbar-toggle uk-hidden' . $sfx . '" href="#" data-uk-navbar-toggle-icon data-uk-toggle="target:#' . $masterParams->offtoggle . '" name="Menu"></a>';
+                echo '<a class="uk-navbar-toggle uk-hidden' . $sfx . '" href="#" data-uk-navbar-toggle-icon data-uk-toggle="target:#' . $masterParams->offtoggle . '" aria-label="Menu" name="Menu"></a>';
             }
         } else {
             $moduleClass .= ' ' . $config->getModuleParams($module->id)->display;

diff --git a/layouts/template.default-original.php b/layouts/template.default-original.php
@@ -341,7 +341,7 @@
  * to-top scroller
  */
 if ($this->params->get('totop')) { ?>
-<a class="uk-padding-small uk-position-bottom-left uk-position-fixed" data-uk-totop data-uk-scroll name="Up"></a>
+<a class="uk-padding-small uk-position-bottom-left uk-position-fixed" data-uk-totop data-uk-scroll aria-label="Up" name="Up"></a>
 <?php } ?>
 
 
@@ -354,7 +354,7 @@
 ?>
 <aside id="offcanvas" data-uk-offcanvas="<?php echo $offcanvas->attrs; ?>">
     <div class="uk-offcanvas-bar<?php echo $offcanvas->class; ?>">
-        <a class="uk-offcanvas-close" data-uk-close name="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>"></a>
+        <a class="uk-offcanvas-close" data-uk-close name="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>" aria-label="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>"></a>
         <jdoc:include type="modules" name="offcanvas" style="<?php echo $section->style; ?>" />
     </div>
 </aside>
@@ -370,7 +370,7 @@
 ?>
 <aside id="offcanvas-menu" data-uk-offcanvas="<?php echo $offcanvas->attrs; ?>">
     <div class="uk-offcanvas-bar<?php echo $offcanvas->class; ?>">
-        <a class="uk-offcanvas-close" data-uk-close name="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>"></a>
+        <a class="uk-offcanvas-close" data-uk-close name="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>" aria-label="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>"></a>
         <jdoc:include type="modules" name="offcanvas-menu" style="<?php echo $section->style; ?>" />
     </div>
 </aside>

diff --git a/script/libraries/master3/config.php b/script/libraries/master3/config.php
@@ -74,6 +74,11 @@ final class Master3Config
      */
     public $isWebP = false;
 
+    /*
+     * bool
+     */
+    private $isRawDoc;
+
 
     /*
      * Get static Instance
@@ -181,7 +186,9 @@ protected function __construct()
 
         $this->doc = Factory::getDocument();
 
-        $this->params = $this->doc->params;
+        $this->isRawDoc = strpos(get_class($this->doc), 'RawDocument') !== false;
+
+        $this->params = $this->isRawDoc ? null : $this->doc->params;
 
         $app = Factory::getApplication();
 
@@ -365,7 +372,9 @@ protected function __construct()
 
 
         // set head data
-        $this->setHead();
+        if (!$this->isRawDoc) {
+            $this->setHead();
+        }
     }
 
 

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.16</version>
+    <version>1.2.17</version>
     <creationDate>November 2020</creationDate>
     <author>Aleksey A. Morozov</author>
     <authorEmail>alekvolsk@yandex.ru</authorEmail>
@@ -11,7 +11,7 @@
     <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.16-28A5F5.svg?style=for-the-badge" alt="Master3 version" style="margin-right:10px">
+            <img src="https://img.shields.io/badge/VERSION-1.2.17-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>