v1.2.16

master3-blank-template · Nov 3, 2020 · e8ecc8c · e8ecc8c
1 parent aa3944e
commit e8ecc8c
Show file tree

Hide file tree

Showing 215 changed files with 1,483 additions and 1,401 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.05.12-28A5F5.svg?style=for-the-badge)
-![Version](https://img.shields.io/badge/version-1.2.15-28A5F5.svg?style=for-the-badge)
-![UIkit](https://img.shields.io/badge/UIkit-3.4.0-1e87f0.svg?style=for-the-badge)
+![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)
+![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)
 ![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge)

diff --git a/component.php b/component.php
@@ -9,9 +9,7 @@
 defined('_JEXEC') or die;
 
 JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php');
-
 $config = \Master3Config::getInstance();
-
 $systemOutput = $config->getSystemOutput();
 
 ?>

diff --git a/html/com_contact/categories/default.php b/html/com_contact/categories/default.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/html/com_contact/categories/default_items.php b/html/com_contact/categories/default_items.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,13 +19,13 @@
 <li>
     <div class="uk-h3">
         <a class="uk-display-inline-block" href="<?php echo Route::_(ContactHelperRoute::getCategoryRoute($item->id, $item->language)); ?>"><?php echo $this->escape($item->title); ?></a>
-            
+
         <?php if ($this->params->get('show_cat_items_cat') == 1) { ?>
         <span class="uk-badge" data-uk-tooltip="<?php echo Text::_('COM_CONTACT_NUM_ITEMS'); ?>"><?php echo $item->numitems; ?></span>
-        <?php 
+        <?php
     } ?>
     </div>
-    
+
     <?php if ($this->params->get('show_subcat_desc_cat') == 1 && $item->description) { ?>
     <div class="uk-margin-small-top category-desc">
         <?php echo HTMLHelper::_('content.prepare', $item->description, '', 'com_contact.categories'); ?>

diff --git a/html/com_contact/category/default.php b/html/com_contact/category/default.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/html/com_contact/category/default_children.php b/html/com_contact/category/default_children.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/html/com_contact/category/default_items.php b/html/com_contact/category/default_items.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,10 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 
+JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php');
+$templateConfig = \Master3Config::getInstance();
+$jsIcons = $templateConfig->params->get('jsIcons', 'none');
+
 ?>
 <form action="<?php echo htmlspecialchars(Uri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
     <?php if ($this->params->get('filter_field') || $this->params->get('show_pagination_limit')) { ?>
@@ -26,7 +30,7 @@
                 class="uk-input uk-form-width-small"
                 onchange="document.adminForm.submit();"
                 placeholder="<?php echo Text::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>"
-            />
+            >
         </div>
         <?php
         }
@@ -64,10 +68,10 @@ class="uk-input uk-form-width-small"
                     <?php } ?>
                 </div>
                 <?php } ?>
-                
+
                 <div class="uk-width-expand">
                     <a href="<?php echo Route::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>"><?php echo $item->name; ?></a>
-                    
+
                     <?php if ($this->items[$i]->published == 0) { ?>
                     <span class="uk-text--warning"><?php echo Text::_('JUNPUBLISHED'); ?></span>
                     <?php
@@ -77,13 +81,13 @@ class="uk-input uk-form-width-small"
                     echo $item->event->beforeDisplayContent;
                     ?>
                     <ul class="uk-list uk-margin-small-top">
-                        
-                        <?php if ($this->params->get('show_position_headings')) { ?>
-                        <li><span class="uk-margin-small-right" data-uk-icon="icon:cog" data-uk-tooltip="<?php echo Text::_('COM_CONTACT_POSITION'); ?>"></span><?php echo $item->con_position; ?></li>
+
+                    <?php if ($this->params->get('show_position_headings')) { ?>
+                        <li><?php echo ($jsIcons !== 'none' ? '<span class="uk-margin-small-right" data-uk-icon="icon:cog" data-uk-tooltip="' . Text::_('COM_CONTACT_POSITION') . '"></span>' : Text::_('COM_CONTACT_POSITION') . ': '), $item->con_position; ?></li>
                         <?php } ?>
 
                         <?php if ($this->params->get('show_email_headings')) { ?>
-                        <li><span class="uk-margin-small-right" data-uk-icon="icon:main" data-uk-tooltip="<?php echo Text::_('COM_CONTACT_EMAIL_LABEL'); ?>"></span><?php echo $item->email_to; ?></li>
+                        <li><?php echo ($jsIcons !== 'none' ? '<span class="uk-margin-small-right" data-uk-icon="icon:main" data-uk-tooltip="' . Text::_('COM_CONTACT_EMAIL_LABEL') . '"></span>' : Text::_('COM_CONTACT_EMAIL_LABEL') . ': '), $item->email_to; ?></li>
                         <?php } ?>
 
                         <?php
@@ -98,26 +102,26 @@ class="uk-input uk-form-width-small"
                             $location[] = $item->country;
                         }
                         ?>
-                        <li><span class="uk-margin-small-right" data-uk-icon="icon:location" data-uk-tooltip="<?php echo Text::_('COM_CONTACT_ADDRESS'); ?>"></span><?php echo implode(', ', $location); ?></li>
+                        <li><?php echo ($jsIcons !== 'none' ? '<span class="uk-margin-small-right" data-uk-icon="icon:location" data-uk-tooltip="' . Text::_('COM_CONTACT_ADDRESS') . '"></span>' : Text::_('COM_CONTACT_ADDRESS') . ': '), implode(', ', $location); ?></li>
 
                         <?php if ($this->params->get('show_telephone_headings') && !empty($item->telephone)) { ?>
-                        <li><span class="uk-margin-small-right" data-uk-icon="icon:receiver" data-uk-tooltip="<?php echo Text::_('COM_CONTACT_TELEPHONE'); ?>"></span><?php echo Text::sprintf('COM_CONTACT_TELEPHONE_NUMBER', $item->telephone); ?></li>
+                        <li><?php echo ($jsIcons !== 'none' ? '<span class="uk-margin-small-right" data-uk-icon="icon:receiver" data-uk-tooltip="' . Text::_('COM_CONTACT_TELEPHONE') . '"></span>' : ''), Text::sprintf('COM_CONTACT_TELEPHONE_NUMBER', $item->telephone); ?></li>
                         <?php } ?>
-                        
+
                         <?php if ($this->params->get('show_fax_headings') && !empty($item->fax)) { ?>
-                        <li><span class="uk-margin-small-right" data-uk-icon="icon:receiver" data-uk-tooltip="<?php echo Text::_('COM_CONTACT_FAX'); ?>"></span><?php echo Text::sprintf('COM_CONTACT_FAX_NUMBER', $item->fax); ?></li>
+                        <li><?php echo ($jsIcons !== 'none' ? '<span class="uk-margin-small-right" data-uk-icon="icon:receiver" data-uk-tooltip="' . Text::_('COM_CONTACT_FAX') . '"></span>' : ''), Text::sprintf('COM_CONTACT_FAX_NUMBER', $item->fax); ?></li>
                         <?php } ?>
-                        
+
                         <?php if ($this->params->get('show_mobile_headings') && !empty($item->mobile)) { ?>
-                        <li><span class="uk-margin-small-right" data-uk-icon="icon:phone" data-uk-tooltip="<?php echo Text::_('COM_CONTACT_MOBILE'); ?>"></span><?php echo Text::sprintf('COM_CONTACT_MOBILE_NUMBER', $item->mobile); ?></li>
+                        <li><?php echo ($jsIcons !== 'none' ? '<span class="uk-margin-small-right" data-uk-icon="icon:phone" data-uk-tooltip="' . Text::_('COM_CONTACT_MOBILE') . '"></span>' : ''), Text::sprintf('COM_CONTACT_MOBILE_NUMBER', $item->mobile); ?></li>
                         <?php } ?>
 
                     </ul>
                 </div>
 
             <div>
             <?php echo $item->event->afterDisplayContent; ?>
-                
+
         </li>
         <?php
             }
@@ -135,15 +139,15 @@ class="uk-input uk-form-width-small"
     <div class="uk-margin-top uk-flex uk-flex-center<?php if ($show_pagination_results) { echo ' uk-flex-between@s'; } ?>">
 
         <div><?php echo $this->pagination->getPagesLinks(); ?></div>
-        
+
         <?php if ($show_pagination_results) { ?>
         <div><?php echo $this->pagination->getPagesCounter(); ?></div>
         <?php } ?>
-        
+
     </div>
     <?php } ?>
     <div>
-        <input type="hidden" name="filter_order" value="<?php echo $this->escape($this->state->get('list.ordering')); ?>" />
-        <input type="hidden" name="filter_order_Dir" value="<?php echo $this->escape($this->state->get('list.direction')); ?>" />
+        <input type="hidden" name="filter_order" value="<?php echo $this->escape($this->state->get('list.ordering')); ?>">
+        <input type="hidden" name="filter_order_Dir" value="<?php echo $this->escape($this->state->get('list.direction')); ?>">
     </div>
 </form>
diff --git a/html/com_contact/contact/default.php b/html/com_contact/contact/default.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,12 +16,16 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Layout\FileLayout;
 
+JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php');
+$templateConfig = \Master3Config::getInstance();
+$jsIcons = $templateConfig->params->get('jsIcons', 'none');
+
 $tparams = $this->item->params;
 
 ?>
 
 <div class="contact<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Person">
-    
+
     <?php if ($this->contact->name && $tparams->get('show_name')) { ?>
     <h1 class="uk-article-title">
         <?php if ($this->item->published == 0) { ?>
@@ -76,7 +80,7 @@
     <?php
     }
 
-    
+
     // info
     if ($this->params->get('show_info', 1)) {
 
@@ -107,7 +111,7 @@
         if ($this->contact->con_position && $tparams->get('show_position')) {
         ?>
         <dl class="uk-description-list">
-            <dt><span class="uk-margin-small-right" data-uk-icon="icon:cog"></span><?php echo Text::_('COM_CONTACT_POSITION'); ?>:</dt>
+            <dt><?php echo ($jsIcons ? '<span class="uk-margin-small-right" data-uk-icon="icon:cog"></span>' : ''), Text::_('COM_CONTACT_POSITION'); ?>:</dt>
             <dd itemprop="jobTitle"><?php echo $this->contact->con_position; ?></dd>
         </dl>
         <?php
@@ -134,7 +138,7 @@
     }
 
 
-    // form    
+    // form
     if ($tparams->get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) {
         if ($presentation_style === 'sliders') {
         ?>
@@ -166,7 +170,7 @@
         }
     }
 
-    
+
     // links
     if ($tparams->get('show_links')) {
         echo $this->loadTemplate('links');
@@ -285,7 +289,7 @@
     } elseif ($tabSetStarted) {
         echo HTMLHelper::_('bootstrap.endTabSet');
     }
-    
+
     echo $this->item->event->afterDisplayContent;
     ?>
 </div>
diff --git a/html/com_contact/contact/default_address.php b/html/com_contact/contact/default_address.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,6 +11,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\String\PunycodeHelper;
 
+JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php');
+$templateConfig = \Master3Config::getInstance();
+$jsIcons = $templateConfig->params->get('jsIcons', 'none');
+
 ?>
 
 <dl class="uk-description-list" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
@@ -34,42 +38,42 @@
         }
         $address = implode(', ', $address);
         ?>
-    <dt><span class="uk-margin-small-right" data-uk-icon="icon:location"></span><?php echo Text::_('COM_CONTACT_ADDRESS'); ?>:</dt>
+    <dt><?php echo ($jsIcons ? '<span class="uk-margin-small-right" data-uk-icon="icon:location"></span>' : ''), Text::_('COM_CONTACT_ADDRESS'); ?>:</dt>
     <dd><?php echo $address; ?></dd>
     <?php
     }
 
     if ($this->contact->email_to && $this->params->get('show_email')) {
     ?>
-    <dt><span class="uk-margin-small-right" data-uk-icon="icon:main"></span><?php echo Text::_('COM_CONTACT_EMAIL_LABEL'); ?>:</dt>
+    <dt><?php echo ($jsIcons ? '<span class="uk-margin-small-right" data-uk-icon="icon:main"></span>' : ''), Text::_('COM_CONTACT_EMAIL_LABEL'); ?>:</dt>
     <dd itemprop="email"><?php echo $this->contact->email_to; ?></dd>
     <?php
     }
 
     if ($this->contact->telephone && $this->params->get('show_telephone')) {
     ?>
-    <dt><span class="uk-margin-small-right" data-uk-icon="icon:receiver"></span><?php echo Text::_('COM_CONTACT_TELEPHONE'); ?>:</dt>
+    <dt><?php echo ($jsIcons ? '<span class="uk-margin-small-right" data-uk-icon="icon:receiver"></span>' : ''), Text::_('COM_CONTACT_TELEPHONE'); ?>:</dt>
     <dd itemprop="telephone"><?php echo $this->contact->telephone; ?></dd>
     <?php
     }
-    
+
     if ($this->contact->fax && $this->params->get('show_fax')) {
     ?>
-    <dt><span class="uk-margin-small-right" data-uk-icon="icon:receiver"></span><?php echo Text::_('COM_CONTACT_FAX'); ?>:</dt>
+    <dt><?php echo ($jsIcons ? '<span class="uk-margin-small-right" data-uk-icon="icon:receiver"></span>' : ''), Text::_('COM_CONTACT_FAX'); ?>:</dt>
     <dd itemprop="faxNumber"><?php echo $this->contact->fax; ?></dd>
     <?php
     }
 
     if ($this->contact->mobile && $this->params->get('show_mobile')) {
     ?>
-    <dt><span class="uk-margin-small-right" data-uk-icon="icon:phone"></span><?php echo Text::_('COM_CONTACT_MOBILE'); ?>:</dt>
+    <dt><?php echo ($jsIcons ? '<span class="uk-margin-small-right" data-uk-icon="icon:phone"></span>' : ''), Text::_('COM_CONTACT_MOBILE'); ?>:</dt>
     <dd itemprop="telephone"><?php echo $this->contact->mobile; ?></dd>
     <?php
     }
 
     if ($this->contact->webpage && $this->params->get('show_webpage')) {
     ?>
-    <dt><span class="uk-margin-small-right" data-uk-icon="icon:world"></span><?php echo Text::_('URL'); ?>:</dt>
+    <dt><?php echo ($jsIcons ? '<span class="uk-margin-small-right" data-uk-icon="icon:world"></span>' : ''), Text::_('URL'); ?>:</dt>
     <dd><a href="<?php echo $this->contact->webpage; ?>" target="_blank" rel="noopener noreferrer" itemprop="url"><?php echo PunycodeHelper::urlToUTF8($this->contact->webpage); ?></a></dd>
     <?php } ?>
 </dl>
diff --git a/html/com_contact/contact/default_articles.php b/html/com_contact/contact/default_articles.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/html/com_contact/contact/default_form.php b/html/com_contact/contact/default_form.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -41,10 +41,10 @@
         } ?>
         <div class="uk-margin-top">
             <button class="uk-button uk-button-primary validate" type="submit"><?php echo Text::_('COM_CONTACT_CONTACT_SEND'); ?></button>
-            <input type="hidden" name="option" value="com_contact" />
-            <input type="hidden" name="task" value="contact.submit" />
-            <input type="hidden" name="return" value="<?php echo $this->return_page; ?>" />
-            <input type="hidden" name="id" value="<?php echo $this->contact->slug; ?>" />
+            <input type="hidden" name="option" value="com_contact">
+            <input type="hidden" name="task" value="contact.submit">
+            <input type="hidden" name="return" value="<?php echo $this->return_page; ?>">
+            <input type="hidden" name="id" value="<?php echo $this->contact->slug; ?>">
             <?php echo HTMLHelper::_('form.token'); ?>
         </div>
     </form>

diff --git a/html/com_contact/contact/default_links.php b/html/com_contact/contact/default_links.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/html/com_contact/contact/default_profile.php b/html/com_contact/contact/default_profile.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */