From ace83c8a7544c4375c420162d5eca19456242017 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Thu, 13 Oct 2022 14:02:16 +0600 Subject: [PATCH 01/29] update namespace --- plugins/system/helix3/core/helix3.php | 159 +++++++++--------- plugins/system/helix3/fields/asset.php | 24 +-- plugins/system/helix3/fields/button.php | 6 +- plugins/system/helix3/fields/group.php | 19 ++- plugins/system/helix3/fields/icon.php | 22 +-- plugins/system/helix3/fields/layout.php | 12 +- plugins/system/helix3/fields/layoutlist.php | 24 +-- plugins/system/helix3/fields/megamenu.php | 4 +- plugins/system/helix3/fields/menulayout.php | 28 +-- plugins/system/helix3/fields/modpos.php | 22 ++- plugins/system/helix3/fields/optionio.php | 14 +- plugins/system/helix3/fields/presets.php | 31 ++-- plugins/system/helix3/fields/spgallery.php | 36 ++-- plugins/system/helix3/fields/spimage.php | 26 ++- plugins/system/helix3/fields/typography.php | 29 ++-- plugins/system/helix3/helix3.php | 101 +++++------ plugins/system/helix3/layout/generated.php | 46 ++--- .../layout/layout-settings/fields-helper.php | 16 +- .../layout-settings/row-column-settings.php | 152 ++++++++--------- plugins/system/helix3/layout/types/color.php | 6 +- plugins/system/helix3/layout/types/media.php | 27 +-- .../helix3/layouts/frontend/generate.php | 11 +- .../helix3/layouts/frontend/modules.php | 8 +- .../system/helix3/layouts/frontend/rows.php | 28 +-- plugins/system/helix3/params/menu-child.xml | 4 +- templates/shaper_helix3/css/template.css | 6 +- 26 files changed, 472 insertions(+), 389 deletions(-) diff --git a/plugins/system/helix3/core/helix3.php b/plugins/system/helix3/core/helix3.php index 416da8d..b09b508 100644 --- a/plugins/system/helix3/core/helix3.php +++ b/plugins/system/helix3/core/helix3.php @@ -1,18 +1,21 @@ document = JFactory::getDocument(); + self::getInstance()->document = Factory::getDocument(); $doc = self::getInstance()->document; if (is_string($key)) { @@ -62,15 +65,15 @@ public static function getDocument($key = false) public static function getParam($key) { - $params = JFactory::getApplication()->getTemplate(true)->params; + $params = Factory::getApplication()->getTemplate(true)->params; return $params->get($key); } public static function loadHead() { - $doc = JFactory::getDocument(); - $app = JFactory::getApplication(); + $doc = Factory::getDocument(); + $app = Factory::getApplication(); $option = $app->input->get('option', ''); $view = $app->input->get('view', ''); $layout = $app->input->get('layout', ''); @@ -78,7 +81,7 @@ public static function loadHead() // Favicon if ($favicon = self::getParam('favicon')) { - $doc->addFavicon(JURI::base(true) . '/' . $favicon); + $doc->addFavicon(Uri::base(true) . '/' . $favicon); } else { @@ -90,28 +93,28 @@ public static function loadHead() { if (JVERSION < 4) { - $doc->addStylesheet(JURI::base(true) . '/plugins/system/helix3/assets/css/system.j3.min.css'); + $doc->addStylesheet(Uri::base(true) . '/plugins/system/helix3/assets/css/system.j3.min.css'); } else { - $doc->addStylesheet(JURI::base(true) . '/plugins/system/helix3/assets/css/system.j4.min.css'); + $doc->addStylesheet(Uri::base(true) . '/plugins/system/helix3/assets/css/system.j4.min.css'); } } // web fonts self::loadWebFonts(); - JHtml::_('jquery.framework'); + HTMLHelper::_('jquery.framework'); // Remove Joomla core bootstrap if (JVERSION < 4) { - JHtml::_('bootstrap.framework'); - if(isset($doc->_scripts[JUri::base(true) . '/media/jui/js/bootstrap.min.js'])) { - unset($doc->_scripts[JUri::base(true) . '/media/jui/js/bootstrap.min.js']); + HTMLHelper::_('bootstrap.framework'); + if(isset($doc->_scripts[Uri::base(true) . '/media/jui/js/bootstrap.min.js'])) { + unset($doc->_scripts[Uri::base(true) . '/media/jui/js/bootstrap.min.js']); } - $doc->addScript(JUri::root(true) . '/plugins/system/helix3/assets/js/bootstrap.legacy.js'); + $doc->addScript(Uri::root(true) . '/plugins/system/helix3/assets/js/bootstrap.legacy.js'); } echo ''; @@ -120,8 +123,8 @@ public static function loadHead() //Body Class public static function bodyClass($class = '') { - $app = JFactory::getApplication(); - $doc = JFactory::getDocument(); + $app = Factory::getApplication(); + $doc = Factory::getDocument(); $language = $doc->language; $direction = $doc->direction; $option = str_replace('_', '-', $app->input->getCmd('option', '')); @@ -153,7 +156,7 @@ public static function bodyClass($class = '') //Get view public static function view($class = '') { - $app = JFactory::getApplication(); + $app = Factory::getApplication(); $view = $app->input->getCmd('view', ''); $layout = $app->input->getCmd('layout', ''); @@ -168,13 +171,13 @@ public static function view($class = '') //Get Template name public static function getTemplate() { - return JFactory::getApplication()->getTemplate(); + return Factory::getApplication()->getTemplate(); } //Get Template URI public static function getTemplateUri() { - return JURI::base(true) . '/templates/' . self::getTemplate(); + return Uri::base(true) . '/templates/' . self::getTemplate(); } /** @@ -190,20 +193,20 @@ public static function Param($name = true, $value = null) // if $name = true, this will return all param data if (is_bool($name) and $name == true) { - return JFactory::getApplication()->getTemplate(true)->params; + return Factory::getApplication()->getTemplate(true)->params; } // if $value = null, this will return specific param data if (is_null($value)) { - return JFactory::getApplication()->getTemplate(true)->params->get($name); + return Factory::getApplication()->getTemplate(true)->params->get($name); } // if $value not = null, this will set a value in specific name. - $data = JFactory::getApplication()->getTemplate(true)->params->get($name); + $data = Factory::getApplication()->getTemplate(true)->params->get($name); if (is_null($data) or !isset($data)) { - JFactory::getApplication()->getTemplate(true)->params->set($name, $value); + Factory::getApplication()->getTemplate(true)->params->set($name, $value); return $value; } @@ -224,12 +227,12 @@ public static function Param($name = true, $value = null) private static function importFeatures() { - $template = JFactory::getApplication()->getTemplate(); + $template = Factory::getApplication()->getTemplate(); $path = JPATH_THEMES . '/' . $template . '/features'; if (file_exists($path)) { - $files = JFolder::files($path, '.php'); + $files = Folder::files($path, '.php'); if (count($files)) { @@ -237,7 +240,7 @@ private static function importFeatures() { include_once $path . '/' . $file; - $name = JFile::stripExt($file); + $name = File::stripExt($file); $class = 'Helix3Feature' . ucfirst($name); $class = new $class(self::getInstance()); @@ -277,17 +280,17 @@ public static function generatelayout() self::getInstance()->addCSS('custom.css'); self::getInstance()->addJS('custom.js'); - $doc = JFactory::getDocument(); - $app = JFactory::getApplication(); + $doc = Factory::getDocument(); + $app = Factory::getApplication(); $option = $app->input->get('option', ''); $view = $app->input->get('view', ''); $layout = $app->input->get('layout', ''); $pagebuilder = false; - $params = JFactory::getApplication()->getTemplate(true)->params; + $params = Factory::getApplication()->getTemplate(true)->params; if ($option == 'com_sppagebuilder') { - $doc->addStylesheet(JURI::base(true) . '/plugins/system/helix3/assets/css/pagebuilder.css'); + $doc->addStylesheet(Uri::base(true) . '/plugins/system/helix3/assets/css/pagebuilder.css'); $pagebuilder = true; } @@ -312,7 +315,7 @@ public static function generatelayout() if (empty($rows)) { $layout_file = JPATH_SITE . '/templates/' . self::getTemplate() . '/layout/default.json'; - if (!JFile::exists($layout_file)) + if (!File::exists($layout_file)) { die('Default Layout file is not exists! Please goto to template manager and create a new layout first.'); } @@ -341,7 +344,7 @@ public static function generatelayout() $fluidrow = $row->settings->fluidrow; } - $id = (empty($row->settings->name)) ? 'sp-section-' . ($key + 1) : 'sp-' . JFilterOutput::stringURLSafe($row->settings->name); + $id = (empty($row->settings->name)) ? 'sp-section-' . ($key + 1) : 'sp-' . OutputFilter::stringURLSafe($row->settings->name); $row_class = ''; @@ -397,7 +400,7 @@ public static function generatelayout() if (!empty($row->settings->background_image)) { - $row_css .= 'background-image:url("' . JURI::base(true) . '/' . htmlspecialchars((JVERSION < 4 ? $row->settings->background_image : JHtml::cleanImageURL($row->settings->background_image)->url), ENT_COMPAT, 'UTF-8') . '");'; + $row_css .= 'background-image:url("' . Uri::base(true) . '/' . htmlspecialchars((JVERSION < 4 ? $row->settings->background_image : HTMLHelper::cleanImageURL($row->settings->background_image)->url), ENT_COMPAT, 'UTF-8') . '");'; if (!empty($row->settings->background_repeat)) { $row_css .= 'background-repeat:' . $row->settings->background_repeat . ';'; @@ -476,14 +479,14 @@ public static function generatelayout() 'componentArea' => $componentArea, ); - $template = JFactory::getApplication()->getTemplate(); + $template = Factory::getApplication()->getTemplate(); $themepath = JPATH_THEMES . '/' . $template; $generate_file = $themepath . '/html/layouts/helix3/frontend/generate.php'; $lyt_thm_path = $themepath . '/html/layouts/helix3/'; $layout_path = (file_exists($generate_file)) ? $lyt_thm_path : JPATH_ROOT .'/plugins/system/helix3/layouts'; - $getLayout = new JLayoutFile('frontend.generate', $layout_path ); + $getLayout = new FileLayout('frontend.generate', $layout_path ); $output .= $getLayout->render($layout_data); } @@ -514,7 +517,7 @@ private static function hasComponent($rowColumns) //Get Active Columns private static function rowColumns($columns) { - $doc = JFactory::getDocument(); + $doc = Factory::getDocument(); $cols = array(); //Inactive @@ -583,7 +586,7 @@ private static function rowColumns($columns) //Count Modules public static function countModules($position) { - $doc = JFactory::getDocument(); + $doc = Factory::getDocument(); return ($doc->countModules($position) or self::hasFeature($position)); } @@ -617,7 +620,7 @@ public static function hasFeature($position) public static function addCSS($sources, $attribs = array()) { - $template = JFactory::getApplication()->getTemplate(); + $template = Factory::getApplication()->getTemplate(); $path = JPATH_THEMES . '/' . $template . '/css/'; $srcs = array(); @@ -639,7 +642,7 @@ public static function addCSS($sources, $attribs = array()) if (file_exists($path . $src)) { - self::getInstance()->document->addStyleSheet(JURI::base(true) . '/templates/' . $template . '/css/' . $src, 'text/css', null, $attribs); + self::getInstance()->document->addStyleSheet(Uri::base(true) . '/templates/' . $template . '/css/' . $src, 'text/css', null, $attribs); } else { @@ -666,7 +669,7 @@ public static function addJS($sources, $seperator = ',') $srcs = array(); - $template = JFactory::getApplication()->getTemplate(); + $template = Factory::getApplication()->getTemplate(); $path = JPATH_THEMES . '/' . $template . '/js/'; if (is_string($sources)) @@ -686,7 +689,7 @@ public static function addJS($sources, $seperator = ',') if (file_exists($path . $src)) { - self::getInstance()->document->addScript(JURI::base(true) . '/templates/' . $template . '/js/' . $src); + self::getInstance()->document->addScript(Uri::base(true) . '/templates/' . $template . '/js/' . $src); } else { @@ -790,7 +793,7 @@ public static function setLessVariable($name, $value) private static function autoCompileLess($less, $css) { // load the cache - $template = JFactory::getApplication()->getTemplate(); + $template = Factory::getApplication()->getTemplate(); $cachePath = JPATH_CACHE . '/com_templates/templates/' . $template; $cacheFile = $cachePath . '/' . basename($css . ".cache"); @@ -820,7 +823,7 @@ private static function autoCompileLess($less, $css) if (!file_exists($cachePath)) { - JFolder::create($cachePath, 0755); + Folder::create($cachePath, 0755); } file_put_contents($cacheFile, serialize($newCache)); @@ -840,7 +843,7 @@ private static function autoCompileLess($less, $css) */ public static function addLess($less, $css, $attribs = array()) { - $template = JFactory::getApplication()->getTemplate(); + $template = Factory::getApplication()->getTemplate(); $themepath = JPATH_THEMES . '/' . $template; if (self::getParam('lessoption') and self::getParam('lessoption') == '1') @@ -882,7 +885,7 @@ private static function resetCookie($name) */ public static function Preset() { - $template = JFactory::getApplication()->getTemplate(); + $template = Factory::getApplication()->getTemplate(); $name = $template . '_preset'; if (isset($_COOKIE[$name])) @@ -1019,9 +1022,9 @@ public static function loadWebFonts() */ public static function addGoogleFont($fonts) { - $doc = JFactory::getDocument(); + $doc = Factory::getDocument(); $webfonts = ''; - $tpl_path = JPATH_BASE . '/templates/' . JFactory::getApplication()->getTemplate() . '/webfonts/webfonts.json'; + $tpl_path = JPATH_BASE . '/templates/' . Factory::getApplication()->getTemplate() . '/webfonts/webfonts.json'; $plg_path = JPATH_BASE . '/plugins/system/helix3/assets/webfonts/webfonts.json'; if (file_exists($tpl_path)) @@ -1154,8 +1157,8 @@ public static function compressJS($excludes = '') { require_once(__DIR__ . '/classes/Minifier.php'); - $doc = JFactory::getDocument(); - $app = JFactory::getApplication(); + $doc = Factory::getDocument(); + $app = Factory::getApplication(); $view = $app->input->get('view'); $layout = $app->input->get('layout'); @@ -1170,7 +1173,7 @@ public static function compressJS($excludes = '') $all_scripts = $doc->_scripts; $cache_path = JPATH_ROOT . '/cache/com_templates/templates/' . self::getTemplate(); $scripts = array(); - $root_url = JURI::root(true); + $root_url = Uri::root(true); $minifiedCode = ''; $md5sum = ''; @@ -1183,7 +1186,7 @@ public static function compressJS($excludes = '') $js_file = JPATH_ROOT . $key; } - if (JFile::exists($js_file)) + if (File::exists($js_file)) { if (!self::excludeJS($key, $excludes)) { @@ -1207,28 +1210,28 @@ public static function compressJS($excludes = '') //Compress All scripts if ($minifiedCode) { - if (!JFolder::exists($cache_path)) + if (!Folder::exists($cache_path)) { - JFolder::create($cache_path, 0755); + Folder::create($cache_path, 0755); } else { $file = $cache_path . '/' . md5($md5sum) . '.js'; - if (!JFile::exists($file)) + if (!File::exists($file)) { - JFile::write($file, $minifiedCode); + File::write($file, $minifiedCode); } else { if (filesize($file) == 0 || ((filemtime($file) + $cachetime * 60) < time())) { - JFile::write($file, $minifiedCode); + File::write($file, $minifiedCode); } } - $doc->addScript(JURI::base(true) . '/cache/com_templates/templates/' . self::getTemplate() . '/' . md5($md5sum) . '.js'); + $doc->addScript(Uri::base(true) . '/cache/com_templates/templates/' . self::getTemplate() . '/' . md5($md5sum) . '.js'); } } @@ -1251,13 +1254,13 @@ public static function compressCSS() require_once(__DIR__ . '/classes/cssmin.php'); - $doc = JFactory::getDocument(); - $app = JFactory::getApplication(); + $doc = Factory::getDocument(); + $app = Factory::getApplication(); $cachetime = $app->get('cachetime', 15); $all_stylesheets = $doc->_styleSheets; $cache_path = JPATH_ROOT . '/cache/com_templates/templates/' . self::getTemplate(); $stylesheets = array(); - $root_url = JURI::root(true); + $root_url = Uri::root(true); $minifiedCode = ''; $md5sum = ''; @@ -1273,7 +1276,7 @@ public static function compressCSS() global $absolute_url; $absolute_url = $key;//absoulte path of each css file - if (JFile::exists($css_file)) + if (File::exists($css_file)) { $stylesheets[] = $key; $md5sum .= md5($key); @@ -1305,28 +1308,28 @@ function ($matches) //Compress All stylesheets if ($minifiedCode) { - if (!JFolder::exists($cache_path)) + if (!Folder::exists($cache_path)) { - JFolder::create($cache_path, 0755); + Folder::create($cache_path, 0755); } else { $file = $cache_path . '/' . md5($md5sum) . '.css'; - if (!JFile::exists($file)) + if (!File::exists($file)) { - JFile::write($file, $minifiedCode); + File::write($file, $minifiedCode); } else { if (filesize($file) == 0 || ((filemtime($file) + $cachetime * 60) < time())) { - JFile::write($file, $minifiedCode); + File::write($file, $minifiedCode); } } - $doc->addStylesheet(JURI::base(true) . '/cache/com_templates/templates/' . self::getTemplate() . '/' . md5($md5sum) . '.css'); + $doc->addStylesheet(Uri::base(true) . '/cache/com_templates/templates/' . self::getTemplate() . '/' . md5($md5sum) . '.css'); } } diff --git a/plugins/system/helix3/fields/asset.php b/plugins/system/helix3/fields/asset.php index 37e6e34..dd50937 100644 --- a/plugins/system/helix3/fields/asset.php +++ b/plugins/system/helix3/fields/asset.php @@ -6,33 +6,37 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Form\FormField; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Uri\Uri; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.form.formfield'); -class JFormFieldAsset extends JFormField +class JFormFieldAsset extends FormField { protected $type = 'Asset'; protected function getInput() { $v = $this->getVersion(); - $helix_plg_url = JURI::root(true) . '/plugins/system/helix3'; - $doc = JFactory::getDocument(); - $doc->addScriptdeclaration('var layoutbuilder_base="' . JURI::root() . '";'); + $helix_plg_url = Uri::root(true) . '/plugins/system/helix3'; + $doc = Factory::getDocument(); + $doc->addScriptdeclaration('var layoutbuilder_base="' . Uri::root() . '";'); $doc->addScriptDeclaration("var basepath = '{$helix_plg_url}';"); $doc->addScriptDeclaration("var pluginVersion = '{$v}';"); //Core scripts - JHtml::_('jquery.framework'); + HTMLHelper::_('jquery.framework'); $jVersion = JVERSION < 4 ? '' : '.j4'; - if(JVERSION < 4) + if (JVERSION < 4) { - JHtml::_('jquery.ui', array('core', 'sortable')); - JHtml::_('formbehavior.chosen', 'select'); + HTMLHelper::_('jquery.ui', array('core', 'sortable')); + HTMLHelper::_('formbehavior.chosen', 'select'); } else { @@ -55,7 +59,7 @@ protected function getInput() private function getVersion() { - $db = JFactory::getDBO(); + $db = Factory::getDBO(); $query = $db->getQuery(true); $query ->select(array('*')) diff --git a/plugins/system/helix3/fields/button.php b/plugins/system/helix3/fields/button.php index bfdc473..4eb7c8d 100644 --- a/plugins/system/helix3/fields/button.php +++ b/plugins/system/helix3/fields/button.php @@ -6,12 +6,12 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\Form\FormField; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.form.formfield'); - -class JFormFieldButton extends JFormField +class JFormFieldButton extends FormField { protected $type = 'Button'; protected function getInput() { diff --git a/plugins/system/helix3/fields/group.php b/plugins/system/helix3/fields/group.php index b639d8f..7570cb0 100644 --- a/plugins/system/helix3/fields/group.php +++ b/plugins/system/helix3/fields/group.php @@ -6,21 +6,26 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\Form\FormField; +use Joomla\CMS\Language\Text; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.form.formfield'); - -class JFormFieldGroup extends JFormField { +class JFormFieldGroup extends FormField +{ protected $type = 'Group'; - public function getInput() { + + public function getInput() + { $text = (string) $this->element['title']; - $subtitle = (!empty($this->element['subtitle'])) ? '' . JText::_($this->element['subtitle']) . '':''; + $subtitle = (!empty($this->element['subtitle'])) ? '' . Text::_($this->element['subtitle']) . '':''; $group = ($this->element['group']=='no')?'no_group':'in_group'; - return '
' . JText::_($text) . $subtitle . '
'; + return '
' . Text::_($text) . $subtitle . '
'; } - public function getLabel(){ + public function getLabel() + { return false; } } diff --git a/plugins/system/helix3/fields/icon.php b/plugins/system/helix3/fields/icon.php index 4b04478..47b1253 100644 --- a/plugins/system/helix3/fields/icon.php +++ b/plugins/system/helix3/fields/icon.php @@ -6,14 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\Form\FormField; +use Joomla\CMS\HTML\HTMLHelper; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.form.formfield'); - -jimport('joomla.html.html.select'); - -class JFormFieldIcon extends JFormField { +class JFormFieldIcon extends FormField +{ protected $type = 'Icon'; @@ -22,18 +22,20 @@ public function getInput() { $icons = $this->getIconsList(); $arr = array(); - $arr[] = JHtml::_('select.option', '', '' ); + $arr[] = HTMLHelper::_('select.option', '', '' ); - foreach ($icons as $value) { - $arr[] = JHtml::_('select.option', $value, str_replace('fa-', '', $value) ); + foreach ($icons as $value) + { + $arr[] = HTMLHelper::_('select.option', $value, str_replace('fa-', '', $value) ); } - return JHtml::_('select.genericlist', $arr, $this->name, 'class="form-select"', 'value', 'text', $this->value); + return HTMLHelper::_('select.genericlist', $arr, $this->name, 'class="form-select"', 'value', 'text', $this->value); } /*Icons List*/ - private static function getIconsList() { + private static function getIconsList() + { return array( 'fa-500px', 'fa-adjust', diff --git a/plugins/system/helix3/fields/layout.php b/plugins/system/helix3/fields/layout.php index 72fa57c..4130582 100644 --- a/plugins/system/helix3/fields/layout.php +++ b/plugins/system/helix3/fields/layout.php @@ -6,12 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Form\FormField; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.form.formfield'); - -class JFormFieldLayout extends JFormField { +class JFormFieldLayout extends FormField +{ protected $type = 'Layout'; @@ -57,8 +59,8 @@ public function getLabel() //Get template name private static function getTemplate() { - $id = (int) JFactory::getApplication()->input->get('id', 0); - $db = JFactory::getDbo(); + $id = (int) Factory::getApplication()->input->get('id', 0); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select($db->quoteName(array('template'))); $query->from($db->quoteName('#__template_styles')); diff --git a/plugins/system/helix3/fields/layoutlist.php b/plugins/system/helix3/fields/layoutlist.php index 3e2dadc..e0eab59 100644 --- a/plugins/system/helix3/fields/layoutlist.php +++ b/plugins/system/helix3/fields/layoutlist.php @@ -1,17 +1,19 @@ + -
    • +
  • - - - - + + + +
  • - +
    • diff --git a/plugins/system/helix3/fields/modpos.php b/plugins/system/helix3/fields/modpos.php index d44ffa6..4975929 100644 --- a/plugins/system/helix3/fields/modpos.php +++ b/plugins/system/helix3/fields/modpos.php @@ -1,15 +1,19 @@ setQuery($query); @@ -57,8 +61,8 @@ protected function getInput() $selectOption = array(); sort($selectOption); - foreach($options as $option) $selectOption[] = JHTML::_( 'select.option',$option,$option ); + foreach($options as $option) $selectOption[] = HTMLHelper::_( 'select.option',$option,$option ); - return JHTML::_('select.genericlist', $selectOption, 'jform[params]['.$this->element['name'].']', 'class="form-select '.$this->element['class'].'"', 'value', 'text', $this->value, 'jform_params_helix_'.$this->element['name']); + return HTMLHelper::_('select.genericlist', $selectOption, 'jform[params]['.$this->element['name'].']', 'class="form-select '.$this->element['class'].'"', 'value', 'text', $this->value, 'jform_params_helix_'.$this->element['name']); } } diff --git a/plugins/system/helix3/fields/optionio.php b/plugins/system/helix3/fields/optionio.php index 6acc376..bcadca0 100644 --- a/plugins/system/helix3/fields/optionio.php +++ b/plugins/system/helix3/fields/optionio.php @@ -6,18 +6,20 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Form\FormField; +use Joomla\CMS\Language\Text; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.form.formfield'); - -class JFormFieldOptionio extends JFormField +class JFormFieldOptionio extends FormField { protected $type = 'optionio'; protected function getInput() { - $input = JFactory::getApplication()->input; + $input = Factory::getApplication()->input; $template_id = $input->get('id',0,'INT'); $url_cureent = "//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; @@ -26,11 +28,11 @@ protected function getInput() $output = ''; $output .= '
    '; - $output .= ''. JText::_("HELIX_SETTINGS_EXPORT") .''; + $output .= ''. Text::_("HELIX_SETTINGS_EXPORT") .''; $output .= '
    '; $output .= '
    '; $output .= ''; - $output .= '
    '. JText::_("HELIX_SETTINGS_IMPORT") .'
    '; + $output .= '
    '. Text::_("HELIX_SETTINGS_IMPORT") .'
    '; $output .= '
    '; return $output; diff --git a/plugins/system/helix3/fields/presets.php b/plugins/system/helix3/fields/presets.php index 29746a0..fa39c9d 100644 --- a/plugins/system/helix3/fields/presets.php +++ b/plugins/system/helix3/fields/presets.php @@ -1,20 +1,21 @@ form->getValue('template'); $templatePresetsDir = JPATH_SITE.'/templates/'.$template.'/images/presets/'; - $base_url = JURI::root(true).'/templates/'.$template.'/images/presets/'; + $base_url = Uri::root(true).'/templates/'.$template.'/images/presets/'; $root_path = JPATH_SITE.'/templates/'.$template.'/images/presets/'; - $doc = JFactory::getDocument(); - $helix_url = JURI::root(true).'/plugins/system/helix3/'; + $doc = Factory::getDocument(); + $helix_url = Uri::root(true).'/plugins/system/helix3/'; - $folders = JFolder::folders($templatePresetsDir); + $folders = Folder::folders($templatePresetsDir); if( !defined('CURRENT_PRESET') ){ define('CURRENT_PRESET', $this->value); @@ -36,7 +37,7 @@ protected function getInput() } $html = ''; - $app = JFactory::getApplication(); + $app = Factory::getApplication(); $template = $app->getTemplate('shaper_helix3'); $params = $template->params; $variable = $params->get('variable'); diff --git a/plugins/system/helix3/fields/spgallery.php b/plugins/system/helix3/fields/spgallery.php index 05681a3..a582a6e 100644 --- a/plugins/system/helix3/fields/spgallery.php +++ b/plugins/system/helix3/fields/spgallery.php @@ -1,27 +1,35 @@ addScript($plg_path . '/assets/js/jquery.ui.core.min.js'); // $doc->addScript($plg_path . '/assets/js/jquery.ui.sortable.min.js'); - $plg_path = JURI::root(true) . '/plugins/system/helix3'; + $plg_path = Uri::root(true) . '/plugins/system/helix3'; $doc->addScript($plg_path . '/assets/js/jquery-ui.min.js'); $doc->addScript($plg_path . '/assets/js/spgallery.js'); $doc->addStyleSheet($plg_path . '/assets/css/spgallery.css'); @@ -43,20 +51,20 @@ protected function getInput() $data_src = $value; - $src = JURI::root(true) . '/' . $value; + $src = Uri::root(true) . '/' . $value; $basename = basename($src); - $thumbnail = JPATH_ROOT . '/' . dirname($value) . '/' . JFile::stripExt($basename) . '_thumbnail.' . JFile::getExt($basename); + $thumbnail = JPATH_ROOT . '/' . dirname($value) . '/' . File::stripExt($basename) . '_thumbnail.' . File::getExt($basename); if(file_exists($thumbnail)) { - $src = JURI::root(true) . '/' . dirname($value) . '/' . JFile::stripExt($basename) . '_thumbnail.' . JFile::getExt($basename); + $src = Uri::root(true) . '/' . dirname($value) . '/' . File::stripExt($basename) . '_thumbnail.' . File::getExt($basename); } - $small_size = JPATH_ROOT . '/' . dirname($value) . '/' . JFile::stripExt($basename) . '_small.' . JFile::getExt($basename); + $small_size = JPATH_ROOT . '/' . dirname($value) . '/' . File::stripExt($basename) . '_small.' . File::getExt($basename); if(file_exists($small_size)) { - $src = JURI::root(true) . '/' . dirname($value) . '/' . JFile::stripExt($basename) . '_small.' . JFile::getExt($basename); + $src = Uri::root(true) . '/' . dirname($value) . '/' . File::stripExt($basename) . '_small.' . File::getExt($basename); } $output .= '
  • Delete
    • '; diff --git a/plugins/system/helix3/fields/spimage.php b/plugins/system/helix3/fields/spimage.php index e4fa562..1d46dee 100644 --- a/plugins/system/helix3/fields/spimage.php +++ b/plugins/system/helix3/fields/spimage.php @@ -6,21 +6,27 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Form\FormField; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Uri\Uri; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -class JFormFieldSpimage extends JFormField +class JFormFieldSpimage extends FormField { protected $type = 'Spimage'; protected function getInput() { - $doc = JFactory::getDocument(); + $doc = Factory::getDocument(); - JHtml::_('jquery.framework'); + HTMLHelper::_('jquery.framework'); - $plg_path = JURI::root(true) . '/plugins/system/helix3'; + $plg_path = Uri::root(true) . '/plugins/system/helix3'; $doc->addScript($plg_path . '/assets/js/spimage.js'); $doc->addStyleSheet($plg_path . '/assets/css/spimage.css'); @@ -35,15 +41,17 @@ protected function getInput() $output = '
    '; $output .= '
    '; - if($this->value) { + if ($this->value) + { $data_src = $this->value; - $src = JURI::root(true) . '/' . $data_src; + $src = Uri::root(true) . '/' . $data_src; $basename = basename($data_src); - $thumbnail = JPATH_ROOT . '/' . dirname($data_src) . '/' . JFile::stripExt($basename) . '_thumbnail.' . JFile::getExt($basename); + $thumbnail = JPATH_ROOT . '/' . dirname($data_src) . '/' . File::stripExt($basename) . '_thumbnail.' . File::getExt($basename); - if(file_exists($thumbnail)) { - $src = JURI::root(true) . '/' . dirname($data_src) . '/' . JFile::stripExt($basename) . '_thumbnail.' . JFile::getExt($basename); + if (file_exists($thumbnail)) + { + $src = Uri::root(true) . '/' . dirname($data_src) . '/' . File::stripExt($basename) . '_thumbnail.' . File::getExt($basename); } $output .= ''; diff --git a/plugins/system/helix3/fields/typography.php b/plugins/system/helix3/fields/typography.php index 888d8a8..5d6c514 100644 --- a/plugins/system/helix3/fields/typography.php +++ b/plugins/system/helix3/fields/typography.php @@ -1,17 +1,20 @@ '; $html .= '
    '; - $html .= ''; + $html .= ''; $html .= ''; if(isset($value->fontFamily)) { @@ -85,7 +88,7 @@ protected function getInput() { //Font Subsets $html .= '
    '; - $html .= ''; + $html .= ''; $html .= ''; $html .= '
    '; @@ -140,8 +143,8 @@ private static function filterArray($items, $key) { //Get template name private static function getTemplate() { - $id = (int) JFactory::getApplication()->input->get('id', 0); - $db = JFactory::getDbo(); + $id = (int) Factory::getApplication()->input->get('id', 0); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select($db->quoteName(array('template'))); $query->from($db->quoteName('#__template_styles')); diff --git a/plugins/system/helix3/helix3.php b/plugins/system/helix3/helix3.php index 587c6a3..6296963 100644 --- a/plugins/system/helix3/helix3.php +++ b/plugins/system/helix3/helix3.php @@ -9,17 +9,20 @@ //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.plugin.plugin'); -jimport( 'joomla.event.plugin' ); -jimport('joomla.registry.registry'); - +use Joomla\CMS\Factory; +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Form\Form; +use Joomla\Registry\Registry; +use Joomla\CMS\Filesystem\File; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Plugin\CMSPlugin; -if(!class_exists('Helix3')) { - require_once (__DIR__ . '/core/helix3.php'); +if (!class_exists('Helix3')) +{ + require_once (__DIR__ . '/core/helix3.php'); } -class plgSystemHelix3 extends JPlugin +class plgSystemHelix3 extends CMSPlugin { protected $autoloadLanguage = true; @@ -48,8 +51,8 @@ public function onAfterInitialise() require_once $bootstrapPath; } - JHtml::register('bootstrap.tooltip', ['Helix3Bootstrap', 'tooltip']); - JHtml::register('bootstrap.popover', ['Helix3Bootstrap', 'popover']); + HTMLHelper::register('bootstrap.tooltip', ['Helix3Bootstrap', 'tooltip']); + HTMLHelper::register('bootstrap.popover', ['Helix3Bootstrap', 'popover']); } } } @@ -57,15 +60,16 @@ public function onAfterInitialise() // Copied style function onAfterDispatch() { - if( !JFactory::getApplication()->isClient('administrator') ) { + if (!Factory::getApplication()->isClient('api') && !Factory::getApplication()->isClient('administrator')) + { - $activeMenu = JFactory::getApplication()->getMenu()->getActive(); + $activeMenu = Factory::getApplication()->getMenu()->getActive(); - if(is_null($activeMenu)) $template_style_id = 0; + if (is_null($activeMenu)) $template_style_id = 0; else $template_style_id = (int) $activeMenu->template_style_id; if ($template_style_id > 0) { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select(array('*')); $query->from($db->quoteName('#__template_styles')); @@ -76,7 +80,7 @@ function onAfterDispatch() { if(!empty($style->template) && !empty($style->params)) { - JFactory::getApplication()->setTemplate($style->template, $style->params); + Factory::getApplication()->setTemplate($style->template, $style->params); } } } @@ -85,13 +89,13 @@ function onAfterDispatch() { function onContentPrepareForm($form, $data) { $v = self::getVersion(); - $doc = JFactory::getDocument(); - $plg_path = JURI::root(true) . '/plugins/system/helix3'; - $plg_path2 = JURI::root() . 'plugins/system/helix3'; - JForm::addFormPath(JPATH_PLUGINS.'/system/helix3/params'); + $doc = Factory::getDocument(); + $plg_path = Uri::root(true) . '/plugins/system/helix3'; + $plg_path2 = Uri::root() . 'plugins/system/helix3'; + Form::addFormPath(JPATH_PLUGINS.'/system/helix3/params'); if ($form->getName()=='com_menus.item') { //Add Helix menu params to the menu item - JHtml::_('jquery.framework'); + HTMLHelper::_('jquery.framework'); $data = (array)$data; if($data['id'] && $data['parent_id'] == 1) @@ -101,11 +105,11 @@ function onContentPrepareForm($form, $data) $doc->addStyleSheet($plg_path . '/assets/css/modal.css?' . $v); $doc->addStyleSheet($plg_path . '/assets/css/menu.generator.css?' . $v); - JHtml::_('jquery.framework'); + HTMLHelper::_('jquery.framework'); if(JVERSION < 4) { - JHtml::_('jquery.ui', array('core', 'more', 'sortable')); + HTMLHelper::_('jquery.ui', array('core', 'more', 'sortable')); $doc->addScript($plg_path.'/assets/js/jquery-ui.draggable.min.js?' . $v); } else @@ -125,17 +129,19 @@ function onContentPrepareForm($form, $data) } //Article Post format - if ($form->getName() == 'com_content.article') { - JHtml::_('jquery.framework'); + if ($form->getName() == 'com_content.article') + { + HTMLHelper::_('jquery.framework'); $doc->addStyleSheet($plg_path.'/assets/css/font-awesome.min.css?' . $v); $doc->addScript($plg_path.'/assets/js/post-formats.js?' . $v); $tpl_path = JPATH_ROOT . '/templates/' . $this->getTemplateName(); - if(JFile::exists( $tpl_path . '/post-formats.xml' )) { - JForm::addFormPath($tpl_path); + if (File::exists( $tpl_path . '/post-formats.xml' )) + { + Form::addFormPath($tpl_path); } else { - JForm::addFormPath(JPATH_PLUGINS . '/system/helix3/params'); + Form::addFormPath(JPATH_PLUGINS . '/system/helix3/params'); } $form->loadFile('post-formats', false); @@ -149,7 +155,7 @@ public function onExtensionAfterSave($option, $data) { if ($option == 'com_templates.style' && !empty($data->id)) { - $params = new JRegistry; + $params = new Registry; $params->loadString($data->params); $email = $params->get('joomshaper_email'); @@ -162,7 +168,7 @@ public function onExtensionAfterSave($option, $data) { $extra_query = 'joomshaper_email=' . urlencode($email); $extra_query .='&joomshaper_license_key=' . urlencode($license_key); - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $fields = array( $db->quoteName('extra_query') . '=' . $db->quote($extra_query), @@ -181,17 +187,18 @@ public function onExtensionAfterSave($option, $data) { public function onAfterRoute() { - $japps = JFactory::getApplication(); + $japps = Factory::getApplication(); if ( $japps->isClient('administrator') ) { - $user = JFactory::getUser(); + $user = Factory::getUser(); - if( !in_array( 8, $user->groups ) ){ + if ( !in_array( 8, $user->groups ) ) + { return false; } - $inputs = JFactory::getApplication()->input; + $inputs = Factory::getApplication()->input; $option = $inputs->get ( 'option', '' ); $id = $inputs->get ( 'id', '0', 'INT' ); @@ -199,10 +206,10 @@ public function onAfterRoute() if ( strtolower( $option ) == 'com_templates' && $id && $helix3task == "export" ) { - $db = JFactory::getDbo(); - $query = $db->getQuery(true); + $db = Factory::getDbo(); + $query = $db->getQuery(true); - $query + $query ->select( '*' ) ->from( $db->quoteName( '#__template_styles' ) ) ->where( $db->quoteName( 'id' ) . ' = ' . $db->quote( $id ) . ' AND ' . $db->quoteName( 'client_id' ) . ' = 0' ); @@ -229,7 +236,7 @@ public function onAfterRoute() private function getTemplateName() { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select($db->quoteName(array('template'))); $query->from($db->quoteName('#__template_styles')); @@ -241,24 +248,24 @@ private function getTemplateName() } function onAfterRender() { - $app = JFactory::getApplication(); + $app = Factory::getApplication(); - if ($app->isClient('administrator')) + if ($app->isClient('administrator')) { - return; - } - - $body = JFactory::getApplication()->getBody(); - $preset = Helix3::Preset(); - - $body = str_replace('{helix_preset}', $preset, $body); + return; + } + + $body = Factory::getApplication()->getBody(); + $preset = Helix3::Preset(); - JFactory::getApplication()->setBody($body); + $body = str_replace('{helix_preset}', $preset, $body); + + Factory::getApplication()->setBody($body); } private static function getVersion() { - $db = JFactory::getDBO(); + $db = Factory::getDBO(); $query = $db->getQuery(true); $query ->select(array('*')) diff --git a/plugins/system/helix3/layout/generated.php b/plugins/system/helix3/layout/generated.php index ce90fb4..2f33518 100644 --- a/plugins/system/helix3/layout/generated.php +++ b/plugins/system/helix3/layout/generated.php @@ -1,18 +1,22 @@
    @@ -62,8 +66,8 @@
    - - + +
    @@ -75,13 +79,13 @@
    - +
    • - +
        $grid){ @@ -93,9 +97,9 @@
      • -
      • -
      • -
      • +
      • +
      • +
    @@ -103,7 +107,7 @@
    -
    +
    @@ -120,7 +124,7 @@ if ($layout_data) { foreach ($layout_data as $row) { $rowSettings = RowColumnSettings::getSettings($row->settings); - $name = JText::_('HELIX_SECTION_TITLE'); + $name = Text::_('HELIX_SECTION_TITLE'); if (isset($row->settings->name)) { $name = $row->settings->name; @@ -136,7 +140,7 @@
    diff --git a/plugins/system/helix3/layout/layout-settings/fields-helper.php b/plugins/system/helix3/layout/layout-settings/fields-helper.php index 013f0d6..3515f2d 100644 --- a/plugins/system/helix3/layout/layout-settings/fields-helper.php +++ b/plugins/system/helix3/layout/layout-settings/fields-helper.php @@ -1,20 +1,22 @@ 'general', 'title'=>'', @@ -16,128 +18,128 @@ 'name' => array( 'type' => 'text', - 'title' => JText::_('HELIX_SECTION_TITLE'), - 'desc' => JText::_('HELIX_SECTION_TITLE_DESC'), + 'title' => Text::_('HELIX_SECTION_TITLE'), + 'desc' => Text::_('HELIX_SECTION_TITLE_DESC'), 'std' => '' ), 'background_color' => array( 'type' => 'color', - 'title' => JText::_('HELIX_SECTION_BACKGROUND_COLOR'), - 'desc' => JText::_('HELIX_SECTION_BACKGROUND_COLOR_DESC') + 'title' => Text::_('HELIX_SECTION_BACKGROUND_COLOR'), + 'desc' => Text::_('HELIX_SECTION_BACKGROUND_COLOR_DESC') ), 'color' => array( 'type' => 'color', - 'title' => JText::_('HELIX_SECTION_TEXT_COLOR'), - 'desc' => JText::_('HELIX_SECTION_TEXT_COLOR_DESC') + 'title' => Text::_('HELIX_SECTION_TEXT_COLOR'), + 'desc' => Text::_('HELIX_SECTION_TEXT_COLOR_DESC') ), 'background_image' => array( 'type' => 'media', - 'title' => JText::_('HELIX_SECTION_BACKGROUND_IMAGE'), - 'desc' => JText::_('HELIX_SECTION_BACKGROUND_IMAGE_DESC'), + 'title' => Text::_('HELIX_SECTION_BACKGROUND_IMAGE'), + 'desc' => Text::_('HELIX_SECTION_BACKGROUND_IMAGE_DESC'), 'std' => '', ), 'background_repeat'=>array( 'type'=>'select', - 'title'=>JText::_('HELIX_BG_REPEAT'), - 'desc'=>JText::_('HELIX_BG_REPEAT_DESC'), + 'title'=>Text::_('HELIX_BG_REPEAT'), + 'desc'=>Text::_('HELIX_BG_REPEAT_DESC'), 'values'=>array( - 'no-repeat'=>JText::_('HELIX_BG_REPEAT_NO'), - 'repeat'=>JText::_('HELIX_BG_REPEAT_ALL'), - 'repeat-x'=>JText::_('HELIX_BG_REPEAT_HORIZ'), - 'repeat-y'=>JText::_('HELIX_BG_REPEAT_VERTI'), - 'inherit'=>JText::_('HELIX_BG_REPEAT_INHERIT'), + 'no-repeat'=>Text::_('HELIX_BG_REPEAT_NO'), + 'repeat'=>Text::_('HELIX_BG_REPEAT_ALL'), + 'repeat-x'=>Text::_('HELIX_BG_REPEAT_HORIZ'), + 'repeat-y'=>Text::_('HELIX_BG_REPEAT_VERTI'), + 'inherit'=>Text::_('HELIX_BG_REPEAT_INHERIT'), ), 'std'=>'no-repeat', ), 'background_size' => array( 'type' => 'select', - 'title'=>JText::_('HELIX_BG_SIZE'), - 'desc'=>JText::_('HELIX_BG_SIZE_DESC'), + 'title'=>Text::_('HELIX_BG_SIZE'), + 'desc'=>Text::_('HELIX_BG_SIZE_DESC'), 'values'=>array( - 'cover'=>JText::_('HELIX_BG_COVER'), - 'contain'=>JText::_('HELIX_BG_CONTAIN'), - 'inherit'=>JText::_('HELIX_BG_INHERIT'), + 'cover'=>Text::_('HELIX_BG_COVER'), + 'contain'=>Text::_('HELIX_BG_CONTAIN'), + 'inherit'=>Text::_('HELIX_BG_INHERIT'), ), 'std'=>'cover', ), 'background_attachment'=>array( 'type'=>'select', - 'title'=>JText::_('HELIX_BG_ATTACHMENT'), - 'desc'=>JText::_('HELIX_BG_ATTACHMENT_DESC'), + 'title'=>Text::_('HELIX_BG_ATTACHMENT'), + 'desc'=>Text::_('HELIX_BG_ATTACHMENT_DESC'), 'values'=>array( - 'fixed'=>JText::_('HELIX_BG_ATTACHMENT_FIXED'), - 'scroll'=>JText::_('HELIX_BG_ATTACHMENT_SCROLL'), - 'inherit'=>JText::_('HELIX_BG_ATTACHMENT_INHERIT'), + 'fixed'=>Text::_('HELIX_BG_ATTACHMENT_FIXED'), + 'scroll'=>Text::_('HELIX_BG_ATTACHMENT_SCROLL'), + 'inherit'=>Text::_('HELIX_BG_ATTACHMENT_INHERIT'), ), 'std'=>'fixed', ), 'background_position' => array( 'type' => 'select', - 'title'=>JText::_('HELIX_BG_POSITION'), - 'desc'=>JText::_('HELIX_BG_POSITION_DESC'), + 'title'=>Text::_('HELIX_BG_POSITION'), + 'desc'=>Text::_('HELIX_BG_POSITION_DESC'), 'values'=>array( - '0 0'=>JText::_('HELIX_BG_POSITION_LEFT_TOP'), - '0 50%'=>JText::_('HELIX_BG_POSITION_LEFT_CENTER'), - '0 100%'=>JText::_('HELIX_BG_POSITION_LEFT_BOTTOM'), - '50% 0'=>JText::_('HELIX_BG_POSITION_CENTER_TOP'), - '50% 50%'=>JText::_('HELIX_BG_POSITION_CENTER_CENTER'), - '50% 100%'=>JText::_('HELIX_BG_POSITION_CENTER_BOTTOM'), - '100% 0'=>JText::_('HELIX_BG_POSITION_RIGHT_TOP'), - '100% 50%'=>JText::_('HELIX_BG_POSITION_RIGHT_CENTER'), - '100% 100%'=>JText::_('HELIX_BG_POSITION_RIGHT_BOTTOM'), + '0 0'=>Text::_('HELIX_BG_POSITION_LEFT_TOP'), + '0 50%'=>Text::_('HELIX_BG_POSITION_LEFT_CENTER'), + '0 100%'=>Text::_('HELIX_BG_POSITION_LEFT_BOTTOM'), + '50% 0'=>Text::_('HELIX_BG_POSITION_CENTER_TOP'), + '50% 50%'=>Text::_('HELIX_BG_POSITION_CENTER_CENTER'), + '50% 100%'=>Text::_('HELIX_BG_POSITION_CENTER_BOTTOM'), + '100% 0'=>Text::_('HELIX_BG_POSITION_RIGHT_TOP'), + '100% 50%'=>Text::_('HELIX_BG_POSITION_RIGHT_CENTER'), + '100% 100%'=>Text::_('HELIX_BG_POSITION_RIGHT_BOTTOM'), ), 'std'=>'0 0', ), 'link_color' => array( 'type' => 'color', - 'title' => JText::_('HELIX_LINK_COLOR'), - 'desc' => JText::_('HELIX_LINK_COLOR_DESC') + 'title' => Text::_('HELIX_LINK_COLOR'), + 'desc' => Text::_('HELIX_LINK_COLOR_DESC') ), 'link_hover_color' => array( 'type' => 'color', - 'title' => JText::_('HELIX_LINK_HOVER_COLOR'), - 'desc' => JText::_('HELIX_LINK_HOVER_COLOR_DESC') + 'title' => Text::_('HELIX_LINK_HOVER_COLOR'), + 'desc' => Text::_('HELIX_LINK_HOVER_COLOR_DESC') ), 'hidden_xs' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_HIDDEN_MOBILE'), - 'desc' => JText::_('HELIX_HIDDEN_MOBILE_DESC'), + 'title' => Text::_('HELIX_HIDDEN_MOBILE'), + 'desc' => Text::_('HELIX_HIDDEN_MOBILE_DESC'), 'std' => '', ), 'hidden_sm' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_HIDDEN_TABLET'), - 'desc' => JText::_('HELIX_HIDDEN_TABLET_DESC'), + 'title' => Text::_('HELIX_HIDDEN_TABLET'), + 'desc' => Text::_('HELIX_HIDDEN_TABLET_DESC'), 'std' => '', ), 'hidden_md' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_HIDDEN_DESKTOP'), - 'desc' => JText::_('HELIX_HIDDEN_DESKTOP_DESC'), + 'title' => Text::_('HELIX_HIDDEN_DESKTOP'), + 'desc' => Text::_('HELIX_HIDDEN_DESKTOP_DESC'), 'std' => '', ), 'padding' => array( 'type' => 'text', - 'title' => JText::_('HELIX_PADDING'), - 'desc' => JText::_('HELIX_PADDING_DESC'), + 'title' => Text::_('HELIX_PADDING'), + 'desc' => Text::_('HELIX_PADDING_DESC'), 'std' => '' ), 'margin' => array( 'type' => 'text', - 'title' => JText::_('HELIX_MARGIN'), - 'desc' => JText::_('HELIX_MARGIN_DESC'), + 'title' => Text::_('HELIX_MARGIN'), + 'desc' => Text::_('HELIX_MARGIN_DESC'), 'std' => '' ), 'fluidrow' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_ROW_FULL_WIDTH'), - 'desc' => JText::_('HELIX_ROW_FULL_WIDTH_DESC'), + 'title' => Text::_('HELIX_ROW_FULL_WIDTH'), + 'desc' => Text::_('HELIX_ROW_FULL_WIDTH_DESC'), 'std' => '', ), 'custom_class' => array( 'type' => 'text', - 'title' => JText::_('HELIX_CUSTOM_CLASS'), - 'desc' => JText::_('HELIX_CUSTOM_CLASS_DESC'), + 'title' => Text::_('HELIX_CUSTOM_CLASS'), + 'desc' => Text::_('HELIX_CUSTOM_CLASS_DESC'), 'std' => '' ), ) @@ -150,39 +152,39 @@ 'column_type' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_COMPONENT'), - 'desc' => JText::_('HELIX_COMPONENT_DESC'), + 'title' => Text::_('HELIX_COMPONENT'), + 'desc' => Text::_('HELIX_COMPONENT_DESC'), 'std'=>'', ), 'name' => array( 'type' => 'select', - 'title' => JText::_('HELIX_MODULE_POSITION'), - 'desc' => JText::_('HELIX_MODULE_POSITION_DESC'), + 'title' => Text::_('HELIX_MODULE_POSITION'), + 'desc' => Text::_('HELIX_MODULE_POSITION_DESC'), 'values' => array(), 'std'=>'none', ), 'hidden_xs' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_HIDDEN_MOBILE'), - 'desc' => JText::_('HELIX_HIDDEN_MOBILE_DESC'), + 'title' => Text::_('HELIX_HIDDEN_MOBILE'), + 'desc' => Text::_('HELIX_HIDDEN_MOBILE_DESC'), 'std' => '', ), 'hidden_sm' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_HIDDEN_TABLET'), - 'desc' => JText::_('HELIX_HIDDEN_TABLET_DESC'), + 'title' => Text::_('HELIX_HIDDEN_TABLET'), + 'desc' => Text::_('HELIX_HIDDEN_TABLET_DESC'), 'std' => '', ), 'hidden_md' => array( 'type' => 'checkbox', - 'title' => JText::_('HELIX_HIDDEN_DESKTOP'), - 'desc' => JText::_('HELIX_HIDDEN_DESKTOP_DESC'), + 'title' => Text::_('HELIX_HIDDEN_DESKTOP'), + 'desc' => Text::_('HELIX_HIDDEN_DESKTOP_DESC'), 'std' => '', ), 'sm_col' => array( 'type' => 'select', - 'title' => JText::_('HELIX_TABLET_LAYOUT'), - 'desc' => JText::_('HELIX_TABLET_LAYOUT_DESC'), + 'title' => Text::_('HELIX_TABLET_LAYOUT'), + 'desc' => Text::_('HELIX_TABLET_LAYOUT_DESC'), 'values' => array( '' => "", 'col-sm-1' => 'col-md-1', @@ -202,8 +204,8 @@ ), 'xs_col' => array( 'type' => 'select', - 'title' => JText::_('HELIX_MOBILE_LAYOUT'), - 'desc' => JText::_('HELIX_MOBILE_LAYOUT_DESC'), + 'title' => Text::_('HELIX_MOBILE_LAYOUT'), + 'desc' => Text::_('HELIX_MOBILE_LAYOUT_DESC'), 'values' => array( '' => "", 'col-xs-1' => 'col-1', @@ -223,8 +225,8 @@ ), 'custom_class' => array( 'type' => 'text', - 'title' => JText::_('HELIX_CUSTOM_CLASS'), - 'desc' => JText::_('HELIX_CUSTOM_CLASS_DESC'), + 'title' => Text::_('HELIX_CUSTOM_CLASS'), + 'desc' => Text::_('HELIX_CUSTOM_CLASS_DESC'), 'std' => '' ), ) diff --git a/plugins/system/helix3/layout/types/color.php b/plugins/system/helix3/layout/types/color.php index 9e0d758..136b9a6 100644 --- a/plugins/system/helix3/layout/types/color.php +++ b/plugins/system/helix3/layout/types/color.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ +use Joomla\CMS\HTML\HTMLHelper; + //no direct accees defined ('_JEXEC') or die ('resticted aceess'); @@ -19,8 +21,8 @@ static function getInput($key, $attr) } // Including fallback code for HTML5 non supported browsers. - JHtml::_('jquery.framework'); - JHtml::_('script', 'system/html5fallback.js', false, true); + HTMLHelper::_('jquery.framework'); + HTMLHelper::_('script', 'system/html5fallback.js', false, true); $output = '
    '; $output .= ''; diff --git a/plugins/system/helix3/layout/types/media.php b/plugins/system/helix3/layout/types/media.php index 047fbf2..4b50ece 100644 --- a/plugins/system/helix3/layout/types/media.php +++ b/plugins/system/helix3/layout/types/media.php @@ -4,7 +4,12 @@ * @author JoomShaper https://www.joomshaper.com * @copyright (c) 2010 - 2021 JoomShaper * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later -*/ +*/ + +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Component\ComponentHelper; //no direct accees defined ('_JEXEC') or die ('resticted aceess'); @@ -20,7 +25,7 @@ static function getInput($key, $attr) } if($attr['std']!='') { - $src = 'src="' . JURI::root() . $attr['std'] . '"'; + $src = 'src="' . Uri::root() . $attr['std'] . '"'; } else { $src = ''; } @@ -33,8 +38,8 @@ static function getInput($key, $attr) // Joomla if (JVERSION < 4) { - JHtml::_('jquery.framework'); - JHtml::_('behavior.modal'); + HTMLHelper::_('jquery.framework'); + HTMLHelper::_('behavior.modal'); $output .= '
    '; $output .= ''; @@ -47,24 +52,24 @@ static function getInput($key, $attr) $url = 'index.php?option=com_media&view=media&tmpl=component'; $id = 'helix3_modal'; - $modalHTML = JHtml::_( + $modalHTML = HTMLHelper::_( 'bootstrap.renderModal', 'imageModal_' . $id, [ 'url' => $url, - 'title' => JText::_('JLIB_FORM_CHANGE_IMAGE'), + 'title' => Text::_('JLIB_FORM_CHANGE_IMAGE'), 'closeButton' => true, 'height' => '100%', 'width' => '100%', 'modalWidth' => '80', 'bodyHeight' => '60', - 'footer' => '' - . '', + 'footer' => '' + . '', ] ); $output .= ''; @@ -73,8 +78,8 @@ static function getInput($key, $attr) $output .= '
    '; $output .= ''; - $output .= ''; - $output .= ''; + $output .= ''; + $output .= ''; $output .= '
    '; $output .= '    '; diff --git a/plugins/system/helix3/layouts/frontend/generate.php b/plugins/system/helix3/layouts/frontend/generate.php index a0afa08..dc91f37 100644 --- a/plugins/system/helix3/layouts/frontend/generate.php +++ b/plugins/system/helix3/layouts/frontend/generate.php @@ -7,16 +7,19 @@ */ defined('_JEXEC') or die('Restricted Access'); -// +use Joomla\CMS\Factory; +use Joomla\CMS\Layout\FileLayout; + //helper & model $menu_class = JPATH_ROOT . '/plugins/system/helix3/core/classes/helix3.php'; -if (file_exists($menu_class)) { +if (file_exists($menu_class)) +{ require_once($menu_class); } -$template = JFactory::getApplication()->getTemplate(); +$template = Factory::getApplication()->getTemplate(); $themepath = JPATH_THEMES . '/' . $template; $rows_file = $themepath . '/html/layouts/helix3/frontend/rows.php'; $lyt_thm_path = $themepath . '/html/layouts/helix3/'; @@ -41,7 +44,7 @@ } -$getLayout = new JLayoutFile('frontend.rows', $layout_path ); +$getLayout = new FileLayout('frontend.rows', $layout_path ); $output .= $getLayout->render($data); diff --git a/plugins/system/helix3/layouts/frontend/modules.php b/plugins/system/helix3/layouts/frontend/modules.php index 261f22c..b5a0d12 100644 --- a/plugins/system/helix3/layouts/frontend/modules.php +++ b/plugins/system/helix3/layouts/frontend/modules.php @@ -5,12 +5,16 @@ * @copyright (c) 2010 - 2021 JoomShaper * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later */ + +use Joomla\CMS\Filter\OutputFilter; + defined('_JEXEC') or die('Restricted Access'); //helper & model $menu_class = JPATH_ROOT . '/plugins/system/helix3/core/classes/helix3.php'; -if (file_exists($menu_class)) { +if (file_exists($menu_class)) +{ require_once($menu_class); } @@ -18,7 +22,7 @@ $output =''; - $output .= '
    '; + $output .= '
    '; $output .= '
    '; diff --git a/plugins/system/helix3/layouts/frontend/rows.php b/plugins/system/helix3/layouts/frontend/rows.php index 5e1d777..bfb75e7 100644 --- a/plugins/system/helix3/layouts/frontend/rows.php +++ b/plugins/system/helix3/layouts/frontend/rows.php @@ -1,20 +1,24 @@ getTemplate(); +$template = Factory::getApplication()->getTemplate(); $themepath = JPATH_THEMES . '/' . $template; $carea_file = $themepath . '/html/layouts/helix3/frontend/conponentarea.php'; $module_file = $themepath . '/html/layouts/helix3/frontend/modules.php'; @@ -79,13 +83,15 @@ $column->className = $column->className . ' ' . $responsive_class; //End Responsive Utilities - if ($column->settings->column_type){ //Component - $getLayout = new JLayoutFile('frontend.conponentarea', $layout_path_carea ); + if ($column->settings->column_type) + { //Component + $getLayout = new FileLayout('frontend.conponentarea', $layout_path_carea ); $output .= $getLayout->render($column); } - else { // Module + else + { // Module - $getLayout = new JLayoutFile('frontend.modules', $layout_path_module ); + $getLayout = new FileLayout('frontend.modules', $layout_path_module ); $output .= $getLayout->render($column); } } diff --git a/plugins/system/helix3/params/menu-child.xml b/plugins/system/helix3/params/menu-child.xml index 1449bd0..472bce6 100644 --- a/plugins/system/helix3/params/menu-child.xml +++ b/plugins/system/helix3/params/menu-child.xml @@ -3,8 +3,8 @@
    - - + + diff --git a/templates/shaper_helix3/css/template.css b/templates/shaper_helix3/css/template.css index 45539c6..3b9892c 100755 --- a/templates/shaper_helix3/css/template.css +++ b/templates/shaper_helix3/css/template.css @@ -142,7 +142,7 @@ textarea.form-control { .sp-megamenu-parent .sp-dropdown li.sp-menu-item span { display: block; padding: 10px; - color: #141414; + color: #333333; cursor: pointer; } .sp-megamenu-parent .sp-dropdown li.sp-menu-item > a.sp-group-title, @@ -1859,7 +1859,7 @@ article.item { } .helix-social-share .helix-social-share-icon ul li div a:hover, .helix-social-share .helix-social-share-icon ul li div a:focus { - background: #1061cc; + background: #3d449a; color: #fff; } .view-article nav.pagenavigation > ul { @@ -2696,7 +2696,7 @@ table.category tbody > tr td { display: none; } .badge.badge-info { - background-color: #1061cc; + background-color: #3d449a; } .btn:not([class*="btn-"]) { color: #fff; From 7ccf48491eadf0f89b75c68efaebcc572ae3239a Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Thu, 13 Oct 2022 15:02:50 +0600 Subject: [PATCH 02/29] fix namespace issue --- plugins/ajax/helix3/classes/image.php | 2 +- plugins/ajax/helix3/helix3.php | 149 ++++++++++++++------------ 2 files changed, 80 insertions(+), 71 deletions(-) diff --git a/plugins/ajax/helix3/classes/image.php b/plugins/ajax/helix3/classes/image.php index f8371df..0facea8 100755 --- a/plugins/ajax/helix3/classes/image.php +++ b/plugins/ajax/helix3/classes/image.php @@ -11,7 +11,7 @@ class Helix3Image { - public static function createThumbs($src, $sizes = array(), $folder, $base_name, $ext) + public static function createThumbs($src, $folder, $base_name, $ext, $sizes = array()) { list($originalWidth, $originalHeight) = getimagesize($src); diff --git a/plugins/ajax/helix3/helix3.php b/plugins/ajax/helix3/helix3.php index d88fddb..7e26651 100755 --- a/plugins/ajax/helix3/helix3.php +++ b/plugins/ajax/helix3/helix3.php @@ -9,20 +9,29 @@ //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -jimport('joomla.plugin.plugin'); -jimport('joomla.filesystem.folder'); -jimport('joomla.filesystem.file'); -jimport('joomla.registry.registry'); -jimport('joomla.image.image'); +use Joomla\CMS\Factory; +use Joomla\CMS\Http\Http; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Menu\SiteMenu; +use Joomla\Registry\Registry; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Session\Session; +use Joomla\CMS\Plugin\CMSPlugin; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Helper\MediaHelper; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Uri\Uri; + require_once __DIR__ . '/classes/image.php'; -class plgAjaxHelix3 extends JPlugin +class plgAjaxHelix3 extends CMSPlugin { function onAjaxHelix3() { - $input = JFactory::getApplication()->input; + $input = Factory::getApplication()->input; $action = $input->post->get('action', '', 'STRING'); if($action=='upload_image') { @@ -58,7 +67,7 @@ function onAjaxHelix3() $report['action'] = 'remove'; $report['status'] = 'true'; } - $report['layout'] = JFolder::files($layoutPath, '.json'); + $report['layout'] = Folder::files($layoutPath, '.json'); break; case 'save': @@ -72,7 +81,7 @@ function onAjaxHelix3() fwrite($file, $content); fclose($file); } - $report['layout'] = JFolder::files($layoutPath, '.json'); + $report['layout'] = Folder::files($layoutPath, '.json'); break; case 'load': @@ -104,7 +113,7 @@ function onAjaxHelix3() case 'voting': - if (JSession::checkToken()) { + if (Session::checkToken()) { return json_encode($report); } @@ -124,7 +133,7 @@ function onAjaxHelix3() { $userIP = $_SERVER['REMOTE_ADDR']; - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select('*') @@ -219,10 +228,10 @@ function onAjaxHelix3() $template_path = JPATH_SITE . '/templates/' . self::getTemplate()->template . '/webfonts/webfonts.json'; $plugin_path = JPATH_PLUGINS . '/system/helix3/assets/webfonts/webfonts.json'; - if(JFile::exists( $template_path )) { - $json = JFile::read( $template_path ); + if(File::exists( $template_path )) { + $json = file_get_contents($template_path); } else { - $json = JFile::read( $plugin_path ); + $json = file_get_contents($plugin_path); } $webfonts = json_decode($json); @@ -256,25 +265,23 @@ function onAjaxHelix3() //Font variant case 'updateFonts': - jimport( 'joomla.filesystem.folder' ); - jimport('joomla.http.http'); - $template_path = JPATH_SITE . '/templates/' . self::getTemplate()->template . '/webfonts'; - if(!JFolder::exists( $template_path )) { - JFolder::create( $template_path, 0755 ); + if (!Folder::exists( $template_path )) + { + Folder::create( $template_path, 0755 ); } - $tplRegistry = new JRegistry(); + $tplRegistry = new Registry(); $tplParams = $tplRegistry->loadString(self::getTemplate()->params); $gfont_api = $tplParams->get('gfont_api', 'AIzaSyBVybAjpiMHzNyEm3ncA_RZ4WETKsLElDg'); $url = 'https://www.googleapis.com/webfonts/v1/webfonts?key='. $gfont_api; - $http = new JHttp(); + $http = new Http(); $str = $http->get($url); if($str->code == 200) { // if successfully updated - if ( JFile::write( $template_path . '/webfonts.json', $str->body )) { + if ( File::write( $template_path . '/webfonts.json', $str->body )) { echo "

    Google Webfonts list successfully updated! Please refresh your browser.

    "; } else { echo "

    Google Webfonts update failed. Please make sure that your template folder is writable.

    "; @@ -303,7 +310,7 @@ function onAjaxHelix3() $settings = $data['settings']; - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); @@ -333,7 +340,7 @@ function onAjaxHelix3() } static public function getItemRating($pk = 0){ - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select('ROUND(rating_sum / rating_count, 0) AS rating, rating_count') ->from($db->quoteName('#__content_rating')) @@ -358,7 +365,7 @@ static public function resetMenuLayout($current_menu_id = 0){ $item = $items[$current_menu_id]; } - $menuItems = new JMenuSite; + $menuItems = new SiteMenu(); $no_child = true; $count = 0; @@ -460,7 +467,7 @@ static public function resetMenuLayout($current_menu_id = 0){ static public function create_menu($current_menu_id) { $items = self::menuItems(); - $menus = new JMenuSite; + $menus = new SiteMenu(); if (isset($items[$current_menu_id])) { @@ -476,7 +483,7 @@ static public function create_menu($current_menu_id) static public function menuItems() { - $menus = new JMenuSite; + $menus = new SiteMenu(); $menus = $menus->getMenu(); $new = array(); foreach ($menus as $item) { @@ -487,7 +494,7 @@ static public function menuItems() static public function loadNewLayout($layout_data = null){ - $lang = JFactory::getLanguage(); + $lang = Factory::getLanguage(); $lang->load('tpl_' . self::getTemplate()->template, JPATH_SITE, $lang->getName(), true); ob_start(); @@ -512,7 +519,7 @@ static public function loadNewLayout($layout_data = null){ if ($layout_data) { foreach ($layout_data as $row) { $rowSettings = self::getSettings($row->settings); - $name = JText::_('HELIX_SECTION_TITLE'); + $name = Text::_('HELIX_SECTION_TITLE'); if (isset($row->settings->name)) { $name = $row->settings->name; @@ -527,7 +534,7 @@ static public function loadNewLayout($layout_data = null){
    @@ -585,24 +592,26 @@ static public function loadNewLayout($layout_data = null){ } - static public function getSettings($config = null) + static public function getSettings($config = null) { $data = ''; + if (count((array) $config)) - { + { foreach ($config as $key => $value) - { + { $data .= ' data-'.$key.'="'.$value.'"'; } } + return $data; } //Get template name - private static function getTemplate() + private static function getTemplate() { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select($db->quoteName(array('template', 'params'))); $query->from($db->quoteName('#__template_styles')); @@ -614,40 +623,40 @@ private static function getTemplate() } // Upload File - private function upload_image() + private function upload_image() { - $input = JFactory::getApplication()->input; + $input = Factory::getApplication()->input; $image = $input->files->get('image'); $imageonly = $input->post->get('imageonly', false, 'BOOLEAN'); - $tplRegistry = new JRegistry(); + $tplRegistry = new Registry(); $tplParams = $tplRegistry->loadString(self::getTemplate()->params); $report = array(); // User is not authorised - if (!JFactory::getUser()->authorise('core.create', 'com_media')) + if (!Factory::getUser()->authorise('core.create', 'com_media')) { $report['status'] = false; - $report['output'] = JText::_('You are not authorised to upload file.'); + $report['output'] = Text::_('You are not authorised to upload file.'); echo json_encode($report); die; } if(count($image)) - { + { if ($image['error'] == UPLOAD_ERR_OK) { $error = false; - $params = JComponentHelper::getParams('com_media'); + $params = ComponentHelper::getParams('com_media'); // Total length of post back data in bytes. $contentLength = (int) $_SERVER['CONTENT_LENGTH']; // Instantiate the media helper - $mediaHelper = new JHelperMedia; + $mediaHelper = new MediaHelper; // Maximum allowed size of post back data in MB. $postMaxSize = $mediaHelper->toBytes(ini_get('post_max_size')); @@ -658,7 +667,7 @@ private function upload_image() // Check for the total size of post back data. if (($postMaxSize > 0 && $contentLength > $postMaxSize) || ($memoryLimit != -1 && $contentLength > $memoryLimit)) { $report['status'] = false; - $report['output'] = JText::_('Total size of upload exceeds the limit.'); + $report['output'] = Text::_('Total size of upload exceeds the limit.'); $error = true; echo json_encode($report); die; @@ -670,18 +679,18 @@ private function upload_image() if (($image['error'] == 1) || ($uploadMaxSize > 0 && $image['size'] > $uploadMaxSize) || ($uploadMaxFileSize > 0 && $image['size'] > $uploadMaxFileSize)) { $report['status'] = false; - $report['output'] = JText::_('This file is too large to upload.'); + $report['output'] = Text::_('This file is too large to upload.'); $error = true; } // Upload if no error found if(!$error) { // Organised folder structure - $date = JFactory::getDate(); - $folder = JHtml::_('date', $date, 'Y') . '/' . JHtml::_('date', $date, 'm') . '/' . JHtml::_('date', $date, 'd'); + $date = Factory::getDate(); + $folder = HTMLHelper::_('date', $date, 'Y') . '/' . HTMLHelper::_('date', $date, 'm') . '/' . HTMLHelper::_('date', $date, 'd'); if(!file_exists( JPATH_ROOT . '/images/' . $folder )) { - JFolder::create(JPATH_ROOT . '/images/' . $folder, 0755); + Folder::create(JPATH_ROOT . '/images/' . $folder, 0755); } $name = $image['name']; @@ -701,7 +710,7 @@ private function upload_image() } while(file_exists($dest)); // End Do not override - if(JFile::upload($path, $dest)) { + if(File::upload($path, $dest)) { $sizes = array(); @@ -721,7 +730,7 @@ private function upload_image() $sizes['large'] = explode('x', strtolower($tplParams->get('image_large_size', '600X600'))); } - $sources = Helix3Image::createThumbs($dest, $sizes, $folder, $base_name, $ext); + $sources = Helix3Image::createThumbs($dest, $folder, $base_name, $ext, $sizes); if(file_exists(JPATH_ROOT . '/images/' . $folder . '/' . $base_name . '_thumbnail.' . $ext)) { $src = 'images/' . $folder . '/' . $base_name . '_thumbnail.' . $ext; @@ -730,16 +739,16 @@ private function upload_image() $report['status'] = true; if($imageonly) { - $report['output'] = ''; + $report['output'] = ''; } else { - $report['output'] = '
  • Delete
    • '; + $report['output'] = '
  • Delete
    • '; } } } } } else { $report['status'] = false; - $report['output'] = JText::_('Upload Failed!'); + $report['output'] = Text::_('Upload Failed!'); } echo json_encode($report); @@ -748,53 +757,53 @@ private function upload_image() } // Delete File - private function remove_image() + private function remove_image() { $report = array(); - if (!JFactory::getUser()->authorise('core.delete', 'com_media')) + if (!Factory::getUser()->authorise('core.delete', 'com_media')) { $report['status'] = false; - $report['output'] = JText::_('You are not authorised to delete file.'); + $report['output'] = Text::_('You are not authorised to delete file.'); echo json_encode($report); die; } - $input = JFactory::getApplication()->input; + $input = Factory::getApplication()->input; $src = $input->post->get('src', '', 'STRING'); $path = JPATH_ROOT . '/' . $src; if(file_exists($path)) { - if(JFile::delete($path)) { + if(File::delete($path)) { $basename = basename($src); - $small = JPATH_ROOT . '/' . dirname($src) . '/' . JFile::stripExt($basename) . '_small.' . JFile::getExt($basename); - $thumbnail = JPATH_ROOT . '/' . dirname($src) . '/' . JFile::stripExt($basename) . '_thumbnail.' . JFile::getExt($basename); - $medium = JPATH_ROOT . '/' . dirname($src) . '/' . JFile::stripExt($basename) . '_medium.' . JFile::getExt($basename); - $large = JPATH_ROOT . '/' . dirname($src) . '/' . JFile::stripExt($basename) . '_large.' . JFile::getExt($basename); + $small = JPATH_ROOT . '/' . dirname($src) . '/' . File::stripExt($basename) . '_small.' . File::getExt($basename); + $thumbnail = JPATH_ROOT . '/' . dirname($src) . '/' . File::stripExt($basename) . '_thumbnail.' . File::getExt($basename); + $medium = JPATH_ROOT . '/' . dirname($src) . '/' . File::stripExt($basename) . '_medium.' . File::getExt($basename); + $large = JPATH_ROOT . '/' . dirname($src) . '/' . File::stripExt($basename) . '_large.' . File::getExt($basename); if(file_exists($small)) { - JFile::delete($small); + File::delete($small); } if(file_exists($thumbnail)) { - JFile::delete($thumbnail); + File::delete($thumbnail); } if(file_exists($medium)) { - JFile::delete($medium); + File::delete($medium); } if(file_exists($large)) { - JFile::delete($large); + File::delete($large); } $report['status'] = true; } else { $report['status'] = false; - $report['output'] = JText::_('Delete failed'); + $report['output'] = Text::_('Delete failed'); } } else { $report['status'] = true; From e77c264d6206fae4ded02f6b1f640e58425f4fa5 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Fri, 14 Oct 2022 13:12:48 +0600 Subject: [PATCH 03/29] update namespace --- templates/shaper_helix3/comingsoon.php | 23 +- templates/shaper_helix3/component.php | 10 +- templates/shaper_helix3/error.php | 21 +- templates/shaper_helix3/features/logo.php | 18 +- templates/shaper_helix3/features/menu.php | 8 +- .../shaper_helix3/features/preloader.php | 9 +- templates/shaper_helix3/features/title.php | 7 +- .../mod_articles_categories/default_items.php | 12 +- .../html/mod_articles_latest/default.php | 5 +- .../html/mod_breadcrumbs/default.php | 4 +- .../shaper_helix3/html/mod_login/default.php | 51 ++-- .../html/mod_login/default_logout.php | 17 +- .../shaper_helix3/html/mod_menu/default.php | 6 +- .../html/mod_menu/default_heading.php | 4 +- .../html/mod_menu/default_separator.php | 4 +- .../html/mod_menu/default_url.php | 4 +- .../shaper_helix3/html/mod_search/default.php | 4 +- .../html/mod_tags_popular/cloud.php | 9 +- .../html/mod_tags_popular/default.php | 7 +- .../html/mod_tags_similar/default.php | 10 +- templates/shaper_helix3/html/pagination.php | 10 +- templates/shaper_helix3/index.php | 21 +- templates/shaper_helix3/offline.php | 32 +-- .../addons/call_to_action/admin.php | 143 ++++++------ .../addons/image_content/admin.php | 221 +++++++++--------- .../addons/image_content/site.php | 20 +- .../addons/testimonialpro/admin.php | 83 +++---- .../addons/testimonialpro/site.php | 16 +- 28 files changed, 443 insertions(+), 336 deletions(-) diff --git a/templates/shaper_helix3/comingsoon.php b/templates/shaper_helix3/comingsoon.php index be02fe7..0ca01b8 100755 --- a/templates/shaper_helix3/comingsoon.php +++ b/templates/shaper_helix3/comingsoon.php @@ -7,8 +7,15 @@ */ defined('_JEXEC') or die; -$doc = JFactory::getDocument(); -$app = JFactory::getApplication(); + +use Joomla\CMS\Factory; +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Image\Image; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; + +$doc = Factory::getDocument(); +$app = Factory::getApplication(); //Load Helix $helix3_path = JPATH_PLUGINS.'/system/helix3/core/helix3.php'; @@ -28,7 +35,7 @@ //Comingsoon Logo if ($logo_image = $this->params->get('comingsoon_logo')) { - $logo = JURI::root() . '/' . $logo_image; + $logo = Uri::root() . '/' . $logo_image; $path = JPATH_ROOT . '/' . $logo_image; } else @@ -39,7 +46,7 @@ if (file_exists($path)) { - $image = new JImage( $path ); + $image = new Image( $path ); $logo_width = $image->getWidth(); $logo_height = $image->getHeight(); } @@ -58,7 +65,7 @@ $comingsoon_date = explode('-', $this->params->get("comingsoon_date")); //Load jQuery -JHtml::_('jquery.framework'); +HTMLHelper::_('jquery.framework'); ?> @@ -68,7 +75,7 @@ helix3->getParam('favicon')) { - $doc->addFavicon( JURI::base(true) . '/' . $favicon); + $doc->addFavicon( Uri::base(true) . '/' . $favicon); } else { @@ -108,7 +115,7 @@ $hascs_bg = ''; if ($cs_bg = $this->params->get('comingsoon_bg')) { - $comingsoon_bg = JURI::root() . $cs_bg; + $comingsoon_bg = Uri::root() . $cs_bg; $hascs_bg = 'has-background'; } ?> @@ -211,7 +218,7 @@ diff --git a/templates/shaper_helix3/component.php b/templates/shaper_helix3/component.php index f342e12..c561459 100755 --- a/templates/shaper_helix3/component.php +++ b/templates/shaper_helix3/component.php @@ -7,6 +7,10 @@ */ //no direct accees defined ('_JEXEC') or die ('resticted aceess'); + +use Joomla\CMS\Factory; +use Joomla\CMS\Uri\Uri; + //Load Helix $helix3_path = JPATH_PLUGINS . '/system/helix3/core/helix3.php'; @@ -20,7 +24,7 @@ die('Please install and activate helix plugin'); } -$app = JFactory::getApplication(); +$app = Factory::getApplication(); $input = $app->input; $option = str_replace('_', '-', $input->get('option', '', 'STRING')); @@ -33,10 +37,10 @@ params->get('favicon')) { - $doc->addFavicon( JURI::base(true) . '/' . $favicon); + $doc->addFavicon( Uri::base(true) . '/' . $favicon); } else { diff --git a/templates/shaper_helix3/error.php b/templates/shaper_helix3/error.php index ef63204..d7c834d 100755 --- a/templates/shaper_helix3/error.php +++ b/templates/shaper_helix3/error.php @@ -9,12 +9,17 @@ //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -$doc = JFactory::getDocument(); -$params = JFactory::getApplication()->getTemplate('true')->params; +use Joomla\CMS\Document\Renderer\Html\HeadRenderer; +use Joomla\CMS\Factory; +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Language\Text; + +$doc = Factory::getDocument(); +$params = Factory::getApplication()->getTemplate('true')->params; //Error Logo if ($logo_image = $params->get('error_logo')) { - $logo = JURI::root() . '/' . $logo_image; + $logo = Uri::root() . '/' . $logo_image; $path = JPATH_ROOT . '/' . $logo_image; } else { $logo = $this->baseurl . '/templates/' . $this->template . '/images/presets/preset1/logo.png'; @@ -23,7 +28,7 @@ //Favicon if($favicon = $params->get('favicon')) { - $doc->addFavicon( JURI::base(true) . '/' . $favicon); + $doc->addFavicon( Uri::base(true) . '/' . $favicon); } else { $doc->addFavicon( $this->baseurl . '/templates/' . $this->template . '/images/favicon.ico' ); } @@ -46,14 +51,14 @@ require_once($head); } } -$header_renderer = new JDocumentRendererHead($doc); +$header_renderer = new HeadRenderer($doc); $header_contents = $header_renderer->render(null); //background image $error_bg = ''; $hascs_bg = ''; if ($err_bg = $params->get('error_bg')) { - $error_bg = JURI::root() . $err_bg; + $error_bg = Uri::root() . $err_bg; $hascs_bg = 'has-background'; } @@ -89,7 +94,7 @@ setError($this->_error->getPrevious()); ?> -

    +

    _error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>

    renderBacktrace(); ?> setError($this->_error->getPrevious()); ?> @@ -100,7 +105,7 @@
    - + getBuffer('modules', '404', array('style' => 'sp_xhtml')); ?>
    diff --git a/templates/shaper_helix3/features/logo.php b/templates/shaper_helix3/features/logo.php index 98d0bc4..a7fd232 100755 --- a/templates/shaper_helix3/features/logo.php +++ b/templates/shaper_helix3/features/logo.php @@ -8,6 +8,10 @@ //no direct accees defined ('_JEXEC') or die('resticted aceess'); +use Joomla\CMS\Factory; +use Joomla\CMS\Image\Image; +use Joomla\CMS\Uri\Uri; + class Helix3FeatureLogo { private $helix3; @@ -24,8 +28,6 @@ public function renderFeature() //Retina Image if( $this->helix3->getParam('logo_type') == 'image' ) { - jimport('joomla.image.image'); - if( $this->helix3->getParam('logo_image') ) { $path = JPATH_ROOT . '/' . $this->helix3->getParam('logo_image'); } else { @@ -33,7 +35,7 @@ public function renderFeature() } if(file_exists($path)) { - $image = new JImage( $path ); + $image = new Image( $path ); $width = $image->getWidth(); $height = $image->getHeight(); } else { @@ -45,7 +47,7 @@ public function renderFeature() $html = ''; $custom_logo_class = ''; - $sitename = JFactory::getApplication()->get('sitename'); + $sitename = Factory::getApplication()->get('sitename'); if( $this->helix3->getParam('mobile_logo') ) { $custom_logo_class = ' d-none d-lg-block'; @@ -54,7 +56,7 @@ public function renderFeature() if( $this->helix3->getParam('logo_type') == 'image' ) { if( $this->helix3->getParam('logo_image') ) { $html .= ''; } else { $html .= ' diff --git a/templates/shaper_helix3/html/mod_breadcrumbs/default.php b/templates/shaper_helix3/html/mod_breadcrumbs/default.php index c12dd1e..895e757 100755 --- a/templates/shaper_helix3/html/mod_breadcrumbs/default.php +++ b/templates/shaper_helix3/html/mod_breadcrumbs/default.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Language\Text; + defined('_JEXEC') or die; ?> @@ -13,7 +15,7 @@ get('showHere', 1)) { - echo '' . JText::_('MOD_BREADCRUMBS_HERE') . ' '; + echo '' . Text::_('MOD_BREADCRUMBS_HERE') . ' '; } else { diff --git a/templates/shaper_helix3/html/mod_login/default.php b/templates/shaper_helix3/html/mod_login/default.php index 085ceef..1c2c659 100755 --- a/templates/shaper_helix3/html/mod_login/default.php +++ b/templates/shaper_helix3/html/mod_login/default.php @@ -6,17 +6,24 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Component\ComponentHelper; + defined('_JEXEC') or die; require_once JPATH_SITE . '/components/com_users/helpers/route.php'; -JHtml::_('behavior.keepalive'); -JHtml::_('bootstrap.tooltip'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('bootstrap.tooltip'); -$usersConfig = JComponentHelper::getParams('com_users'); +$usersConfig = ComponentHelper::getParams('com_users'); ?> -
    + get('pretext')) : ?>

    get('pretext'); ?>

    @@ -27,12 +34,12 @@ get('usetext')) : ?>
    - + - +
    - +
    @@ -41,12 +48,12 @@ get('usetext')) : ?>
    - + - +
    - +
    @@ -55,47 +62,47 @@
    get('usetext')) : ?>
    - + - +
    - +
    - +
    - +
    - + get('allowUserRegistration')) : ?> - +
    - + get('posttext')) : ?>
    diff --git a/templates/shaper_helix3/html/mod_login/default_logout.php b/templates/shaper_helix3/html/mod_login/default_logout.php index 598b7e8..87c144d 100755 --- a/templates/shaper_helix3/html/mod_login/default_logout.php +++ b/templates/shaper_helix3/html/mod_login/default_logout.php @@ -6,25 +6,30 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); +HTMLHelper::_('behavior.keepalive'); ?> - + get('greeting')) : ?>
    - + - +
    diff --git a/templates/shaper_helix3/html/mod_menu/default.php b/templates/shaper_helix3/html/mod_menu/default.php index 69ac490..beb164e 100755 --- a/templates/shaper_helix3/html/mod_menu/default.php +++ b/templates/shaper_helix3/html/mod_menu/default.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Helper\ModuleHelper; + defined('_JEXEC') or die; if($module->position == 'offcanvas') { @@ -85,11 +87,11 @@ case 'url': case 'component': case 'heading': - require JModuleHelper::getLayoutPath('mod_menu', 'default_' . $item->type); + require ModuleHelper::getLayoutPath('mod_menu', 'default_' . $item->type); break; default: - require JModuleHelper::getLayoutPath('mod_menu', 'default_url'); + require ModuleHelper::getLayoutPath('mod_menu', 'default_url'); break; endswitch; diff --git a/templates/shaper_helix3/html/mod_menu/default_heading.php b/templates/shaper_helix3/html/mod_menu/default_heading.php index a650e0d..8c02641 100755 --- a/templates/shaper_helix3/html/mod_menu/default_heading.php +++ b/templates/shaper_helix3/html/mod_menu/default_heading.php @@ -8,6 +8,8 @@ defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; + $title = $item->anchor_title ? ' title="' . $item->anchor_title . '"' : ''; $anchor_css = $item->anchor_css ? $item->anchor_css : ''; @@ -15,7 +17,7 @@ if ($item->menu_image) { - $linktype = JHtml::_('image', $item->menu_image, $item->title); + $linktype = HTMLHelper::_('image', $item->menu_image, $item->title); if ($item->getParams()->get('menu_text', 1)) { diff --git a/templates/shaper_helix3/html/mod_menu/default_separator.php b/templates/shaper_helix3/html/mod_menu/default_separator.php index 53a87d5..515c3d8 100755 --- a/templates/shaper_helix3/html/mod_menu/default_separator.php +++ b/templates/shaper_helix3/html/mod_menu/default_separator.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; $title = $item->anchor_title ? ' title="' . $item->anchor_title . '"' : ''; @@ -15,7 +17,7 @@ if ($item->menu_image) { - $linktype = JHtml::_('image', $item->menu_image, $item->title); + $linktype = HTMLHelper::_('image', $item->menu_image, $item->title); if ($item->getParams()->get('menu_text', 1)) { diff --git a/templates/shaper_helix3/html/mod_menu/default_url.php b/templates/shaper_helix3/html/mod_menu/default_url.php index 63d9a14..8999531 100755 --- a/templates/shaper_helix3/html/mod_menu/default_url.php +++ b/templates/shaper_helix3/html/mod_menu/default_url.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Filter\OutputFilter; + defined('_JEXEC') or die; // Note. It is important to remove spaces between elements. @@ -29,7 +31,7 @@ } $flink = $item->flink; -$flink = JFilterOutput::ampReplace(htmlspecialchars($flink)); +$flink = OutputFilter::ampReplace(htmlspecialchars($flink)); switch ($item->browserNav) : default: diff --git a/templates/shaper_helix3/html/mod_search/default.php b/templates/shaper_helix3/html/mod_search/default.php index 455a905..f7aef57 100755 --- a/templates/shaper_helix3/html/mod_search/default.php +++ b/templates/shaper_helix3/html/mod_search/default.php @@ -7,9 +7,11 @@ */ defined('_JEXEC') or die; + +use Joomla\CMS\Router\Route; ?>
    -
    + diff --git a/templates/shaper_helix3/html/mod_tags_popular/cloud.php b/templates/shaper_helix3/html/mod_tags_popular/cloud.php index 077f56b..2de6062 100755 --- a/templates/shaper_helix3/html/mod_tags_popular/cloud.php +++ b/templates/shaper_helix3/html/mod_tags_popular/cloud.php @@ -8,15 +8,18 @@ defined('_JEXEC') or die; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; + JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php'); ?>
    -
    +
    - + title); ?> count; ?> @@ -24,4 +27,6 @@ + +
    diff --git a/templates/shaper_helix3/html/mod_tags_popular/default.php b/templates/shaper_helix3/html/mod_tags_popular/default.php index f14e14a..47d667f 100755 --- a/templates/shaper_helix3/html/mod_tags_popular/default.php +++ b/templates/shaper_helix3/html/mod_tags_popular/default.php @@ -8,16 +8,19 @@ defined('_JEXEC') or die; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; + ?>
    -
    +
    diff --git a/templates/shaper_helix3/html/pagination.php b/templates/shaper_helix3/html/pagination.php index 4c019d8..157c0ed 100644 --- a/templates/shaper_helix3/html/pagination.php +++ b/templates/shaper_helix3/html/pagination.php @@ -1,4 +1,6 @@ text == JText::_('Next')) { $item->text = '»'; $cls = "next";} - if ($item->text == JText::_('Prev')) { $item->text = '«'; $cls = "previous";} + if ($item->text == Text::_('Next')) { $item->text = '»'; $cls = "next";} + if ($item->text == Text::_('Prev')) { $item->text = '«'; $cls = "previous";} - if ($item->text == JText::_('First')) { $cls = "first";} - if ($item->text == JText::_('Last')) { $cls = "last";} + if ($item->text == Text::_('First')) { $cls = "first";} + if ($item->text == Text::_('Last')) { $cls = "last";} return '
  • ' . $item->text . '
    • '; } diff --git a/templates/shaper_helix3/index.php b/templates/shaper_helix3/index.php index 714e9b2..5f774a5 100644 --- a/templates/shaper_helix3/index.php +++ b/templates/shaper_helix3/index.php @@ -9,8 +9,13 @@ //no direct accees defined('_JEXEC') or die('restricted access'); -$doc = JFactory::getDocument(); -$app = JFactory::getApplication(); +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; + +$doc = Factory::getDocument(); +$app = Factory::getApplication(); $menu = $app->getMenu()->getActive(); //Load Helix @@ -29,7 +34,7 @@ //Coming Soon if ($this->helix3->getParam('comingsoon_mode')) { - header("Location: " . JRoute::_(JUri::root(true) . "/index.php?tmpl=comingsoon", false)); + header("Location: " . Route::_(Uri::root(true) . "/index.php?tmpl=comingsoon", false)); exit(); } @@ -55,7 +60,7 @@ //Body Background Image if ($bg_image = $this->helix3->getParam('body_bg_image')) { - $body_style = 'background-image: url(' . JURI::base(true) . '/' . $bg_image . ');'; + $body_style = 'background-image: url(' . Uri::base(true) . '/' . $bg_image . ');'; $body_style .= 'background-repeat: ' . $this->helix3->getParam('body_bg_repeat') . ';'; $body_style .= 'background-size: ' . $this->helix3->getParam('body_bg_size') . ';'; $body_style .= 'background-attachment: ' . $this->helix3->getParam('body_bg_attachment') . ';'; @@ -137,13 +142,13 @@
    - +
    helix3->countModules('offcanvas')) : ?> - +

    - +

    @@ -174,7 +179,7 @@ params->get('goto_top')) : ?> - + \ No newline at end of file diff --git a/templates/shaper_helix3/offline.php b/templates/shaper_helix3/offline.php index 3fd8682..5d9ac63 100755 --- a/templates/shaper_helix3/offline.php +++ b/templates/shaper_helix3/offline.php @@ -9,8 +9,14 @@ //no direct accees defined ('_JEXEC') or die ('resticted aceess'); -$doc = JFactory::getDocument(); -$app = JFactory::getApplication(); +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + +$doc = Factory::getDocument(); +$app = Factory::getApplication(); require_once JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php'; @@ -23,14 +29,14 @@ params->get('favicon')) { - $doc->addFavicon( JURI::base(true) . '/' . $favicon); + $doc->addFavicon( Uri::base(true) . '/' . $favicon); } else { $doc->addFavicon( $this->baseurl . '/templates/'. $this->template .'/images/favicon.ico' ); } ?> - +
    @@ -50,32 +56,32 @@

    get('offline_message'); ?>

    - get('display_offline_message', 1) == 2 && str_replace(' ', '', JText::_('JOFFLINE_MESSAGE')) != '') : ?> + get('display_offline_message', 1) == 2 && str_replace(' ', '', Text::_('JOFFLINE_MESSAGE')) != '') : ?>

    - +

    - +
    - +
    - +
    1) : ?>
    - +
    - +
    - - + +
    diff --git a/templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php b/templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php index 5d5cf7b..0dd1376 100755 --- a/templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php +++ b/templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php @@ -1,142 +1,155 @@ 'content', 'addon_name'=>'sp_call_to_action', 'category'=>'Helix 3', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_DESC'), 'attr'=>array( 'title'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_TITLE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_TITLE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_TITLE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_TITLE_DESC'), 'std'=>'Call to action title', ), 'heading_selector'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_DESC'), 'values'=>array( - 'h1'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H1'), - 'h2'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H2'), - 'h3'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H3'), - 'h4'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H4'), - 'h5'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H5'), - 'h6'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H6'), + 'h1'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H1'), + 'h2'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H2'), + 'h3'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H3'), + 'h4'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H4'), + 'h5'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H5'), + 'h6'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H6'), ), 'std'=>'h3', ), 'title_fontsize'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE_DESC'), 'std'=>'' ), 'title_text_color'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR_DESC'), ), 'title_margin_top'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP_DESC'), 'placeholder'=>'10', ), 'title_margin_bottom'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM_DESC'), 'placeholder'=>'10', ), 'subtitle'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_SUBTITLE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_SUBTITLE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_SUBTITLE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_SUBTITLE_DESC'), 'std'=>'Call to action sub title', ), 'subtitle_fontsize'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_FONT_SIZE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_FONT_SIZE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_FONT_SIZE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_FONT_SIZE_DESC'), 'std'=>'' ), 'subtitle_text_color'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_TEXT_COLOR'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_TEXT_COLOR_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_TEXT_COLOR'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_TEXT_COLOR_DESC'), ), 'text'=>array( 'type'=>'editor', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_CONTENT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_CONTENT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_CONTENT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_CONTENT_DESC'), ), 'background'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BACKGROUND'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BACKGROUND_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BACKGROUND'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BACKGROUND_DESC'), ), 'color'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_COLOR'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_COLOR_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_COLOR'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_COLOR_DESC'), ), 'padding'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_PADDING'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_PADDING_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_PADDING'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_PADDING_DESC'), 'placeholder'=>'20', ), //Button 'button_text'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TEXT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TEXT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TEXT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TEXT_DESC'), 'std'=>'Button Text', ), 'button_url'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_URL'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_URL_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_URL'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_URL_DESC'), 'std'=>'http://' ), 'button_size'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_DESC'), 'values'=>array( - ''=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_DEFAULT'), - 'lg'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_LARGE'), - 'sm'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_SMALL'), - 'xs'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_EXTRA_SAMLL'), + ''=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_DEFAULT'), + 'lg'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_LARGE'), + 'sm'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_SMALL'), + 'xs'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_EXTRA_SAMLL'), ), ), 'button_type'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TYPE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TYPE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TYPE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TYPE_DESC'), 'values'=>array( - 'default'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_DEFAULT'), - 'primary'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_PRIMARY'), - 'success'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_SUCCESS'), - 'info'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_INFO'), - 'warning'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_WARNING'), - 'danger'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_DANGER'), - 'link'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_LINK'), + 'default'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DEFAULT'), + 'primary'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_PRIMARY'), + 'success'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_SUCCESS'), + 'info'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_INFO'), + 'warning'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_WARNING'), + 'danger'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DANGER'), + 'link'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK'), ), 'std'=>'default', ), 'button_icon'=>array( 'type'=>'icon', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_ICON'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_BUTTON_ICON_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_ICON'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_ICON_DESC'), ), 'button_block'=>array( 'type'=>'select', @@ -149,26 +162,26 @@ ), 'button_target'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_DESC'), 'values'=>array( - ''=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_SAME_WINDOW'), - '_blank'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_NEW_WINDOW'), + ''=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_SAME_WINDOW'), + '_blank'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_NEW_WINDOW'), ), ), 'button_position'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_BUTTON_POSITION'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CTA_BUTTON_POSITION_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_BUTTON_POSITION'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_BUTTON_POSITION_DESC'), 'values'=>array( - 'right'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_RIGHT'), - 'bottom'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BOTTOM'), + 'right'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_RIGHT'), + 'bottom'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BOTTOM'), ), ), 'class'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CLASS'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), 'std'=> '' ), ) diff --git a/templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php b/templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php index 3b6ae10..927c53e 100755 --- a/templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php +++ b/templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php @@ -2,71 +2,74 @@ /** * @package SP Page Builder * @author JoomShaper https://www.joomshaper.com -* @copyright (c) 2010 - 2021 JoomShaper +* @copyright (c) 2010 - 2022 JoomShaper * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -//no direct accees -defined ('_JEXEC') or die ('restricted aceess'); + +//No direct access +defined ('_JEXEC') or die ('restricted access'); + +use Joomla\CMS\Language\Text; SpAddonsConfig::addonConfig( array( 'type'=>'content', 'addon_name'=>'sp_image_content', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_DESC'), 'attr'=>array( 'general' => array( 'admin_label'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL_DESC'), 'std'=> '' ), 'separator1'=>array( 'type'=>'separator', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE') + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE') ), 'image'=>array( 'type'=>'media', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE'), ), 'image_alignment'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE_ALIGNMENT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE_ALIGNMENT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE_ALIGNMENT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE_ALIGNMENT_DESC'), 'values'=>array( - 'left'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_LEFT'), - 'right'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_RIGHT'), + 'left'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LEFT'), + 'right'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_RIGHT'), ), 'std'=>'left', ), 'separator2'=>array( 'type'=>'separator', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT') + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT') ), 'title'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_TITLE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_TITLE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_TITLE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_TITLE_DESC'), ), 'heading_selector'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_DESC'), 'values'=>array( - 'h1'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H1'), - 'h2'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H2'), - 'h3'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H3'), - 'h4'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H4'), - 'h5'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H5'), - 'h6'=>JText::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H6'), + 'h1'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H1'), + 'h2'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H2'), + 'h3'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H3'), + 'h4'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H4'), + 'h5'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H5'), + 'h6'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H6'), ), 'std'=>'h3', 'depends'=>array(array('title', '!=', '')), @@ -74,30 +77,30 @@ 'title_fontsize'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE_DESC'), 'std'=>'', 'depends'=>array(array('title', '!=', '')), ), 'title_lineheight'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_LINE_HEIGHT'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_LINE_HEIGHT'), 'std'=>'', 'depends'=>array(array('title', '!=', '')), ), 'title_fontstyle'=>array( 'type'=>'select', - 'title'=> JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_STYLE'), + 'title'=> Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_STYLE'), 'values'=>array( - 'underline'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UNDERLINE'), - 'uppercase'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UPPERCASE'), - 'italic'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_ITALIC'), - 'lighter'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_LIGHTER'), - 'normal'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_NORMAL'), - 'bold'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLD'), - 'bolder'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLDER'), + 'underline'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UNDERLINE'), + 'uppercase'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UPPERCASE'), + 'italic'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_ITALIC'), + 'lighter'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_LIGHTER'), + 'normal'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_NORMAL'), + 'bold'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLD'), + 'bolder'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLDER'), ), 'multiple'=>true, 'std'=>'', @@ -106,7 +109,7 @@ 'title_letterspace'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_LETTER_SPACING'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LETTER_SPACING'), 'values'=>array( '0'=> 'Default', '1px'=> '1px', @@ -126,60 +129,60 @@ 'title_fontweight'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_WEIGHT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_WEIGHT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_WEIGHT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_WEIGHT_DESC'), 'std'=>'', 'depends'=>array(array('title', '!=', '')), ), 'title_text_color'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR_DESC'), 'depends'=>array(array('title', '!=', '')), ), 'title_margin_top'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP_DESC'), 'placeholder'=>'10', 'depends'=>array(array('title', '!=', '')), ), 'title_margin_bottom'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM_DESC'), 'placeholder'=>'10', 'depends'=>array(array('title', '!=', '')), ), 'text'=>array( 'type'=>'editor', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT_DESC'), ), //Button 'button_text'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_TEXT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_TEXT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_TEXT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_TEXT_DESC'), 'std'=>'Button Text', ), 'button_fontstyle'=>array( 'type'=>'select', - 'title'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_FONT_STYLE'), + 'title'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_FONT_STYLE'), 'values'=>array( - 'underline'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UNDERLINE'), - 'uppercase'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UPPERCASE'), - 'italic'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_ITALIC'), - 'lighter'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_LIGHTER'), - 'normal'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_NORMAL'), - 'bold'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLD'), - 'bolder'=> JText::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLDER'), + 'underline'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UNDERLINE'), + 'uppercase'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UPPERCASE'), + 'italic'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_ITALIC'), + 'lighter'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_LIGHTER'), + 'normal'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_NORMAL'), + 'bold'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLD'), + 'bolder'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLDER'), ), 'multiple'=>true, 'std'=>'', @@ -190,7 +193,7 @@ 'button_letterspace'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_LETTER_SPACING'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_LETTER_SPACING'), 'values'=>array( '0'=> 'Default', '1px'=> '1px', @@ -213,8 +216,8 @@ 'button_url'=>array( 'type'=>'media', 'format'=>'attachment', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_URL'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_URL_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_URL'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_URL_DESC'), 'placeholder'=>'http://', 'depends'=> array( array('button_text', '!=', ''), @@ -223,11 +226,11 @@ 'button_target'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_LINK_NEWTAB'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_LINK_NEWTAB_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK_NEWTAB'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK_NEWTAB_DESC'), 'values'=>array( - ''=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_SAME_WINDOW'), - '_blank'=>JText::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_NEW_WINDOW'), + ''=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_SAME_WINDOW'), + '_blank'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_NEW_WINDOW'), ), 'depends'=> array( array('button_text', '!=', ''), @@ -236,17 +239,17 @@ 'button_type'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_STYLE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_STYLE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_STYLE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_STYLE_DESC'), 'values'=>array( - 'default'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_DEFAULT'), - 'primary'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_PRIMARY'), - 'success'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_SUCCESS'), - 'info'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_INFO'), - 'warning'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_WARNING'), - 'danger'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_DANGER'), - 'link'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_LINK'), - 'custom'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_CUSTOM'), + 'default'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DEFAULT'), + 'primary'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_PRIMARY'), + 'success'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_SUCCESS'), + 'info'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_INFO'), + 'warning'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_WARNING'), + 'danger'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DANGER'), + 'link'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK'), + 'custom'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_CUSTOM'), ), 'std'=>'default', 'depends'=> array( @@ -256,12 +259,12 @@ 'button_appearance'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_DESC'), 'values'=>array( - ''=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_FLAT'), - 'outline'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_OUTLINE'), - '3d'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_3D'), + ''=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_FLAT'), + 'outline'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_OUTLINE'), + '3d'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_3D'), ), 'std'=>'flat', 'depends'=> array( @@ -271,8 +274,8 @@ 'button_background_color'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_DESC'), 'std' => '#444444', 'depends'=> array( array('button_type', '=', 'custom'), @@ -282,8 +285,8 @@ 'button_color'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_DESC'), 'std' => '#fff', 'depends'=> array( array('button_type', '=', 'custom'), @@ -293,8 +296,8 @@ 'button_background_color_hover'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_HOVER'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_HOVER_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_HOVER'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_HOVER_DESC'), 'std' => '#222', 'depends'=> array( array('button_type', '=', 'custom'), @@ -304,8 +307,8 @@ 'button_color_hover'=>array( 'type'=>'color', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_HOVER'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_HOVER_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_HOVER'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_HOVER_DESC'), 'std' => '#fff', 'depends'=> array( array('button_type', '=', 'custom'), @@ -315,14 +318,14 @@ 'button_size'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_DESC'), 'values'=>array( - ''=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_DEFAULT'), - 'lg'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_LARGE'), - 'xlg'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_XLARGE'), - 'sm'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_SMALL'), - 'xs'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_EXTRA_SAMLL'), + ''=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_DEFAULT'), + 'lg'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_LARGE'), + 'xlg'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_XLARGE'), + 'sm'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_SMALL'), + 'xs'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_EXTRA_SAMLL'), ), 'depends'=> array( array('button_text', '!=', ''), @@ -331,12 +334,12 @@ 'button_shape'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_DESC'), 'values'=>array( - 'rounded'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_ROUNDED'), - 'square'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_SQUARE'), - 'round'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_ROUND'), + 'rounded'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_ROUNDED'), + 'square'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_SQUARE'), + 'round'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_ROUND'), ), 'depends'=> array( array('button_text', '!=', ''), @@ -345,11 +348,11 @@ 'button_block'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BLOCK'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BLOCK_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BLOCK'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BLOCK_DESC'), 'values'=>array( - ''=>JText::_('JNO'), - 'sppb-btn-block'=>JText::_('JYES'), + ''=>Text::_('JNO'), + 'sppb-btn-block'=>Text::_('JYES'), ), 'depends'=> array( array('button_text', '!=', ''), @@ -358,8 +361,8 @@ 'button_icon'=>array( 'type'=>'icon', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON_DESC'), 'depends'=> array( array('button_text', '!=', ''), ) @@ -367,10 +370,10 @@ 'button_icon_position'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON_POSITION'), + 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON_POSITION'), 'values'=>array( - 'left'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_LEFT'), - 'right'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_RIGHT'), + 'left'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LEFT'), + 'right'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_RIGHT'), ), 'depends'=> array( array('button_text', '!=', ''), @@ -379,8 +382,8 @@ 'class'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CLASS'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), 'std'=>'' ), diff --git a/templates/shaper_helix3/sppagebuilder/addons/image_content/site.php b/templates/shaper_helix3/sppagebuilder/addons/image_content/site.php index ed579cc..49d5f05 100755 --- a/templates/shaper_helix3/sppagebuilder/addons/image_content/site.php +++ b/templates/shaper_helix3/sppagebuilder/addons/image_content/site.php @@ -1,14 +1,18 @@ '; //Image - $output .= '
    '; + $output .= '
    '; $output .= '
    '; //Content diff --git a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php b/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php index 0314609..6000af4 100755 --- a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php +++ b/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php @@ -2,44 +2,47 @@ /** * @package SP Page Builder * @author JoomShaper https://www.joomshaper.com -* @copyright (c) 2010 - 2021 JoomShaper +* @copyright (c) 2010 - 2022 JoomShaper * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -//no direct accees -defined ('_JEXEC') or die ('restricted aceess'); + +//No direct access +defined ('_JEXEC') or die ('restricted access'); + +use Joomla\CMS\Language\Text; SpAddonsConfig::addonConfig( array( 'type'=>'repeatable', 'addon_name'=>'sp_testimonialpro', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_DESC'), 'category'=>'Slider', 'attr'=>array( 'general' => array( 'admin_label'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL_DESC'), 'std'=> '' ), 'autoplay'=>array( 'type'=>'checkbox', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_AUTOPLAY'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_AUTOPLAY_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_AUTOPLAY'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_AUTOPLAY_DESC'), 'values'=>array( - 1=>JText::_('JYES'), - 0=>JText::_('JNO'), + 1=>Text::_('JYES'), + 0=>Text::_('JNO'), ), 'std'=>1, ), 'interval'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_INTERVAL'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_INTERVAL_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_INTERVAL'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_INTERVAL_DESC'), 'std'=> 5, 'depends'=> array( array('autoplay', '=', 1), @@ -48,26 +51,26 @@ 'speed'=>array( 'type'=>'number', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SPEED'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SPEED_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SPEED'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SPEED_DESC'), 'std'=> 600, ), 'controls'=>array( 'type'=>'checkbox', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CAROUSEL_SHOW_CONTROLLERS'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CAROUSEL_SHOW_CONTROLLERS_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CAROUSEL_SHOW_CONTROLLERS'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CAROUSEL_SHOW_CONTROLLERS_DESC'), 'values'=>array( - 1=>JText::_('JYES'), - 0=>JText::_('JNO'), + 1=>Text::_('JYES'), + 0=>Text::_('JNO'), ), 'std'=>1, ), 'avatar_width'=>array( 'type'=>'slider', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_WIDTH'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_WIDTH_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_WIDTH'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_WIDTH_DESC'), 'std'=>32, 'min'=>16, 'max'=>128 @@ -75,62 +78,62 @@ 'avatar_shape'=>array( 'type'=>'select', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_SHAPE'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_SHAPE'), 'values' =>array( - 'sppb-avatar-sqaure'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_SQUARE'), - 'sppb-avatar-round'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_ROUNDED'), - 'sppb-avatar-circle'=>JText::_('COM_SPPAGEBUILDER_GLOBAL_CIRCLE'), + 'sppb-avatar-sqaure'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_SQUARE'), + 'sppb-avatar-round'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_ROUNDED'), + 'sppb-avatar-circle'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_CIRCLE'), ), 'std' => 'sppb-avatar-circle' ), 'arrows'=>array( 'type'=>'checkbox', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SHOW_ARROWS'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SHOW_ARROWS_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SHOW_ARROWS'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SHOW_ARROWS_DESC'), 'values'=>array( - 1=>JText::_('JYES'), - 0=>JText::_('JNO'), + 1=>Text::_('JYES'), + 0=>Text::_('JNO'), ), 'std'=>1, ), 'class'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_CLASS'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), 'std'=> '' ), // Repeatable Items 'sp_testimonialpro_item'=>array( - 'title'=>JText::_('Testimonials'), + 'title'=>Text::_('Testimonials'), 'attr'=>array( 'title'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TITLE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TITLE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TITLE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TITLE_DESC'), 'std'=>'John Doe', ), 'avatar'=>array( 'type'=>'media', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_IMAGE'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_IMAGE_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_IMAGE'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_IMAGE_DESC'), ), 'message'=>array( 'type'=>'editor', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TEXT'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TEXT_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TEXT'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TEXT_DESC'), 'std'=> 'Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.' ), 'url'=>array( 'type'=>'text', - 'title'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_URL'), - 'desc'=>JText::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_URL_DESC'), + 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_URL'), + 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_URL_DESC'), ), ), diff --git a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php b/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php index 1ad2f92..4be5cad 100755 --- a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php +++ b/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php @@ -1,14 +1,16 @@ Date: Fri, 14 Oct 2022 13:13:27 +0600 Subject: [PATCH 04/29] add yarn.lock file --- yarn.lock | 2337 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2337 insertions(+) create mode 100644 yarn.lock diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..15d0688 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,2337 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +ansi-colors@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9" + integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA== + dependencies: + ansi-wrap "^0.1.0" + +ansi-cyan@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" + integrity sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A== + dependencies: + ansi-wrap "0.1.0" + +ansi-gray@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" + integrity sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw== + dependencies: + ansi-wrap "0.1.0" + +ansi-red@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" + integrity sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow== + dependencies: + ansi-wrap "0.1.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== + +ansi-wrap@0.1.0, ansi-wrap@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" + integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw== + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +append-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" + integrity sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA== + dependencies: + buffer-equal "^1.0.0" + +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw== + +arr-diff@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a" + integrity sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q== + dependencies: + arr-flatten "^1.0.1" + array-slice "^0.2.3" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== + +arr-filter@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee" + integrity sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA== + dependencies: + make-iterator "^1.0.0" + +arr-flatten@^1.0.1, arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-map@^2.0.0, arr-map@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4" + integrity sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw== + dependencies: + make-iterator "^1.0.0" + +arr-union@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" + integrity sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== + +array-each@^1.0.0, array-each@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" + integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA== + +array-initial@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795" + integrity sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw== + dependencies: + array-slice "^1.0.0" + is-number "^4.0.0" + +array-last@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336" + integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg== + dependencies: + is-number "^4.0.0" + +array-slice@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" + integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q== + +array-slice@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" + integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== + +array-sort@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" + integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== + dependencies: + default-compare "^1.0.0" + get-value "^2.0.6" + kind-of "^5.0.2" + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== + +async-done@^1.2.0, async-done@^1.2.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2" + integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.2" + process-nextick-args "^2.0.0" + stream-exhaust "^1.0.1" + +async-each@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + +async-settle@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b" + integrity sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw== + dependencies: + async-done "^1.2.2" + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +bach@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880" + integrity sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg== + dependencies: + arr-filter "^1.1.1" + arr-flatten "^1.0.1" + arr-map "^2.0.0" + array-each "^1.0.0" + array-initial "^1.0.0" + array-last "^1.1.1" + async-done "^1.2.2" + async-settle "^1.0.0" + now-and-later "^2.0.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +binary-extensions@^1.0.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^2.3.1, braces@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + +buffer-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" + integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +camelcase@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg== + +chokidar@^2.0.0: + version "2.1.8" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" + integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== + dependencies: + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" + optionalDependencies: + fsevents "^1.2.7" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +cliui@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w== + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + +clone-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== + +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== + +clone@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== + +cloneable-readable@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" + integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== + dependencies: + inherits "^2.0.1" + process-nextick-args "^2.0.0" + readable-stream "^2.3.5" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== + +collection-map@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" + integrity sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA== + dependencies: + arr-map "^2.0.2" + for-own "^1.0.0" + make-iterator "^1.0.0" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +concat-stream@^1.6.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +convert-source-map@^1.5.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== + +copy-props@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2" + integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw== + dependencies: + each-props "^1.3.2" + is-plain-object "^5.0.0" + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +d@1, d@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" + integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== + dependencies: + es5-ext "^0.10.50" + type "^1.0.1" + +debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decamelize@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== + +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" + integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== + dependencies: + kind-of "^5.0.2" + +default-resolution@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684" + integrity sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ== + +define-properties@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + dependencies: + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q== + +duplexify@^3.6.0: + version "3.7.1" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" + integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== + dependencies: + end-of-stream "^1.0.0" + inherits "^2.0.1" + readable-stream "^2.0.0" + stream-shift "^1.0.0" + +each-props@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333" + integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA== + dependencies: + is-plain-object "^2.0.1" + object.defaults "^1.1.0" + +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +error-ex@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50: + version "0.10.62" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5" + integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA== + dependencies: + es6-iterator "^2.0.3" + es6-symbol "^3.1.3" + next-tick "^1.1.0" + +es6-iterator@^2.0.1, es6-iterator@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g== + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" + +es6-symbol@^3.1.1, es6-symbol@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" + integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== + dependencies: + d "^1.0.1" + ext "^1.1.2" + +es6-weak-map@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53" + integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA== + dependencies: + d "1" + es5-ext "^0.10.46" + es6-iterator "^2.0.3" + es6-symbol "^3.1.1" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw== + dependencies: + homedir-polyfill "^1.0.1" + +ext@^1.1.2: + version "1.7.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f" + integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw== + dependencies: + type "^2.7.2" + +extend-shallow@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071" + integrity sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw== + dependencies: + kind-of "^1.1.0" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +fancy-log@^1.3.2: + version "1.3.3" + resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" + integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== + dependencies: + ansi-gray "^0.1.1" + color-support "^1.1.3" + parse-node-version "^1.0.0" + time-stamp "^1.0.0" + +fast-levenshtein@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9" + integrity sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw== + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA== + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + +findup-sync@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" + integrity sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g== + dependencies: + detect-file "^1.0.0" + is-glob "^3.1.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + +findup-sync@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" + integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== + dependencies: + detect-file "^1.0.0" + is-glob "^4.0.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + +fined@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" + integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== + dependencies: + expand-tilde "^2.0.2" + is-plain-object "^2.0.3" + object.defaults "^1.1.0" + object.pick "^1.2.0" + parse-filepath "^1.0.1" + +flagged-respawn@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" + integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== + +flush-write-stream@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" + integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== + dependencies: + inherits "^2.0.3" + readable-stream "^2.3.6" + +for-in@^1.0.1, for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== + +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg== + dependencies: + for-in "^1.0.1" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== + dependencies: + map-cache "^0.2.2" + +fs-mkdirp-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" + integrity sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ== + dependencies: + graceful-fs "^4.1.11" + through2 "^2.0.3" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +fsevents@^1.2.7: + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +get-caller-file@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" + integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.3" + +get-stream@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== + +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA== + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob-stream@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" + integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw== + dependencies: + extend "^3.0.0" + glob "^7.1.1" + glob-parent "^3.1.0" + is-negated-glob "^1.0.0" + ordered-read-streams "^1.0.0" + pumpify "^1.3.5" + readable-stream "^2.1.5" + remove-trailing-separator "^1.0.1" + to-absolute-glob "^2.0.0" + unique-stream "^2.0.2" + +glob-watcher@^5.0.3: + version "5.0.5" + resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc" + integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw== + dependencies: + anymatch "^2.0.0" + async-done "^1.2.0" + chokidar "^2.0.0" + is-negated-glob "^1.0.0" + just-debounce "^1.0.0" + normalize-path "^3.0.0" + object.defaults "^1.1.0" + +glob@^7.1.1, glob@^7.1.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg== + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + +glogg@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" + integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA== + dependencies: + sparkles "^1.0.0" + +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + +gulp-clean@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/gulp-clean/-/gulp-clean-0.4.0.tgz#3bc25e7084e641bbd7bde057cf90c01c50d95950" + integrity sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ== + dependencies: + fancy-log "^1.3.2" + plugin-error "^0.1.2" + rimraf "^2.6.2" + through2 "^2.0.3" + vinyl "^2.1.0" + +gulp-cli@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f" + integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A== + dependencies: + ansi-colors "^1.0.1" + archy "^1.0.0" + array-sort "^1.0.0" + color-support "^1.1.3" + concat-stream "^1.6.0" + copy-props "^2.0.1" + fancy-log "^1.3.2" + gulplog "^1.0.0" + interpret "^1.4.0" + isobject "^3.0.1" + liftoff "^3.1.0" + matchdep "^2.0.0" + mute-stdout "^1.0.0" + pretty-hrtime "^1.0.0" + replace-homedir "^1.0.0" + semver-greatest-satisfied-range "^1.1.0" + v8flags "^3.2.0" + yargs "^7.1.0" + +gulp-zip@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/gulp-zip/-/gulp-zip-5.1.0.tgz#38cc1d4c61bc2ab06b452ce463cbe2adc52b935e" + integrity sha512-XZr/y91IliK/SpR74g3TkZejGkGEmK7CSDjSghT1jXshgO+dFvpLIz9w9fpuwkew6i7k4F+G24TubNgq1ISzEw== + dependencies: + get-stream "^5.2.0" + plugin-error "^1.0.1" + through2 "^3.0.1" + vinyl "^2.1.0" + yazl "^2.5.1" + +gulp@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa" + integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA== + dependencies: + glob-watcher "^5.0.3" + gulp-cli "^2.2.0" + undertaker "^1.2.1" + vinyl-fs "^3.0.0" + +gulplog@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" + integrity sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw== + dependencies: + glogg "^1.0.0" + +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== + dependencies: + parse-passwd "^1.0.0" + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@^1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +interpret@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + integrity sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ== + +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" + integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== + dependencies: + is-relative "^1.0.0" + is-windows "^1.0.1" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q== + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-core-module@^2.9.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" + integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== + dependencies: + has "^1.0.3" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== + dependencies: + number-is-nan "^1.0.0" + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw== + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-negated-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" + integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug== + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== + dependencies: + kind-of "^3.0.2" + +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== + dependencies: + is-unc-path "^1.0.0" + +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" + integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== + dependencies: + unc-path-regex "^0.1.2" + +is-utf8@^0.2.0, is-utf8@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== + +is-valid-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" + integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA== + +is-windows@^1.0.1, is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== + +just-debounce@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf" + integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ== + +kind-of@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" + integrity sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g== + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0, kind-of@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +last-run@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b" + integrity sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ== + dependencies: + default-resolution "^2.0.0" + es6-weak-map "^2.0.1" + +lazystream@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" + integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw== + dependencies: + readable-stream "^2.0.5" + +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + integrity sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw== + dependencies: + invert-kv "^1.0.0" + +lead@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" + integrity sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow== + dependencies: + flush-write-stream "^1.0.2" + +liftoff@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3" + integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog== + dependencies: + extend "^3.0.0" + findup-sync "^3.0.0" + fined "^1.0.1" + flagged-respawn "^1.0.0" + is-plain-object "^2.0.4" + object.map "^1.0.0" + rechoir "^0.6.2" + resolve "^1.1.7" + +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + integrity sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A== + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + +make-iterator@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" + integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== + dependencies: + kind-of "^6.0.2" + +map-cache@^0.2.0, map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== + dependencies: + object-visit "^1.0.0" + +matchdep@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e" + integrity sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA== + dependencies: + findup-sync "^2.0.0" + micromatch "^3.0.4" + resolve "^1.4.0" + stack-trace "0.0.10" + +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +minimatch@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== + +mute-stdout@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" + integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg== + +nan@^2.12.1: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +next-tick@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" + integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== + +normalize-package-data@^2.3.2: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w== + dependencies: + remove-trailing-separator "^1.0.1" + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +now-and-later@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c" + integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ== + dependencies: + once "^1.3.2" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== + dependencies: + isobject "^3.0.0" + +object.assign@^4.0.4, object.assign@^4.1.0: + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + has-symbols "^1.0.3" + object-keys "^1.1.1" + +object.defaults@^1.0.0, object.defaults@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" + integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA== + dependencies: + array-each "^1.0.1" + array-slice "^1.0.0" + for-own "^1.0.0" + isobject "^3.0.0" + +object.map@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" + integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w== + dependencies: + for-own "^1.0.0" + make-iterator "^1.0.0" + +object.pick@^1.2.0, object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== + dependencies: + isobject "^3.0.1" + +object.reduce@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad" + integrity sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw== + dependencies: + for-own "^1.0.0" + make-iterator "^1.0.0" + +once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +ordered-read-streams@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" + integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw== + dependencies: + readable-stream "^2.0.1" + +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g== + dependencies: + lcid "^1.0.0" + +parse-filepath@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" + integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q== + dependencies: + is-absolute "^1.0.0" + map-cache "^0.2.0" + path-root "^0.1.1" + +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ== + dependencies: + error-ex "^1.2.0" + +parse-node-version@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== + +parse-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q== + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ== + dependencies: + pinkie-promise "^2.0.0" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-root-regex@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" + integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ== + +path-root@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" + integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg== + dependencies: + path-root-regex "^0.1.0" + +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + integrity sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg== + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw== + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== + +plugin-error@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" + integrity sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw== + dependencies: + ansi-cyan "^0.1.1" + ansi-red "^0.1.1" + arr-diff "^1.0.1" + arr-union "^2.0.1" + extend-shallow "^1.1.2" + +plugin-error@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c" + integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA== + dependencies: + ansi-colors "^1.0.1" + arr-diff "^4.0.0" + arr-union "^3.1.0" + extend-shallow "^3.0.2" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== + +pretty-hrtime@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" + integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A== + +process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +pump@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" + integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pumpify@^1.3.5: + version "1.5.1" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" + integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== + dependencies: + duplexify "^3.6.0" + inherits "^2.0.3" + pump "^2.0.0" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + integrity sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A== + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + integrity sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ== + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + +"readable-stream@2 || 3": + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readdirp@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +rechoir@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw== + dependencies: + resolve "^1.1.6" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +remove-bom-buffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" + integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ== + dependencies: + is-buffer "^1.1.5" + is-utf8 "^0.2.1" + +remove-bom-stream@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" + integrity sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA== + dependencies: + remove-bom-buffer "^3.0.0" + safe-buffer "^5.1.0" + through2 "^2.0.3" + +remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== + +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== + +replace-ext@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" + integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== + +replace-homedir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c" + integrity sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg== + dependencies: + homedir-polyfill "^1.0.1" + is-absolute "^1.0.0" + remove-trailing-separator "^1.1.0" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug== + +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg== + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" + +resolve-options@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" + integrity sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A== + dependencies: + value-or-function "^3.0.0" + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== + +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + dependencies: + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +rimraf@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== + dependencies: + ret "~0.1.10" + +semver-greatest-satisfied-range@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b" + integrity sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ== + dependencies: + sver-compat "^1.5.0" + +"semver@2 || 3 || 4 || 5": + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-url@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + +sparkles@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" + integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw== + +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.12" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" + integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +stack-trace@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +stream-exhaust@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" + integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw== + +stream-shift@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== + +string-width@^1.0.1, string-width@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== + dependencies: + ansi-regex "^2.0.0" + +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g== + dependencies: + is-utf8 "^0.2.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +sver-compat@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8" + integrity sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg== + dependencies: + es6-iterator "^2.0.1" + es6-symbol "^3.1.1" + +through2-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" + integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== + dependencies: + through2 "~2.0.0" + xtend "~4.0.0" + +through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + +through2@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" + integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== + dependencies: + inherits "^2.0.4" + readable-stream "2 || 3" + +time-stamp@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" + integrity sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw== + +to-absolute-glob@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" + integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA== + dependencies: + is-absolute "^1.0.0" + is-negated-glob "^1.0.0" + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +to-through@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" + integrity sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q== + dependencies: + through2 "^2.0.3" + +type@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" + integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== + +type@^2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" + integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== + +unc-path-regex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== + +undertaker-registry@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50" + integrity sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw== + +undertaker@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18" + integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg== + dependencies: + arr-flatten "^1.0.1" + arr-map "^2.0.0" + bach "^1.0.0" + collection-map "^1.0.0" + es6-weak-map "^2.0.1" + fast-levenshtein "^1.0.0" + last-run "^1.1.0" + object.defaults "^1.0.0" + object.reduce "^1.0.0" + undertaker-registry "^1.0.0" + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +unique-stream@^2.0.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" + integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== + dependencies: + json-stable-stringify-without-jsonify "^1.0.1" + through2-filter "^3.0.0" + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +upath@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + +v8flags@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" + integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== + dependencies: + homedir-polyfill "^1.0.1" + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +value-or-function@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" + integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg== + +vinyl-fs@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" + integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng== + dependencies: + fs-mkdirp-stream "^1.0.0" + glob-stream "^6.1.0" + graceful-fs "^4.0.0" + is-valid-glob "^1.0.0" + lazystream "^1.0.0" + lead "^1.0.0" + object.assign "^4.0.4" + pumpify "^1.3.5" + readable-stream "^2.3.3" + remove-bom-buffer "^3.0.0" + remove-bom-stream "^1.2.0" + resolve-options "^1.1.0" + through2 "^2.0.0" + to-through "^2.0.0" + value-or-function "^3.0.0" + vinyl "^2.0.0" + vinyl-sourcemap "^1.1.0" + +vinyl-sourcemap@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" + integrity sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA== + dependencies: + append-buffer "^1.0.2" + convert-source-map "^1.5.0" + graceful-fs "^4.1.6" + normalize-path "^2.1.1" + now-and-later "^2.0.0" + remove-bom-buffer "^3.0.0" + vinyl "^2.0.0" + +vinyl@^2.0.0, vinyl@^2.1.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" + integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== + dependencies: + clone "^2.1.1" + clone-buffer "^1.0.0" + clone-stats "^1.0.0" + cloneable-readable "^1.0.0" + remove-trailing-separator "^1.0.1" + replace-ext "^1.0.0" + +which-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ== + +which@^1.2.14: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + integrity sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw== + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + +xtend@~4.0.0, xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^3.2.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== + +yargs-parser@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394" + integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA== + dependencies: + camelcase "^3.0.0" + object.assign "^4.1.0" + +yargs@^7.1.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db" + integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA== + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + y18n "^3.2.1" + yargs-parser "^5.0.1" + +yazl@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35" + integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw== + dependencies: + buffer-crc32 "~0.2.3" From 5982469f82c2e846fc72370f73b1004d340a1036 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Fri, 14 Oct 2022 17:10:58 +0600 Subject: [PATCH 05/29] update template namespace --- .../html/com_content/archive/default.php | 18 +++-- .../com_content/archive/default_items.php | 16 ++-- .../html/com_content/article/default.php | 76 ++++++++++--------- .../com_content/article/default_links.php | 4 +- .../html/com_content/category/blog.php | 16 ++-- .../html/com_content/category/blog_item.php | 49 +++++++----- .../html/com_content/category/blog_links.php | 6 +- .../html/com_content/featured/default.php | 4 +- .../com_content/featured/default_item.php | 40 +++++----- .../com_content/featured/default_links.php | 4 +- .../html/com_content/form/edit.php | 52 +++++++------ .../html/com_finder/search/default.php | 15 ++-- .../html/com_finder/search/default_form.php | 38 +++++----- .../html/com_finder/search/default_result.php | 11 ++- .../com_finder/search/default_results.php | 24 +++--- .../html/com_mailto/mailto/default.php | 40 +++++----- .../html/com_search/search/default_form.php | 25 +++--- .../html/com_users/login/default_login.php | 42 +++++----- .../html/com_users/login/default_logout.php | 12 ++- .../html/com_users/registration/default.php | 18 +++-- .../html/com_users/remind/default.php | 16 ++-- .../html/com_users/reset/complete.php | 16 ++-- .../html/com_users/reset/confirm.php | 16 ++-- .../html/com_users/reset/default.php | 16 ++-- .../content/blog_style_default_item_title.php | 19 +++-- .../content/blog_style_default_links.php | 5 +- .../joomla/content/categories_default.php | 6 +- .../joomla/content/category_default.php | 12 ++- .../joomla/content/comments/comments.php | 15 ++-- .../content/comments/comments_count.php | 15 ++-- .../content/comments/engine/count/disqus.php | 4 +- .../comments/engine/count/facebook.php | 7 +- .../html/layouts/joomla/content/icons.php | 12 +-- .../layouts/joomla/content/icons/create.php | 6 +- .../layouts/joomla/content/icons/edit.php | 9 ++- .../joomla/content/icons/edit_lock.php | 7 +- .../layouts/joomla/content/icons/email.php | 6 +- .../joomla/content/icons/print_popup.php | 9 ++- .../joomla/content/icons/print_screen.php | 9 ++- .../joomla/content/info_block/author.php | 7 +- .../joomla/content/info_block/block.php | 18 +++-- .../joomla/content/info_block/category.php | 7 +- .../joomla/content/info_block/create_date.php | 6 +- .../joomla/content/info_block/hits.php | 4 +- .../joomla/content/info_block/modify_date.php | 7 +- .../content/info_block/parent_category.php | 7 +- .../content/info_block/publish_date.php | 7 +- .../layouts/joomla/content/intro_image.php | 14 +++- .../joomla/content/options_default.php | 8 +- .../joomla/content/post_formats/icons.php | 7 +- .../html/layouts/joomla/content/rating.php | 9 ++- .../html/layouts/joomla/content/readmore.php | 11 ++- .../joomla/content/social_share/share.php | 19 +++-- .../html/layouts/joomla/content/tags.php | 10 ++- 54 files changed, 527 insertions(+), 329 deletions(-) diff --git a/templates/shaper_helix3/html/com_content/archive/default.php b/templates/shaper_helix3/html/com_content/archive/default.php index 47ccca3..ac9900b 100755 --- a/templates/shaper_helix3/html/com_content/archive/default.php +++ b/templates/shaper_helix3/html/com_content/archive/default.php @@ -7,11 +7,15 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); -JHtml::_('formbehavior.chosen', 'select'); -// JHtml::_('behavior.caption'); +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); +HTMLHelper::_('formbehavior.chosen', 'select'); +// HTMLHelper::_('behavior.caption'); ?>
    params->get('show_page_heading', 1)) : ?> @@ -21,19 +25,19 @@
    -
    +
    params->get('filter_field') != 'hide') : ?> - - + + form->monthField; ?> form->yearField; ?> form->limitField; ?> - + diff --git a/templates/shaper_helix3/html/com_content/archive/default_items.php b/templates/shaper_helix3/html/com_content/archive/default_items.php index eb8f4cf..bcf6515 100755 --- a/templates/shaper_helix3/html/com_content/archive/default_items.php +++ b/templates/shaper_helix3/html/com_content/archive/default_items.php @@ -7,13 +7,17 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Layout\LayoutHelper; + defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); $params = $this->params; $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category')); -$tpl_params = JFactory::getApplication()->getTemplate(true)->params; +$tpl_params = Factory::getApplication()->getTemplate(true)->params; ?>
    @@ -23,9 +27,9 @@
    - $item, 'params' => $params, 'position' => 'above')); ?> + $item, 'params' => $params, 'position' => 'above')); ?> - +
    get('show_intro')) : ?> @@ -33,11 +37,11 @@ event->beforeDisplayContent; ?> get('show_intro')) :?> -
    introtext, $params->get('introtext_limit')); ?>
    +
    introtext, $params->get('introtext_limit')); ?>
    - $item, 'params' => $params, 'position' => 'below')); ?> + $item, 'params' => $params, 'position' => 'below')); ?> event->afterDisplayContent; ?> diff --git a/templates/shaper_helix3/html/com_content/article/default.php b/templates/shaper_helix3/html/com_content/article/default.php index 5100d52..ac0ce22 100755 --- a/templates/shaper_helix3/html/com_content/article/default.php +++ b/templates/shaper_helix3/html/com_content/article/default.php @@ -7,17 +7,25 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Factory; +use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Layout\LayoutHelper; + defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); // Create shortcuts to some parameters. $params = $this->item->params; -$tpl_params = JFactory::getApplication()->getTemplate(true)->params; +$tpl_params = Factory::getApplication()->getTemplate(true)->params; $images = json_decode($this->item->images); $urls = json_decode($this->item->urls); $canEdit = $params->get('access-edit'); -$user = JFactory::getUser(); +$user = Factory::getUser(); $info = $params->get('info_block_position', 0); $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author')); @@ -34,13 +42,13 @@ } //opengraph -$document = JFactory::getDocument(); -$document->addCustomTag(''); +$document = Factory::getDocument(); +$document->addCustomTag(''); $document->addCustomTag(''); $document->addCustomTag(''); -$document->addCustomTag(''); +$document->addCustomTag(''); if ($article_image) { - $document->addCustomTag(''); + $document->addCustomTag(''); $document->addCustomTag(''); $document->addCustomTag(''); } @@ -53,14 +61,14 @@ } // status -$currentDate = JFactory::getDate()->format('Y-m-d H:i:s'); +$currentDate = Factory::getDate()->format('Y-m-d H:i:s'); $isExpired = JVERSION < 4 - ? (strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate() + ? (strtotime($this->item->publish_down) < strtotime(Factory::getDate())) && $this->item->publish_down != Factory::getDbo()->getNullDate() : !is_null($this->item->publish_down) && $this->item->publish_down < $currentDate; ?>
    - + params->get('show_page_heading', 1)) : ?>

    escape($this->params->get('page_heading')); ?>

    @@ -74,45 +82,45 @@ item); + echo LayoutHelper::render('joomla.content.full_image', $this->item); } else { - echo JLayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $params, 'item' => $this->item)); + echo LayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $params, 'item' => $this->item)); } ?>
    print && $useDefList && ($info == 0 || $info == 2)) : ?> - $this->item, 'params' => $params, 'position' => 'above')); ?> + $this->item, 'params' => $params, 'position' => 'above')); ?> get('show_title') || $params->get('show_author')) : ?> - +

    get('show_title')) : ?> escape($this->item->title); ?>

    item->state == 0) : ?> - + - item->publish_up) > strtotime(JFactory::getDate())) : ?> - + item->publish_up) > strtotime(Factory::getDate())) : ?> + - +
    print) : ?> get('show_print_icon') || $params->get('show_email_icon')) : ?> - $params, 'item' => $this->item, 'print' => false)); ?> + $params, 'item' => $this->item, 'print' => false)); ?>
    - item, $params); ?> + item, $params); ?>
    @@ -127,7 +135,7 @@ get('access-view')):?> - item); ?> + item); ?> item->pagination) && $this->item->pagination && !$this->item->paginationposition && !$this->item->paginationrelative): @@ -142,11 +150,11 @@
    print && $useDefList && ($info == 1 || $info == 2)) : ?> - $this->item, 'params' => $params, 'position' => 'below')); ?> + $this->item, 'params' => $params, 'position' => 'below')); ?> get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> - item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> + item->tagLayout = new FileLayout('joomla.content.tags'); ?> item->tagLayout->render($this->item->tags->itemTags); ?> @@ -163,25 +171,25 @@ item->introtext; ?> get('show_readmore') && $this->item->fulltext != null) : - $redirectUrl = urlencode(base64_encode(JURI::current())); - $link1 = JRoute::_('index.php?option=com_users&view=login&return='.$redirectUrl); - $link = new JUri($link1);?> + $redirectUrl = urlencode(base64_encode(Uri::current())); + $link1 = Route::_('index.php?option=com_users&view=login&return='.$redirectUrl); + $link = new Uri($link1);?>

    item->attribs); ?> alternative_readmore == null) : - echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); + echo Text::_('COM_CONTENT_REGISTER_TO_READ_MORE'); elseif ($readmore = $this->item->alternative_readmore) : echo $readmore; if ($params->get('show_readmore_title', 0) != 0) : - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); + echo HTMLHelper::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); endif; elseif ($params->get('show_readmore_title', 0) == 0) : - echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); + echo Text::sprintf('COM_CONTENT_READ_MORE_TITLE'); else : - echo JText::_('COM_CONTENT_READ_MORE'); - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); + echo Text::_('COM_CONTENT_READ_MORE'); + echo HTMLHelper::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); endif; ?>

    @@ -199,10 +207,10 @@ print) : ?>
    - $this->item, 'params' => $params)) ?> - item); //Helix Social Share ?> + $this->item, 'params' => $params)) ?> + item); //Helix Social Share ?>
    - item); //Helix Comment ?> + item); //Helix Comment ?>
    diff --git a/templates/shaper_helix3/html/com_content/article/default_links.php b/templates/shaper_helix3/html/com_content/article/default_links.php index cab7253..ce9730e 100755 --- a/templates/shaper_helix3/html/com_content/article/default_links.php +++ b/templates/shaper_helix3/html/com_content/article/default_links.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; // Create shortcut @@ -60,7 +62,7 @@ break; case 3: // open in a modal window - JHtml::_('behavior.modal', 'a.modal'); + HTMLHelper::_('behavior.modal', 'a.modal'); echo '' . htmlspecialchars($label) . ' '; break; diff --git a/templates/shaper_helix3/html/com_content/category/blog.php b/templates/shaper_helix3/html/com_content/category/blog.php index 3962ffc..17e3b43 100755 --- a/templates/shaper_helix3/html/com_content/category/blog.php +++ b/templates/shaper_helix3/html/com_content/category/blog.php @@ -7,11 +7,15 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; + defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); -// JHtml::_('behavior.caption'); +// HTMLHelper::_('behavior.caption'); ?>
    params->get('show_page_heading', 1)) : ?> @@ -29,7 +33,7 @@ params->get('show_cat_tags', 1) && !empty($this->category->tags->itemTags)) : ?> - category->tagLayout = new JLayoutFile('joomla.content.tags'); ?> + category->tagLayout = new LayoutHelper('joomla.content.tags'); ?> category->tagLayout->render($this->category->tags->itemTags); ?> @@ -39,14 +43,14 @@ <?php echo htmlspecialchars($this->category->getParams()->get('image_alt')); ?> params->get('show_description') && $this->category->description) : ?> - category->description, '', 'com_content.category'); ?> + category->description, '', 'com_content.category'); ?>
    lead_items) && empty($this->link_items) && empty($this->intro_items)) : ?> params->get('show_no_articles', 1)) : ?> -

    +

    @@ -103,7 +107,7 @@ children[$this->category->id]) && $this->maxLevel != 0) : ?>
    params->get('show_category_heading_title_text', 1) == 1) : ?> -

    +

    loadTemplate('children'); ?>
    diff --git a/templates/shaper_helix3/html/com_content/category/blog_item.php b/templates/shaper_helix3/html/com_content/category/blog_item.php index e5846ee..0593b96 100755 --- a/templates/shaper_helix3/html/com_content/category/blog_item.php +++ b/templates/shaper_helix3/html/com_content/category/blog_item.php @@ -7,49 +7,56 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Factory; +use Joomla\Registry\Registry; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; + defined('_JEXEC') or die; // Create a shortcut for params. $params = $this->item->params; -$tpl_params = JFactory::getApplication()->getTemplate(true)->params; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +$tpl_params = Factory::getApplication()->getTemplate(true)->params; +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html'); $canEdit = $this->item->params->get('access-edit'); $info = $params->get('info_block_position', 0); $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); // Post Format -$post_attribs = new JRegistry(json_decode( $this->item->attribs )); +$post_attribs = new Registry(json_decode( $this->item->attribs )); $post_format = $post_attribs->get('post_format', 'standard'); ?> -item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?> +item->state == 0 || strtotime($this->item->publish_up) > strtotime(Factory::getDate()) + || ((strtotime($this->item->publish_down) < strtotime(Factory::getDate())) && $this->item->publish_down != Factory::getDbo()->getNullDate())) : ?>
    item); + echo LayoutHelper::render('joomla.content.intro_image', $this->item); } else { - echo JLayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $post_attribs, 'item' => $this->item)); + echo LayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $post_attribs, 'item' => $this->item)); } ?>
    - + - $this->item, 'params' => $params, 'position' => 'above')); ?> + $this->item, 'params' => $params, 'position' => 'above')); ?> - item); ?> + item); ?>
    get('show_print_icon') || $params->get('show_email_icon')) : ?> - $params, 'item' => $this->item, 'print' => false)); ?> + $params, 'item' => $this->item, 'print' => false)); ?> get('show_intro')) : ?> @@ -60,33 +67,33 @@ item->introtext; ?> - $this->item, 'params' => $params, 'position' => 'below')); ?> + $this->item, 'params' => $params, 'position' => 'below')); ?> get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : - $link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = Route::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); else : - $menu = JFactory::getApplication()->getMenu(); + $menu = Factory::getApplication()->getMenu(); $active = $menu->getActive(); $itemId = $active->id; - $link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); - $link = new JUri($link1); + $link1 = Route::_('index.php?option=com_users&view=login&Itemid=' . $itemId); + $returnURL = Route::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = new Uri($link1); $link->setVar('return', base64_encode($returnURL)); endif; ?> - $this->item, 'params' => $params, 'link' => $link)); ?> + $this->item, 'params' => $params, 'link' => $link)); ?> -item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?> +item->state == 0 || strtotime($this->item->publish_up) > strtotime(Factory::getDate()) + || ((strtotime($this->item->publish_down) < strtotime(Factory::getDate())) && $this->item->publish_down != Factory::getDbo()->getNullDate())) : ?>
    get('show_tags') && !empty($this->item->tags->itemTags)) : ?> - item->tags->itemTags); ?> + item->tags->itemTags); ?> item->event->afterDisplayContent; ?> diff --git a/templates/shaper_helix3/html/com_content/category/blog_links.php b/templates/shaper_helix3/html/com_content/category/blog_links.php index e8099aa..80f9c58 100755 --- a/templates/shaper_helix3/html/com_content/category/blog_links.php +++ b/templates/shaper_helix3/html/com_content/category/blog_links.php @@ -8,6 +8,8 @@ */ defined('_JEXEC') or die; + +use Joomla\CMS\Router\Route; ?> @@ -16,8 +18,10 @@ foreach ($this->link_items as &$item) : ?>
  • - + title; ?>
    • + + diff --git a/templates/shaper_helix3/html/com_content/featured/default.php b/templates/shaper_helix3/html/com_content/featured/default.php index 8f17385..b53503a 100755 --- a/templates/shaper_helix3/html/com_content/featured/default.php +++ b/templates/shaper_helix3/html/com_content/featured/default.php @@ -7,9 +7,11 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); // If the page class is defined, add to class as suffix. // It will be a separate class if the user starts it with a space diff --git a/templates/shaper_helix3/html/com_content/featured/default_item.php b/templates/shaper_helix3/html/com_content/featured/default_item.php index 6739461..f44ed3f 100755 --- a/templates/shaper_helix3/html/com_content/featured/default_item.php +++ b/templates/shaper_helix3/html/com_content/featured/default_item.php @@ -7,11 +7,17 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Factory; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Router; +use Joomla\CMS\Uri\Uri; +use Joomla\Registry\Registry; + defined('_JEXEC') or die; // Create a shortcut for params. $params = &$this->item->params; -$tpl_params = JFactory::getApplication()->getTemplate(true)->params; +$tpl_params = Factory::getApplication()->getTemplate(true)->params; $images = json_decode($this->item->images); $canEdit = $this->item->params->get('access-edit'); $info = $this->item->params->get('info_block_position', 0); @@ -19,13 +25,13 @@ || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); // Post Format -$post_attribs = new JRegistry(json_decode( $this->item->attribs )); +$post_attribs = new Registry(json_decode( $this->item->attribs )); $post_format = $post_attribs->get('post_format', 'standard'); // published status -$currentDate = JFactory::getDate()->format('Y-m-d H:i:s'); +$currentDate = Factory::getDate()->format('Y-m-d H:i:s'); $isNotPublishedYet = $this->item->publish_up > $currentDate; -$isUnpublished = JVERSION < 4 ? ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ($this->item->state == Joomla\Component\Content\Administrator\Extension\ContentComponent::CONDITION_UNPUBLISHED || $isNotPublishedYet) +$isUnpublished = JVERSION < 4 ? ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(Factory::getDate()) || ((strtotime($this->item->publish_down) < strtotime(Factory::getDate())) && $this->item->publish_down != Factory::getDbo()->getNullDate())) : ($this->item->state == Joomla\Component\Content\Administrator\Extension\ContentComponent::CONDITION_UNPUBLISHED || $isNotPublishedYet) || ($this->item->publish_down < $currentDate && $this->item->publish_down !== null); ?> @@ -36,25 +42,25 @@ item); + echo LayoutHelper::render('joomla.content.intro_image', $this->item); } else { - echo JLayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $post_attribs, 'item' => $this->item)); + echo LayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $post_attribs, 'item' => $this->item)); } ?>
    - + - $this->item, 'params' => $params, 'position' => 'above')); ?> + $this->item, 'params' => $params, 'position' => 'above')); ?> - item); ?> + item); ?>
    get('show_print_icon') || $params->get('show_email_icon')) : ?> - $params, 'item' => $this->item, 'print' => false)); ?> + $params, 'item' => $this->item, 'print' => false)); ?> get('show_intro')) : ?> @@ -63,23 +69,23 @@ item->event->beforeDisplayContent; ?> item->introtext; ?> - $this->item, 'params' => $params, 'position' => 'below')); ?> + $this->item, 'params' => $params, 'position' => 'below')); ?> get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : - $link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = Router::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); else : - $menu = JFactory::getApplication()->getMenu(); + $menu = Factory::getApplication()->getMenu(); $active = $menu->getActive(); $itemId = $active->id; - $link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); - $link = new JUri($link1); + $link1 = Router::_('index.php?option=com_users&view=login&Itemid=' . $itemId); + $returnURL = Router::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = new Uri($link1); $link->setVar('return', base64_encode($returnURL)); endif; ?> - $this->item, 'params' => $params, 'link' => $link)); ?> + $this->item, 'params' => $params, 'link' => $link)); ?> diff --git a/templates/shaper_helix3/html/com_content/featured/default_links.php b/templates/shaper_helix3/html/com_content/featured/default_links.php index 60d159f..12a637a 100755 --- a/templates/shaper_helix3/html/com_content/featured/default_links.php +++ b/templates/shaper_helix3/html/com_content/featured/default_links.php @@ -8,11 +8,13 @@ */ defined('_JEXEC') or die; + +use Joomla\CMS\Router\Route; ?>
      link_items as &$item) : ?>
    1. - + title; ?>
      2. diff --git a/templates/shaper_helix3/html/com_content/form/edit.php b/templates/shaper_helix3/html/com_content/form/edit.php index a38e514..90259ef 100644 --- a/templates/shaper_helix3/html/com_content/form/edit.php +++ b/templates/shaper_helix3/html/com_content/form/edit.php @@ -7,11 +7,15 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); -JHtml::_('behavior.formvalidator'); -// JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0)); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('behavior.formvalidator'); +// HTMLHelper::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0)); $this->tab_name = 'com-content-form'; $this->ignore_fieldsets = array('image-intro', 'image-full', 'jmetadata', 'sppostformats', 'item_associations'); @@ -36,10 +40,10 @@
    - +
    - tab_name, array('active' => 'editor')); ?> - tab_name, 'editor', JText::_('COM_CONTENT_ARTICLE_CONTENT')); ?> + tab_name, array('active' => 'editor')); ?> + tab_name, 'editor', Text::_('COM_CONTENT_ARTICLE_CONTENT')); ?> form->renderField('title'); ?> item->id)) : ?> @@ -51,9 +55,9 @@ captchaEnabled) : ?> form->renderField('captcha'); ?> - + - tab_name, 'sppostformats', JText::_('BLOG_OPTIONS')); ?> + tab_name, 'sppostformats', Text::_('BLOG_OPTIONS')); ?> item->attribs); ?> form->renderField('spfeatured_image','attribs', (isset($attribs->spfeatured_image)? $attribs->spfeatured_image: '')); ?> form->renderField('post_format','attribs', (isset($attribs->post_format)? $attribs->post_format: '')); ?> @@ -65,10 +69,10 @@ form->renderField('quote_text','attribs',(isset($attribs->quote_text)? $attribs->quote_text: '')); ?> form->renderField('quote_author','attribs',(isset($attribs->quote_author)? $attribs->quote_author: '')); ?> form->renderField('post_status','attribs',(isset($attribs->post_status)? $attribs->post_status: '')); ?> - + get('show_urls_images_frontend')) : ?> - tab_name, 'images', JText::_('COM_CONTENT_IMAGES_AND_URLS')); ?> + tab_name, 'images', Text::_('COM_CONTENT_IMAGES_AND_URLS')); ?> form->renderField('image_intro', 'images'); ?> form->renderField('image_intro_alt', 'images'); ?> form->renderField('image_intro_caption', 'images'); ?> @@ -98,12 +102,12 @@ form->getInput('targetc', 'urls'); ?>
    - + - tab_name, 'publishing', JText::_('COM_CONTENT_PUBLISHING')); ?> + tab_name, 'publishing', Text::_('COM_CONTENT_PUBLISHING')); ?> form->renderField('catid'); ?> form->renderField('tags'); ?> get('save_history', 0)) : ?> @@ -129,34 +133,34 @@
    - +
    - + - tab_name, 'language', JText::_('JFIELD_LANGUAGE_LABEL')); ?> + tab_name, 'language', Text::_('JFIELD_LANGUAGE_LABEL')); ?> form->renderField('language'); ?> - + - tab_name, 'language', JText::_('JFIELD_LANGUAGE_LABEL')); ?> + tab_name, 'language', Text::_('JFIELD_LANGUAGE_LABEL')); ?> form->renderField('language'); ?> - + form->renderField('language'); ?> get('show_publishing_options', 1) == 1) : ?> - tab_name, 'metadata', JText::_('COM_CONTENT_METADATA')); ?> + tab_name, 'metadata', Text::_('COM_CONTENT_METADATA')); ?> form->renderField('metadesc'); ?> form->renderField('metakey'); ?> - + - + @@ -165,15 +169,15 @@ - +
    get('save_history', 0) && $this->item->id) : ?>
    diff --git a/templates/shaper_helix3/html/com_finder/search/default.php b/templates/shaper_helix3/html/com_finder/search/default.php index 03a6b2c..cd70f26 100644 --- a/templates/shaper_helix3/html/com_finder/search/default.php +++ b/templates/shaper_helix3/html/com_finder/search/default.php @@ -6,19 +6,22 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; + defined ('_JEXEC') or die(); if(JVERSION < 4) { - JHtml::_('behavior.core'); - JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); + HTMLHelper::_('behavior.core'); + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html'); - JHtml::_('stylesheet', 'com_finder/finder.css', array('version' => 'auto', 'relative' => true)); - JHtml::_('stylesheet', 'vendor/awesomplete/awesomplete.css', array('version' => 'auto', 'relative' => true)); + HTMLHelper::_('stylesheet', 'com_finder/finder.css', array('version' => 'auto', 'relative' => true)); + HTMLHelper::_('stylesheet', 'vendor/awesomplete/awesomplete.css', array('version' => 'auto', 'relative' => true)); - JText::script('MOD_FINDER_SEARCH_VALUE', true); + Text::script('MOD_FINDER_SEARCH_VALUE', true); - JHtml::_('script', 'com_finder/finder.js', array('version' => 'auto', 'relative' => true)); + HTMLHelper::_('script', 'com_finder/finder.js', array('version' => 'auto', 'relative' => true)); } else { diff --git a/templates/shaper_helix3/html/com_finder/search/default_form.php b/templates/shaper_helix3/html/com_finder/search/default_form.php index fedb0e1..7115c78 100644 --- a/templates/shaper_helix3/html/com_finder/search/default_form.php +++ b/templates/shaper_helix3/html/com_finder/search/default_form.php @@ -6,13 +6,17 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined ('_JEXEC') or die(); if (JVERSION < 4) { if ($this->params->get('show_advanced', 1) || $this->params->get('show_autosuggest', 1)) { - JHtml::_('jquery.framework'); + HTMLHelper::_('jquery.framework'); $script = " jQuery(function() {"; @@ -41,11 +45,11 @@ */ if ($this->params->get('show_autosuggest', 1)) { - JHtml::_('script', 'jui/jquery.autocomplete.min.js', array('version' => 'auto', 'relative' => true)); + HTMLHelper::_('script', 'jui/jquery.autocomplete.min.js', array('version' => 'auto', 'relative' => true)); $script .= " var suggest = jQuery('#q').autocomplete({ - serviceUrl: '" . JRoute::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component') . "', + serviceUrl: '" . Route::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component') . "', paramName: 'q', minChars: 1, maxHeight: 400, @@ -66,12 +70,12 @@ if ($this->params->get('show_autosuggest', 1)) { $this->document->getWebAssetManager()->usePreset('awesomplete'); - $this->document->addScriptOptions('finder-search', array('url' => JRoute::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component'))); + $this->document->addScriptOptions('finder-search', array('url' => Route::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component'))); } } ?> - + getFields(); ?> @@ -80,25 +84,25 @@
    escape($this->query->input) != '' || $this->params->get('allow_empty_query')) : ?> params->get('show_advanced', 1)) : ?>
    @@ -110,22 +114,22 @@
    - + - - - - + + + + params->get('tuplecount', 1) > 1) : ?> - + - +
    - query, $this->params); ?> + query, $this->params); ?>
    diff --git a/templates/shaper_helix3/html/com_finder/search/default_result.php b/templates/shaper_helix3/html/com_finder/search/default_result.php index 6c410da..a2e5735 100644 --- a/templates/shaper_helix3/html/com_finder/search/default_result.php +++ b/templates/shaper_helix3/html/com_finder/search/default_result.php @@ -8,7 +8,10 @@ defined ('_JEXEC') or die(); +use Joomla\CMS\HTML\HTMLHelper; use Joomla\String\StringHelper; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Router\Route; // Get the mime type class. $mime = !empty($this->result->mime) ? 'mime-' . $this->result->mime : null; @@ -32,7 +35,7 @@ $space = StringHelper::strpos($this->result->description, ' ', $start > 0 ? $start - 1 : 0); $start = ($space && $space < $pos) ? $space + 1 : $start; - $description = JHtml::_('string.truncate', StringHelper::substr($this->result->description, $start), $desc_length, true); + $description = HTMLHelper::_('string.truncate', StringHelper::substr($this->result->description, $start), $desc_length, true); } $route = $this->result->route; @@ -41,7 +44,7 @@ if (!empty($this->query->highlight) && empty($this->result->mime) && $this->params->get('highlight_terms', 1) - && JPluginHelper::isEnabled('system', 'highlight')) + && PluginHelper::isEnabled('system', 'highlight')) { $route .= '&highlight=' . base64_encode(json_encode($this->query->highlight)); } @@ -49,7 +52,7 @@ ?>

  • - + result->title; ?>

    @@ -60,7 +63,7 @@ params->get('show_url', 1)) : ?>
    - baseUrl . JRoute::_($this->result->route); ?> + baseUrl . Route::_($this->result->route); ?>
    • diff --git a/templates/shaper_helix3/html/com_finder/search/default_results.php b/templates/shaper_helix3/html/com_finder/search/default_results.php index 4b552fb..fa65dd4 100644 --- a/templates/shaper_helix3/html/com_finder/search/default_results.php +++ b/templates/shaper_helix3/html/com_finder/search/default_results.php @@ -6,6 +6,12 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; + defined ('_JEXEC') or die(); ?> @@ -15,12 +21,12 @@ suggested && $this->params->get('show_suggested_query', 1)) : ?> - query->toUri()); ?> + query->toUri()); ?> setVar('q', $this->suggested); ?> - toString(array('path', 'query'))); ?> + toString(array('path', 'query'))); ?> ' . $this->escape($this->suggested) . ''; ?> - + explained && $this->params->get('show_explained_query', 1)) : ?> explained; ?> @@ -30,21 +36,21 @@ total === 0) || ($this->total === null)) : ?>
    -

    - getLanguageFilter() ? '_MULTILANG' : ''; ?> -

    escape($this->query->input)); ?>

    +

    + getLanguageFilter() ? '_MULTILANG' : ''; ?> +

    escape($this->query->input)); ?>

    query->highlight) && $this->params->get('highlight_terms', 1)) : ?> - query->highlight); ?> + query->highlight); ?>
      - baseUrl = JUri::getInstance()->toString(array('scheme', 'host', 'port')); ?> + baseUrl = Uri::getInstance()->toString(array('scheme', 'host', 'port')); ?> results as $result) : ?> result = &$result; ?> getLayoutFile($this->result->layout); ?> @@ -69,7 +75,7 @@ pagination->total; ?> pagination->limit * $this->pagination->pagesCurrent; ?> $total ? $total : $limit); ?> - +
    diff --git a/templates/shaper_helix3/html/com_mailto/mailto/default.php b/templates/shaper_helix3/html/com_mailto/mailto/default.php index 6b06c5b..643b746 100755 --- a/templates/shaper_helix3/html/com_mailto/mailto/default.php +++ b/templates/shaper_helix3/html/com_mailto/mailto/default.php @@ -7,13 +7,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Router; +use Joomla\CMS\Uri\Uri; + defined('_JEXEC') or die; -JHtml::_('behavior.core'); -JHtml::_('behavior.keepalive'); +HTMLHelper::_('behavior.core'); +HTMLHelper::_('behavior.keepalive'); $data = $this->get('data'); -JFactory::getDocument()->addScriptDeclaration(" +Factory::getDocument()->addScriptDeclaration(" Joomla.submitbutton = function(pressbutton) { var form = document.getElementById('mailtoForm'); @@ -21,7 +27,7 @@ // do field validation if (form.mailto.value == '' || form.from.value == '') { - alert('" . JText::_('COM_MAILTO_EMAIL_ERR_NOINFO') . "'); + alert('" . Text::_('COM_MAILTO_EMAIL_ERR_NOINFO') . "'); return false; } form.submit(); @@ -32,11 +38,11 @@

    - +

    - +
    form->getFieldset('') as $field) : ?> hidden) : ?> @@ -45,10 +51,10 @@
    @@ -57,37 +63,37 @@ - + -
    +
    - +
    - +
    - +
    - +
    @@ -96,7 +102,7 @@ - +
    \ No newline at end of file diff --git a/templates/shaper_helix3/html/com_search/search/default_form.php b/templates/shaper_helix3/html/com_search/search/default_form.php index 61396b9..0ff8560 100644 --- a/templates/shaper_helix3/html/com_search/search/default_form.php +++ b/templates/shaper_helix3/html/com_search/search/default_form.php @@ -6,20 +6,25 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; -JHtml::_('bootstrap.tooltip'); +HTMLHelper::_('bootstrap.tooltip'); -$lang = JFactory::getLanguage(); +$lang = Factory::getLanguage(); $upper_limit = $lang->getUpperLimitSearchWord(); ?> -
    +
    - -
    @@ -28,7 +33,7 @@
    searchword)) : ?>

    - ' . $this->total . ''); ?> + ' . $this->total . ''); ?>

    @@ -39,7 +44,7 @@ params->get('search_phrases', 1)) : ?>
    - + lists['searchphrase']; ?>
    @@ -48,13 +53,13 @@ params->get('search_areas', 1)) : ?>
    - +
    searchareas['search'] as $val => $txt) : ?> searchareas['active']) && in_array($val, $this->searchareas['active']) ? 'checked="checked"' : ''; ?>
    diff --git a/templates/shaper_helix3/html/com_users/login/default_login.php b/templates/shaper_helix3/html/com_users/login/default_login.php index 8478d2d..17f2c39 100644 --- a/templates/shaper_helix3/html/com_users/login/default_login.php +++ b/templates/shaper_helix3/html/com_users/login/default_login.php @@ -7,9 +7,15 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Component\ComponentHelper; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); +HTMLHelper::_('behavior.keepalive'); ?>
    @@ -30,19 +36,19 @@ params->get('login_image') != '')) :?> - + params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?>
    - + form->setFieldAttribute( 'username', 'hint', JText::_('COM_USERS_LOGIN_USERNAME_LABEL') ); - $this->form->setFieldAttribute( 'password', 'hint', JText::_('JGLOBAL_PASSWORD') ); - $this->form->setFieldAttribute( 'secretkey', 'hint', JText::_('JGLOBAL_SECRETKEY') ); + $this->form->setFieldAttribute( 'username', 'hint', Text::_('COM_USERS_LOGIN_USERNAME_LABEL') ); + $this->form->setFieldAttribute( 'password', 'hint', Text::_('JGLOBAL_PASSWORD') ); + $this->form->setFieldAttribute( 'secretkey', 'hint', Text::_('JGLOBAL_SECRETKEY') ); ?> form->getFieldset('credentials') as $field) : ?> @@ -59,41 +65,41 @@
    - +
    - +
    form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem'))); ?> - - + +
    diff --git a/templates/shaper_helix3/html/com_users/login/default_logout.php b/templates/shaper_helix3/html/com_users/login/default_logout.php index 54dbc45..407f8ef 100644 --- a/templates/shaper_helix3/html/com_users/login/default_logout.php +++ b/templates/shaper_helix3/html/com_users/login/default_logout.php @@ -7,6 +7,10 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; ?>
    @@ -27,23 +31,23 @@ params->get('logout_image') != '')) :?> -

    <?php echo JTEXT::_('COM_USER_LOGOUT_IMAGE_ALT')?>

    +

    <?php echo Text::_('COM_USER_LOGOUT_IMAGE_ALT')?>

    params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?>
    -
    +
    - +
    params->get('logout_redirect_url')) : ?> - +
    diff --git a/templates/shaper_helix3/html/com_users/registration/default.php b/templates/shaper_helix3/html/com_users/registration/default.php index a9947f8..e1b28ae 100755 --- a/templates/shaper_helix3/html/com_users/registration/default.php +++ b/templates/shaper_helix3/html/com_users/registration/default.php @@ -7,10 +7,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); -JHtml::_('behavior.formvalidator'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('behavior.formvalidator'); ?>
    @@ -19,7 +23,7 @@

    escape($this->params->get('page_heading')); ?>

    -
    + form->getFieldsets() as $fieldset): // Iterate through the form fieldsets and display each one.?> form->getFieldset($fieldset->name);?> @@ -31,7 +35,7 @@
    label; ?> required && $field->type != 'Spacer') : ?> - + input; ?> @@ -42,12 +46,12 @@
    - - + +
    - +
    diff --git a/templates/shaper_helix3/html/com_users/remind/default.php b/templates/shaper_helix3/html/com_users/remind/default.php index 8e2f2cb..4eb27e4 100755 --- a/templates/shaper_helix3/html/com_users/remind/default.php +++ b/templates/shaper_helix3/html/com_users/remind/default.php @@ -7,10 +7,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); -JHtml::_('behavior.formvalidator'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('behavior.formvalidator'); ?>
    @@ -21,9 +25,9 @@ -
    + form->getFieldsets() as $fieldset) : ?> -

    label); ?>

    +

    label); ?>

    form->getFieldset($fieldset->name) as $name => $field) : ?>
    label; ?> @@ -32,9 +36,9 @@
    - +
    - +
    diff --git a/templates/shaper_helix3/html/com_users/reset/complete.php b/templates/shaper_helix3/html/com_users/reset/complete.php index 9303087..2e53e21 100755 --- a/templates/shaper_helix3/html/com_users/reset/complete.php +++ b/templates/shaper_helix3/html/com_users/reset/complete.php @@ -7,10 +7,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); -JHtml::_('behavior.formvalidation'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('behavior.formvalidation'); ?>
    @@ -21,10 +25,10 @@ -
    + form->getFieldsets() as $fieldset) : ?> form->getFieldset($fieldset->name) as $name => $field) : ?> -

    label); ?>

    +

    label); ?>

    label; ?> input; ?> @@ -33,9 +37,9 @@
    - +
    - +
    diff --git a/templates/shaper_helix3/html/com_users/reset/confirm.php b/templates/shaper_helix3/html/com_users/reset/confirm.php index f46524f..6c59240 100755 --- a/templates/shaper_helix3/html/com_users/reset/confirm.php +++ b/templates/shaper_helix3/html/com_users/reset/confirm.php @@ -7,10 +7,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); -JHtml::_('behavior.formvalidation'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('behavior.formvalidation'); ?>
    @@ -22,9 +26,9 @@ -
    + form->getFieldsets() as $fieldset) : ?> -

    label); ?>

    +

    label); ?>

    form->getFieldset($fieldset->name) as $name => $field) : ?>
    label; ?> @@ -34,9 +38,9 @@
    - +
    - +
    diff --git a/templates/shaper_helix3/html/com_users/reset/default.php b/templates/shaper_helix3/html/com_users/reset/default.php index 3f2624f..7a4d99b 100755 --- a/templates/shaper_helix3/html/com_users/reset/default.php +++ b/templates/shaper_helix3/html/com_users/reset/default.php @@ -7,10 +7,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; -JHtml::_('behavior.keepalive'); -JHtml::_('behavior.formvalidator'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('behavior.formvalidator'); ?>
    @@ -21,9 +25,9 @@ -
    + form->getFieldsets() as $fieldset) : ?> -

    label); ?>

    +

    label); ?>

    form->getFieldset($fieldset->name) as $name => $field) : ?>
    label; ?> @@ -33,9 +37,9 @@
    - +
    - +
    diff --git a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php index b1539d3..68da776 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php @@ -6,23 +6,28 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('_JEXEC') or die; // Create a shortcut for params. $params = $displayData->params; $canEdit = $displayData->params->get('access-edit'); -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); +HTMLHelper::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -$currentDate = JFactory::getDate()->format('Y-m-d H:i:s'); +$currentDate = Factory::getDate()->format('Y-m-d H:i:s'); $isNotPublishedYet = $displayData->publish_up > $currentDate; -$isExpired = JVERSION < 4 ? $displayData->publish_down < $currentDate && $displayData->publish_down !== JFactory::getDbo()->getNullDate() : !is_null($displayData->publish_down) && $displayData->publish_down < $currentDate; +$isExpired = JVERSION < 4 ? $displayData->publish_down < $currentDate && $displayData->publish_down !== Factory::getDbo()->getNullDate() : !is_null($displayData->publish_down) && $displayData->publish_down < $currentDate; ?> get('show_title') || $displayData->state == 0 || ($params->get('show_author') && !empty($displayData->author ))) : ?> get('show_title')) : ?>

    get('link_titles') && $params->get('access-view')) : ?> - escape($displayData->title); ?> @@ -31,12 +36,12 @@ state == 0 : $displayData->state == Joomla\Component\Content\Administrator\Extension\ContentComponent::CONDITION_UNPUBLISHED) : ?> - + - + - + diff --git a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php index e0e7cf0..cc18693 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php @@ -7,11 +7,14 @@ */ defined('_JEXEC') or die; + +use Joomla\CMS\Router\Route; + ?>
      get('link_items') as $item) : ?>
    1. - + title; ?>
      2. diff --git a/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php b/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php index 4a42915..25aba13 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; ?> @@ -20,13 +22,13 @@ params->get('categories_description')) : ?>
      - params->get('categories_description'), '', $displayData->get('extension') . '.categories'); ?> + params->get('categories_description'), '', $displayData->get('extension') . '.categories'); ?>
      parent->description) : ?>
      - parent->description, '', $displayData->parent->extension . '.categories'); ?> + parent->description, '', $displayData->parent->extension . '.categories'); ?>
      diff --git a/templates/shaper_helix3/html/layouts/joomla/content/category_default.php b/templates/shaper_helix3/html/layouts/joomla/content/category_default.php index 54659a1..acaf35f 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/category_default.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/category_default.php @@ -6,6 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; + defined('JPATH_BASE') or die; // Note that this layout opens a div with the page class suffix. If you do not use the category children @@ -35,12 +39,12 @@ get('show_category_title', 1)) : ?>

      - get('category')->title, '', $extension . '.category.title'); ?> + get('category')->title, '', $extension . '.category.title'); ?>

      get('show_cat_tags', 1)) : ?> - + get('show_description', 1) || $params->def('show_description_image', 1)) : ?> @@ -49,7 +53,7 @@ <?php echo htmlspecialchars($displayData->get('category')->getParams()->get('image_alt')); ?> get('show_description') && $displayData->get('category')->description) : ?> - get('category')->description, '', $extension . '.category'); ?> + get('category')->description, '', $extension . '.category'); ?>

    @@ -60,7 +64,7 @@ get('children') && $displayData->maxLevel != 0) : ?>

    - +

    loadTemplate('children'); ?> diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php index 9fe33dd..438dbe9 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php @@ -6,19 +6,24 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; + //no direct access defined('_JEXEC') or die('Restricted Access'); -$params = JFactory::getApplication()->getTemplate(true)->params; +$params = Factory::getApplication()->getTemplate(true)->params; if ($params->get('commenting_engine') != 'disabled') { - $url = JRoute::_(ContentHelperRoute::getArticleRoute($displayData->id . ':' . $displayData->alias, $displayData->catid, $displayData->language)); - $root = JURI::base(); - $root = new JURI($root); + $url = Route::_(ContentHelperRoute::getArticleRoute($displayData->id . ':' . $displayData->alias, $displayData->catid, $displayData->language)); + $root = Uri::base(); + $root = new Uri($root); $url = $root->getScheme() . '://' . $root->getHost() . $url; echo '
    '; - echo JLayoutHelper::render('joomla.content.comments.engine.comments.' . $params->get('commenting_engine'), array('item' => $displayData, 'params' => $params, 'url' => $url)); + echo LayoutHelper::render('joomla.content.comments.engine.comments.' . $params->get('commenting_engine'), array('item' => $displayData, 'params' => $params, 'url' => $url)); echo '
    '; } \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php index ebdaf0f..95a5c92 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php @@ -6,19 +6,24 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; + //no direct access defined('_JEXEC') or die('Restricted Access'); -$params = JFactory::getApplication()->getTemplate(true)->params; +$params = Factory::getApplication()->getTemplate(true)->params; if (($params->get('commenting_engine') != 'disabled') && ($params->get('comments_count'))) : - $url = JRoute::_(ContentHelperRoute::getArticleRoute($displayData['item']->id . ':' . $displayData['item']->alias, $displayData['item']->catid, $displayData['item']->language)); - $root = JURI::base(); - $root = new JURI($root); + $url = Route::_(ContentHelperRoute::getArticleRoute($displayData['item']->id . ':' . $displayData['item']->alias, $displayData['item']->catid, $displayData['item']->language)); + $root = Uri::base(); + $root = new Uri($root); $url = $root->getScheme() . '://' . $root->getHost() . $url; ?>
    - get('commenting_engine'), array( 'item' => $displayData, 'params' => $params, 'url' => $url)); ?> + get('commenting_engine'), array( 'item' => $displayData, 'params' => $params, 'url' => $url)); ?>
    \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php index 321ce9d..0a82916 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php @@ -6,12 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; + //no direct access defined('_JEXEC') or die('Restricted Access'); if ($displayData['params']->get('disqus_subdomain') != '') { - $doc = JFactory::getDocument(); + $doc = Factory::getDocument(); if (!defined('HELIX_COMMENTS_DISQUS_COUNT')) { diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php index a409662..0a6861a 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php @@ -6,12 +6,15 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; + //no direct access defined('_JEXEC') or die('Restricted Access'); if ($displayData['params']->get('fb_appID') != '') { - $doc = JFactory::getDocument(); + $doc = Factory::getDocument(); if (!defined('HELIX_COMMENTS_FACEBOOK_COUNT')) { @@ -21,7 +24,7 @@ ?> - > + > get('access-edit'); @@ -17,7 +19,7 @@
    - +
    @@ -34,20 +36,20 @@
      get('show_print_icon')) : ?> -
      • +
      • get('show_email_icon')) : ?> - + -
      • +
    - +
    diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php index a87631e..7aeed9d 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php @@ -6,13 +6,15 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Language\Text; + defined('_JEXEC') or die; $params = $displayData['params']; ?> get('show_icons')) : ?> - + - + diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php index 46987a5..f7d45dc 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php @@ -6,13 +6,16 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; + defined('_JEXEC') or die; $article = $displayData['article']; -$currentDate = JFactory::getDate()->format('Y-m-d H:i:s'); +$currentDate = Factory::getDate()->format('Y-m-d H:i:s'); $isUnpublished = ($article->publish_up > $currentDate) - || ($article->publish_down < $currentDate && $article->publish_down !== JFactory::getDbo()->getNullDate()); + || ($article->publish_down < $currentDate && $article->publish_down !== Factory::getDbo()->getNullDate()); $icon = $article->state ? 'edit' : 'eye-close'; @@ -22,4 +25,4 @@ } ?> - \ No newline at end of file + \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php index 4e409e9..197985b 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php @@ -6,9 +6,12 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; + defined('_JEXEC') or die; $tooltip = $displayData['tooltip']; ?> - - \ No newline at end of file + + \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php index 98ad9e7..06e58f0 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php @@ -6,13 +6,15 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Language\Text; + defined('_JEXEC') or die; $params = $displayData['params']; ?> get('show_icons')) : ?> - + - + diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php index afe0680..cc48fe0 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php @@ -6,6 +6,9 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; + defined('_JEXEC') or die; $params = $displayData['params']; @@ -15,11 +18,11 @@ get('show_icons')) : ?> - + - + - + diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php index afe0680..cc48fe0 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php @@ -6,6 +6,9 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; + defined('_JEXEC') or die; $params = $displayData['params']; @@ -15,11 +18,11 @@ get('show_icons')) : ?> - + - + - + diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php index e946b26..82e8e43 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php @@ -6,15 +6,18 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; + defined('JPATH_BASE') or die; ?>
    get('show_author') && !empty($displayData['item']->author )) : ?> - + get('show_parent_category') && !empty($displayData['item']->parent_slug)) : ?> - + get('show_category')) : ?> - + - + get('show_publish_date')) : ?> - + @@ -41,15 +43,15 @@ || $displayData['position'] == 'below' && ($blockPosition == 1 || $blockPosition == 2) ) : ?> get('show_create_date')) : ?> - + get('show_modify_date')) : ?> - + get('show_hits')) : ?> - + diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/category.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/category.php index 0e6978c..8f2993e 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/category.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/category.php @@ -6,6 +6,9 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('JPATH_BASE') or die; if (!isset($displayData['item']->catslug)) @@ -18,8 +21,8 @@ escape($displayData['item']->category_title); ?> get('link_category') && $displayData['item']->catslug) : ?> - catslug)) . '" itemprop="genre" data-toggle="tooltip" title="' . JText::_('COM_CONTENT_CONTENT_TYPE_CATEGORY') . '">' . $title . ''; ?> + catslug)) . '" itemprop="genre" data-toggle="tooltip" title="' . Text::_('COM_CONTENT_CONTENT_TYPE_CATEGORY') . '">' . $title . ''; ?> - ' . $title . ''; ?> + ' . $title . ''; ?> \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/create_date.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/create_date.php index 8756714..23c6dab 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/create_date.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/create_date.php @@ -6,12 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; + defined('JPATH_BASE') or die; ?>
    -
    \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/hits.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/hits.php index 12d88c0..1f5f0ae 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/hits.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/hits.php @@ -6,11 +6,13 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Language\Text; + defined('JPATH_BASE') or die; ?>
    - hits); ?> + hits); ?>
    \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/modify_date.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/modify_date.php index 71341db..9a163f7 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/modify_date.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/modify_date.php @@ -6,12 +6,15 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; + defined('JPATH_BASE') or die; ?>
    -
    \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/parent_category.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/parent_category.php index 0d1f645..5c6f050 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/parent_category.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/parent_category.php @@ -6,6 +6,9 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + defined('JPATH_BASE') or die; ?> @@ -13,8 +16,8 @@ escape($displayData['item']->parent_title); ?> get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?> - parent_slug)) . '" itemprop="genre" data-toggle="tooltip" title="' . JText::sprintf('COM_CONTENT_PARENT', '') . '">' . $title . ''; ?> + parent_slug)) . '" itemprop="genre" data-toggle="tooltip" title="' . Text::sprintf('COM_CONTENT_PARENT', '') . '">' . $title . ''; ?> - ' . $title . ''; ?> + ' . $title . ''; ?> \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/publish_date.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/publish_date.php index 1702df8..5899b65 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/publish_date.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/publish_date.php @@ -6,11 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; + defined('JPATH_BASE') or die; ?>
    -
    \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/intro_image.php b/templates/shaper_helix3/html/layouts/joomla/content/intro_image.php index eaa9dac..777f1e5 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/intro_image.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/intro_image.php @@ -6,8 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; + defined('_JEXEC') or die; -$tplParams = JFactory::getApplication()->getTemplate(true)->params; + +$tplParams = Factory::getApplication()->getTemplate(true)->params; $params = $displayData->params; $attribs = json_decode($displayData->attribs); $images = json_decode($displayData->images); @@ -25,11 +31,11 @@ { $intro_image = $attribs->spfeatured_image; $basename = basename($intro_image); - $list_image = JPATH_ROOT . '/' . dirname($intro_image) . '/' . JFile::stripExt($basename) . '_'. $imgsize .'.' . JFile::getExt($basename); + $list_image = JPATH_ROOT . '/' . dirname($intro_image) . '/' . File::stripExt($basename) . '_'. $imgsize .'.' . File::getExt($basename); if(file_exists($list_image)) { - $intro_image = JURI::root(true) . '/' . dirname($intro_image) . '/' . JFile::stripExt($basename) . '_'. $imgsize .'.' . JFile::getExt($basename); + $intro_image = Uri::root(true) . '/' . dirname($intro_image) . '/' . File::stripExt($basename) . '_'. $imgsize .'.' . File::getExt($basename); } } @@ -61,7 +67,7 @@ float_intro) ? $params->get('float_intro') : $images->float_intro; ?>
    get('link_titles') && $params->get('access-view')) : ?> - + image_intro_caption) && $images->image_intro_caption): diff --git a/templates/shaper_helix3/html/layouts/joomla/content/options_default.php b/templates/shaper_helix3/html/layouts/joomla/content/options_default.php index a200498..0ed9b49 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/options_default.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/options_default.php @@ -6,9 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\HTML\HTMLHelper; + defined('_JEXEC') or die; -JHtml::_('behavior.framework'); +HTMLHelper::_('behavior.framework'); ?>
    @@ -27,8 +29,8 @@ $showon = $displayData->form->getFieldAttribute($field->fieldname, 'showon'); if (!empty($showon)) { - JHtml::_('jquery.framework'); - JHtml::_('script', 'jui/cms.js', false, true); + HTMLHelper::_('jquery.framework'); + HTMLHelper::_('script', 'jui/cms.js', false, true); $id = $displayData->form->getFormControl(); $showon = explode(':', $showon, 2); diff --git a/templates/shaper_helix3/html/layouts/joomla/content/post_formats/icons.php b/templates/shaper_helix3/html/layouts/joomla/content/post_formats/icons.php index ded1e03..37bdc79 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/post_formats/icons.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/post_formats/icons.php @@ -8,7 +8,9 @@ defined('JPATH_BASE') or die; -$params = JFactory::getApplication()->getTemplate(true)->params; +use Joomla\CMS\Factory; + +$params = Factory::getApplication()->getTemplate(true)->params; $format = $displayData; if ($params->get('show_post_format')) : ?> @@ -29,4 +31,5 @@ - \ No newline at end of file + + diff --git a/templates/shaper_helix3/html/layouts/joomla/content/rating.php b/templates/shaper_helix3/html/layouts/joomla/content/rating.php index 2e5bf30..ce7cef0 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/rating.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/rating.php @@ -6,12 +6,15 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; + defined('JPATH_BASE') or die; if($displayData['params']->get('show_vote')) { $rating = (int) $displayData['item']->rating; -$layout = JFactory::getApplication()->input->get('view', 'article'); +$layout = Factory::getApplication()->input->get('view', 'article'); $rating_count = $displayData['item']->rating_count; if ($rating_count == '') @@ -27,7 +30,7 @@ } ?>
    - :
    + :
    - ( 1) ? $rating_count . ' ' . JText::_('HELIX3_COUNT_RATINGS') : $rating_count . ' ' . JText::_('HELIX3_COUNT_RATING'); ?> ) + ( 1) ? $rating_count . ' ' . Text::_('HELIX3_COUNT_RATINGS') : $rating_count . ' ' . Text::_('HELIX3_COUNT_RATING'); ?> )
    @@ -13,16 +16,16 @@

    \ No newline at end of file diff --git a/templates/shaper_helix3/html/layouts/joomla/content/social_share/share.php b/templates/shaper_helix3/html/layouts/joomla/content/social_share/share.php index 9842ea0..3c96cc5 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/social_share/share.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/social_share/share.php @@ -6,21 +6,26 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; + defined('JPATH_BASE') or die; -$url = JRoute::_(ContentHelperRoute::getArticleRoute($displayData->id . ':' . $displayData->alias, $displayData->catid, $displayData->language)); -$root = JURI::base(); -$root = new JURI($root); +$url = Route::_(ContentHelperRoute::getArticleRoute($displayData->id . ':' . $displayData->alias, $displayData->catid, $displayData->language)); +$root = Uri::base(); +$root = new Uri($root); $url = $root->getScheme() . '://' . $root->getHost() . $url; -$params = JFactory::getApplication()->getTemplate(true)->params; +$params = Factory::getApplication()->getTemplate(true)->params; if ($params->get('social_share')) : ?> - 1): ?> -
    - get('usetext')) : ?> -
    - - - - -
    - -
    - -
    + + 1): ?> +
    + get('usetext')) : ?> +
    + + + + +
    + +
    + +
    + +
    -
    @@ -84,17 +84,17 @@
    get('allowUserRegistration')) : ?> - +
    diff --git a/templates/shaper_helix3/offline.php b/templates/shaper_helix3/offline.php index 5d9ac63..56883a0 100755 --- a/templates/shaper_helix3/offline.php +++ b/templates/shaper_helix3/offline.php @@ -10,17 +10,22 @@ defined ('_JEXEC') or die ('resticted aceess'); use Joomla\CMS\Factory; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Helper\AuthenticationHelper; $doc = Factory::getDocument(); $app = Factory::getApplication(); -require_once JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php'; +$twofactormethods = []; + +if(version_compare(JVERSION, '4.2.0', '<')) +{ + $twofactormethods = AuthenticationHelper::getTwoFactorMethods(); +} -$twofactormethods = UsersHelper::getTwoFactorMethods(); ?> From 3b09efed4825bf2b0bd90037f8f4d37a0113170e Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Mon, 17 Oct 2022 10:08:44 +0600 Subject: [PATCH 07/29] Update content helper namespace --- .../html/com_content/category/blog_item.php | 5 +++-- .../html/com_content/category/blog_links.php | 3 ++- .../html/com_content/featured/default_item.php | 11 ++++++----- .../html/com_content/featured/default_links.php | 4 +++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/templates/shaper_helix3/html/com_content/category/blog_item.php b/templates/shaper_helix3/html/com_content/category/blog_item.php index 0593b96..83be563 100755 --- a/templates/shaper_helix3/html/com_content/category/blog_item.php +++ b/templates/shaper_helix3/html/com_content/category/blog_item.php @@ -13,6 +13,7 @@ use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; +use Joomla\Component\Content\Site\Helper\RouteHelper; defined('_JEXEC') or die; @@ -72,13 +73,13 @@ get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : - $link = Route::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); else : $menu = Factory::getApplication()->getMenu(); $active = $menu->getActive(); $itemId = $active->id; $link1 = Route::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = Route::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $returnURL = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); $link = new Uri($link1); $link->setVar('return', base64_encode($returnURL)); endif; ?> diff --git a/templates/shaper_helix3/html/com_content/category/blog_links.php b/templates/shaper_helix3/html/com_content/category/blog_links.php index 80f9c58..1b2bf16 100755 --- a/templates/shaper_helix3/html/com_content/category/blog_links.php +++ b/templates/shaper_helix3/html/com_content/category/blog_links.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Router\Route; +use Joomla\Component\Content\Site\Helper\RouteHelper; ?> @@ -18,7 +19,7 @@ foreach ($this->link_items as &$item) : ?>
  • - + title; ?>
    • diff --git a/templates/shaper_helix3/html/com_content/featured/default_item.php b/templates/shaper_helix3/html/com_content/featured/default_item.php index f44ed3f..a234a0c 100755 --- a/templates/shaper_helix3/html/com_content/featured/default_item.php +++ b/templates/shaper_helix3/html/com_content/featured/default_item.php @@ -8,10 +8,11 @@ */ use Joomla\CMS\Factory; -use Joomla\CMS\Layout\LayoutHelper; -use Joomla\CMS\Router\Router; use Joomla\CMS\Uri\Uri; +use Joomla\CMS\Router\Route; use Joomla\Registry\Registry; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\Component\Content\Site\Helper\RouteHelper; defined('_JEXEC') or die; @@ -74,13 +75,13 @@ get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : - $link = Router::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); else : $menu = Factory::getApplication()->getMenu(); $active = $menu->getActive(); $itemId = $active->id; - $link1 = Router::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = Router::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link1 = Route::_('index.php?option=com_users&view=login&Itemid=' . $itemId); + $returnURL = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); $link = new Uri($link1); $link->setVar('return', base64_encode($returnURL)); endif; ?> diff --git a/templates/shaper_helix3/html/com_content/featured/default_links.php b/templates/shaper_helix3/html/com_content/featured/default_links.php index 12a637a..0b30761 100755 --- a/templates/shaper_helix3/html/com_content/featured/default_links.php +++ b/templates/shaper_helix3/html/com_content/featured/default_links.php @@ -10,11 +10,13 @@ defined('_JEXEC') or die; use Joomla\CMS\Router\Route; +use Joomla\Component\Content\Site\Helper\RouteHelper; + ?>
      link_items as &$item) : ?>
    1. - + title; ?>
      2. From ed4d3e4f3e48d153b7240220749bd2d712b0a9ed Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Mon, 17 Oct 2022 16:40:25 +0600 Subject: [PATCH 08/29] update archive override file --- .../html/com_content/archive/default.php | 25 +++++++++++-------- .../com_content/archive/default_items.php | 16 +++++++++--- .../mod_articles_categories/default_items.php | 6 ++--- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/templates/shaper_helix3/html/com_content/archive/default.php b/templates/shaper_helix3/html/com_content/archive/default.php index ac9900b..2f6823d 100755 --- a/templates/shaper_helix3/html/com_content/archive/default.php +++ b/templates/shaper_helix3/html/com_content/archive/default.php @@ -3,28 +3,31 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2022 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; use Joomla\CMS\Router\Route; use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; -defined('_JEXEC') or die; - -HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); -HTMLHelper::_('formbehavior.chosen', 'select'); -// HTMLHelper::_('behavior.caption'); +if (version_compare(JVERSION, '4.0.0', '<')) +{ + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); + HTMLHelper::_('formbehavior.chosen', 'select'); + HTMLHelper::_('behavior.caption'); +} ?>
      params->get('show_page_heading', 1)) : ?> -
      -

      - escape($this->params->get('page_heading')); ?> -

      -
      +
      +

      + escape($this->params->get('page_heading')); ?> +

      +
      +
      diff --git a/templates/shaper_helix3/html/com_content/archive/default_items.php b/templates/shaper_helix3/html/com_content/archive/default_items.php index bcf6515..06a5fbd 100755 --- a/templates/shaper_helix3/html/com_content/archive/default_items.php +++ b/templates/shaper_helix3/html/com_content/archive/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2022 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,11 +13,19 @@ defined('_JEXEC') or die; -HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); +if (version_compare(JVERSION, '4.0.0', '<')) +{ + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); +} + $params = $this->params; + $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category')); $tpl_params = Factory::getApplication()->getTemplate(true)->params; + +$infoBlock = version_compare(JVERSION, '4.0.0', '<') ? 'joomla.content.info_block.block' : 'joomla.content.info_block'; + ?>
      @@ -27,7 +35,7 @@
      - $item, 'params' => $params, 'position' => 'above')); ?> + $item, 'params' => $params, 'position' => 'above')); ?>
      @@ -41,7 +49,7 @@ - $item, 'params' => $params, 'position' => 'below')); ?> + $item, 'params' => $params, 'position' => 'below')); ?> event->afterDisplayContent; ?> diff --git a/templates/shaper_helix3/html/mod_articles_categories/default_items.php b/templates/shaper_helix3/html/mod_articles_categories/default_items.php index 0076e14..0fc5c11 100755 --- a/templates/shaper_helix3/html/mod_articles_categories/default_items.php +++ b/templates/shaper_helix3/html/mod_articles_categories/default_items.php @@ -13,14 +13,14 @@ defined('_JEXEC') or die; foreach ($list as $item) : ?> -
    2. id))) echo ' class="active"';?>> - +
    3. id) : Joomla\Component\Content\Site\Helper\RouteHelper::getCategoryRoute($item->id))) echo ' class="active"';?>> + title;?> get('numitems')) : ?> (numitems; ?>) - + get('show_description', 0)) : ?> description, $item->getParams(), 'mod_articles_categories.content'); ?> From 09efa066dbc532eb2098c4795ea370b54f5007d1 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Mon, 17 Oct 2022 18:00:22 +0600 Subject: [PATCH 09/29] update all override files --- .../html/com_content/archive/default_items.php | 11 ++++------- .../html/com_content/article/default.php | 9 ++++++--- .../html/com_content/article/default_links.php | 4 ++-- .../html/com_content/category/blog_item.php | 5 ++--- .../html/com_content/category/blog_links.php | 4 ++-- .../html/com_content/featured/default_item.php | 4 ++-- .../html/com_content/featured/default_links.php | 3 +-- .../shaper_helix3/html/com_content/form/edit.php | 4 ++-- .../shaper_helix3/html/com_finder/search/default.php | 4 ++-- .../html/com_finder/search/default_form.php | 11 ++++++----- .../html/com_finder/search/default_results.php | 4 ++-- .../shaper_helix3/html/com_mailto/mailto/default.php | 4 +++- .../html/com_search/search/default_form.php | 4 ++-- .../html/com_users/login/default_login.php | 4 ++-- .../html/com_users/login/default_logout.php | 3 ++- .../joomla/content/blog_style_default_item_title.php | 6 +++--- .../joomla/content/blog_style_default_links.php | 2 +- .../layouts/joomla/content/categories_default.php | 4 ++-- .../html/layouts/joomla/content/category_default.php | 3 ++- .../html/layouts/joomla/content/comments/comments.php | 8 ++++---- .../joomla/content/comments/comments_count.php | 8 ++++---- .../joomla/content/comments/engine/count/disqus.php | 5 +++-- .../joomla/content/comments/engine/count/facebook.php | 6 +++--- .../html/layouts/joomla/content/full_image.php | 1 + .../html/layouts/joomla/content/icons.php | 4 ++-- .../html/layouts/joomla/content/icons/create.php | 4 ++-- .../html/layouts/joomla/content/icons/edit.php | 4 ++-- .../html/layouts/joomla/content/icons/edit_lock.php | 4 ++-- .../html/layouts/joomla/content/icons/email.php | 4 ++-- .../html/layouts/joomla/content/icons/print_popup.php | 4 ++-- .../layouts/joomla/content/icons/print_screen.php | 4 ++-- .../html/layouts/joomla/content/info_block/author.php | 4 ++-- .../html/layouts/joomla/content/info_block/block.php | 4 ++-- .../layouts/joomla/content/info_block/category.php | 7 ++++--- .../html/layouts/joomla/content/intro_image.php | 6 +++--- .../html/layouts/joomla/content/options_default.php | 4 ++-- .../html/layouts/joomla/content/rating.php | 4 ++-- .../html/layouts/joomla/content/readmore.php | 2 ++ .../layouts/joomla/content/social_share/share.php | 2 +- .../html/layouts/joomla/content/tags.php | 2 +- .../html/layouts/joomla/editors/buttons.php | 7 +++++-- .../html/layouts/joomla/editors/buttons/button.php | 4 +++- .../html/layouts/joomla/form/renderfield.php | 6 ++++-- .../html/layouts/joomla/system/message.php | 6 ++++-- .../html/layouts/joomla/tinymce/togglebutton.php | 6 ++++-- .../html/mod_articles_categories/default_items.php | 4 ++-- .../html/mod_articles_latest/default.php | 3 ++- .../shaper_helix3/html/mod_breadcrumbs/default.php | 4 ++-- templates/shaper_helix3/html/mod_login/default.php | 4 ++-- .../shaper_helix3/html/mod_login/default_logout.php | 4 ++-- .../shaper_helix3/html/mod_tags_similar/default.php | 4 ++-- 51 files changed, 128 insertions(+), 108 deletions(-) diff --git a/templates/shaper_helix3/html/com_content/archive/default_items.php b/templates/shaper_helix3/html/com_content/archive/default_items.php index 06a5fbd..2911d43 100755 --- a/templates/shaper_helix3/html/com_content/archive/default_items.php +++ b/templates/shaper_helix3/html/com_content/archive/default_items.php @@ -7,12 +7,12 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Layout\LayoutHelper; -defined('_JEXEC') or die; - if (version_compare(JVERSION, '4.0.0', '<')) { HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); @@ -23,9 +23,6 @@ $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category')); $tpl_params = Factory::getApplication()->getTemplate(true)->params; - -$infoBlock = version_compare(JVERSION, '4.0.0', '<') ? 'joomla.content.info_block.block' : 'joomla.content.info_block'; - ?>
      @@ -35,7 +32,7 @@
      - $item, 'params' => $params, 'position' => 'above')); ?> + $item, 'params' => $params, 'position' => 'above')); ?>
      @@ -49,7 +46,7 @@ - $item, 'params' => $params, 'position' => 'below')); ?> + $item, 'params' => $params, 'position' => 'below')); ?> event->afterDisplayContent; ?> diff --git a/templates/shaper_helix3/html/com_content/article/default.php b/templates/shaper_helix3/html/com_content/article/default.php index ac0ce22..4dd0bba 100755 --- a/templates/shaper_helix3/html/com_content/article/default.php +++ b/templates/shaper_helix3/html/com_content/article/default.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Factory; use Joomla\CMS\Uri\Uri; use Joomla\CMS\Router\Route; @@ -15,9 +17,10 @@ use Joomla\CMS\Layout\FileLayout; use Joomla\CMS\Layout\LayoutHelper; -defined('_JEXEC') or die; - -HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); +if (version_compare(JVERSION, '4.0.0', '<')) +{ + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); +} // Create shortcuts to some parameters. $params = $this->item->params; diff --git a/templates/shaper_helix3/html/com_content/article/default_links.php b/templates/shaper_helix3/html/com_content/article/default_links.php index ce9730e..df5e6e5 100755 --- a/templates/shaper_helix3/html/com_content/article/default_links.php +++ b/templates/shaper_helix3/html/com_content/article/default_links.php @@ -7,10 +7,10 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -use Joomla\CMS\HTML\HTMLHelper; - defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; + // Create shortcut $urls = json_decode($this->item->urls); diff --git a/templates/shaper_helix3/html/com_content/category/blog_item.php b/templates/shaper_helix3/html/com_content/category/blog_item.php index 83be563..c2dfbfb 100755 --- a/templates/shaper_helix3/html/com_content/category/blog_item.php +++ b/templates/shaper_helix3/html/com_content/category/blog_item.php @@ -13,7 +13,6 @@ use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; -use Joomla\Component\Content\Site\Helper\RouteHelper; defined('_JEXEC') or die; @@ -73,13 +72,13 @@ get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : - $link = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = Route::_(version_compare(JVERSION, '4.0.0', '<') ? ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language) : Joomla\Component\Content\Site\Helper\RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); else : $menu = Factory::getApplication()->getMenu(); $active = $menu->getActive(); $itemId = $active->id; $link1 = Route::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $returnURL = Route::_(version_compare(JVERSION, '4.0.0', '<') ? ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language) : Joomla\Component\Content\Site\Helper\RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); $link = new Uri($link1); $link->setVar('return', base64_encode($returnURL)); endif; ?> diff --git a/templates/shaper_helix3/html/com_content/category/blog_links.php b/templates/shaper_helix3/html/com_content/category/blog_links.php index 1b2bf16..060ac00 100755 --- a/templates/shaper_helix3/html/com_content/category/blog_links.php +++ b/templates/shaper_helix3/html/com_content/category/blog_links.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Router\Route; -use Joomla\Component\Content\Site\Helper\RouteHelper; + ?> @@ -19,7 +19,7 @@ foreach ($this->link_items as &$item) : ?>
    4. - + title; ?>
      5. diff --git a/templates/shaper_helix3/html/com_content/featured/default_item.php b/templates/shaper_helix3/html/com_content/featured/default_item.php index a234a0c..4955ee4 100755 --- a/templates/shaper_helix3/html/com_content/featured/default_item.php +++ b/templates/shaper_helix3/html/com_content/featured/default_item.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Factory; use Joomla\CMS\Uri\Uri; use Joomla\CMS\Router\Route; @@ -14,8 +16,6 @@ use Joomla\CMS\Layout\LayoutHelper; use Joomla\Component\Content\Site\Helper\RouteHelper; -defined('_JEXEC') or die; - // Create a shortcut for params. $params = &$this->item->params; $tpl_params = Factory::getApplication()->getTemplate(true)->params; diff --git a/templates/shaper_helix3/html/com_content/featured/default_links.php b/templates/shaper_helix3/html/com_content/featured/default_links.php index 0b30761..e494b12 100755 --- a/templates/shaper_helix3/html/com_content/featured/default_links.php +++ b/templates/shaper_helix3/html/com_content/featured/default_links.php @@ -10,13 +10,12 @@ defined('_JEXEC') or die; use Joomla\CMS\Router\Route; -use Joomla\Component\Content\Site\Helper\RouteHelper; ?>
        link_items as &$item) : ?>
      1. - + title; ?>
        2. diff --git a/templates/shaper_helix3/html/com_content/form/edit.php b/templates/shaper_helix3/html/com_content/form/edit.php index 90259ef..ec2dd3c 100644 --- a/templates/shaper_helix3/html/com_content/form/edit.php +++ b/templates/shaper_helix3/html/com_content/form/edit.php @@ -7,12 +7,12 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Router\Route; use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; -defined('_JEXEC') or die; - HTMLHelper::_('behavior.keepalive'); HTMLHelper::_('behavior.formvalidator'); // HTMLHelper::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0)); diff --git a/templates/shaper_helix3/html/com_finder/search/default.php b/templates/shaper_helix3/html/com_finder/search/default.php index cd70f26..345fc04 100644 --- a/templates/shaper_helix3/html/com_finder/search/default.php +++ b/templates/shaper_helix3/html/com_finder/search/default.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined ('_JEXEC') or die(); + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -defined ('_JEXEC') or die(); - if(JVERSION < 4) { HTMLHelper::_('behavior.core'); diff --git a/templates/shaper_helix3/html/com_finder/search/default_form.php b/templates/shaper_helix3/html/com_finder/search/default_form.php index 7115c78..efee0bb 100644 --- a/templates/shaper_helix3/html/com_finder/search/default_form.php +++ b/templates/shaper_helix3/html/com_finder/search/default_form.php @@ -6,12 +6,13 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Router\Route; - defined ('_JEXEC') or die(); +use Joomla\CMS\Factory; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper; + if (JVERSION < 4) { if ($this->params->get('show_advanced', 1) || $this->params->get('show_autosuggest', 1)) @@ -62,7 +63,7 @@ $script .= " });"; - JFactory::getDocument()->addScriptDeclaration($script); + Factory::getDocument()->addScriptDeclaration($script); } } else diff --git a/templates/shaper_helix3/html/com_finder/search/default_results.php b/templates/shaper_helix3/html/com_finder/search/default_results.php index fa65dd4..1818092 100644 --- a/templates/shaper_helix3/html/com_finder/search/default_results.php +++ b/templates/shaper_helix3/html/com_finder/search/default_results.php @@ -6,14 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined ('_JEXEC') or die(); + use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; -defined ('_JEXEC') or die(); - ?> suggested && $this->params->get('show_suggested_query', 1)) || ($this->explained && $this->params->get('show_explained_query', 1))) : ?> diff --git a/templates/shaper_helix3/html/com_mailto/mailto/default.php b/templates/shaper_helix3/html/com_mailto/mailto/default.php index 643b746..4652de5 100755 --- a/templates/shaper_helix3/html/com_mailto/mailto/default.php +++ b/templates/shaper_helix3/html/com_mailto/mailto/default.php @@ -7,13 +7,15 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Router; use Joomla\CMS\Uri\Uri; -defined('_JEXEC') or die; + HTMLHelper::_('behavior.core'); HTMLHelper::_('behavior.keepalive'); diff --git a/templates/shaper_helix3/html/com_search/search/default_form.php b/templates/shaper_helix3/html/com_search/search/default_form.php index 0ff8560..940f077 100644 --- a/templates/shaper_helix3/html/com_search/search/default_form.php +++ b/templates/shaper_helix3/html/com_search/search/default_form.php @@ -6,13 +6,13 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('_JEXEC') or die; + use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; -defined('_JEXEC') or die; - HTMLHelper::_('bootstrap.tooltip'); $lang = Factory::getLanguage(); diff --git a/templates/shaper_helix3/html/com_users/login/default_login.php b/templates/shaper_helix3/html/com_users/login/default_login.php index 17f2c39..8c5e814 100644 --- a/templates/shaper_helix3/html/com_users/login/default_login.php +++ b/templates/shaper_helix3/html/com_users/login/default_login.php @@ -7,14 +7,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Router\Route; use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Component\ComponentHelper; -defined('_JEXEC') or die; - HTMLHelper::_('behavior.keepalive'); ?> diff --git a/templates/shaper_helix3/html/com_users/login/default_logout.php b/templates/shaper_helix3/html/com_users/login/default_logout.php index 407f8ef..dd226c7 100644 --- a/templates/shaper_helix3/html/com_users/login/default_logout.php +++ b/templates/shaper_helix3/html/com_users/login/default_logout.php @@ -7,11 +7,12 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; -defined('_JEXEC') or die; ?>
        diff --git a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php index 68da776..5bc26d1 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_item_title.php @@ -6,13 +6,13 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('_JEXEC') or die; + use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; -defined('_JEXEC') or die; - // Create a shortcut for params. $params = $displayData->params; $canEdit = $displayData->params->get('access-edit'); @@ -27,7 +27,7 @@ get('show_title')) : ?>

        get('link_titles') && $params->get('access-view')) : ?> - escape($displayData->title); ?> diff --git a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php index cc18693..6148610 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/blog_style_default_links.php @@ -14,7 +14,7 @@
          get('link_items') as $item) : ?>
        1. - + title; ?>
          2. diff --git a/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php b/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php index 25aba13..787f4ff 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/categories_default.php @@ -6,10 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -use Joomla\CMS\HTML\HTMLHelper; - defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; + ?>
          params->get('show_page_heading')) : ?> diff --git a/templates/shaper_helix3/html/layouts/joomla/content/category_default.php b/templates/shaper_helix3/html/layouts/joomla/content/category_default.php index acaf35f..deb5a51 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/category_default.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/category_default.php @@ -6,11 +6,12 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('JPATH_BASE') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; -defined('JPATH_BASE') or die; // Note that this layout opens a div with the page class suffix. If you do not use the category children // layout you need to close this div either by overriding this file or in your main layout. diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php index 438dbe9..8420a11 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments.php @@ -6,19 +6,19 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +//no direct access +defined('_JEXEC') or die('Restricted Access'); + use Joomla\CMS\Factory; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; -//no direct access -defined('_JEXEC') or die('Restricted Access'); - $params = Factory::getApplication()->getTemplate(true)->params; if ($params->get('commenting_engine') != 'disabled') { - $url = Route::_(ContentHelperRoute::getArticleRoute($displayData->id . ':' . $displayData->alias, $displayData->catid, $displayData->language)); + $url = Route::_(version_compare(JVERSION, '4.0.0', '<') ? ContentHelperRoute::getArticleRoute($displayData->id . ':' . $displayData->alias, $displayData->catid, $displayData->language) : Joomla\Component\Content\Site\Helper\RouteHelper::getArticleRoute($displayData->id . ':' . $displayData->alias, $displayData->catid, $displayData->language)); $root = Uri::base(); $root = new Uri($root); $url = $root->getScheme() . '://' . $root->getHost() . $url; diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php index 95a5c92..96efbe2 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/comments_count.php @@ -6,18 +6,18 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +//no direct access +defined('_JEXEC') or die('Restricted Access'); + use Joomla\CMS\Factory; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; -//no direct access -defined('_JEXEC') or die('Restricted Access'); - $params = Factory::getApplication()->getTemplate(true)->params; if (($params->get('commenting_engine') != 'disabled') && ($params->get('comments_count'))) : - $url = Route::_(ContentHelperRoute::getArticleRoute($displayData['item']->id . ':' . $displayData['item']->alias, $displayData['item']->catid, $displayData['item']->language)); + $url = Route::_(version_compare(JVERSION, '4.0.0', '<') ? ContentHelperRoute::getArticleRoute($displayData['item']->id . ':' . $displayData['item']->alias, $displayData['item']->catid, $displayData['item']->language) : Joomla\Component\Content\Site\Helper\RouteHelper::getArticleRoute($displayData['item']->id . ':' . $displayData['item']->alias, $displayData['item']->catid, $displayData['item']->language)); $root = Uri::base(); $root = new Uri($root); $url = $root->getScheme() . '://' . $root->getHost() . $url; diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php index 0a82916..f0bbea3 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/disqus.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -use Joomla\CMS\Factory; - //no direct access defined('_JEXEC') or die('Restricted Access'); +use Joomla\CMS\Factory; + if ($displayData['params']->get('disqus_subdomain') != '') { $doc = Factory::getDocument(); @@ -20,6 +20,7 @@ ob_start(); $devmode = $displayData['params']->get('disqus_devmode'); + if ($devmode) { echo 'var disqus_developer = "1";'; diff --git a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php index 0a6861a..707f6b4 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/comments/engine/count/facebook.php @@ -6,12 +6,12 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; - //no direct access defined('_JEXEC') or die('Restricted Access'); +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; + if ($displayData['params']->get('fb_appID') != '') { $doc = Factory::getDocument(); diff --git a/templates/shaper_helix3/html/layouts/joomla/content/full_image.php b/templates/shaper_helix3/html/layouts/joomla/content/full_image.php index ff0edbc..2bda3f0 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/full_image.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/full_image.php @@ -7,6 +7,7 @@ */ defined('_JEXEC') or die; + $params = $displayData->params; $attribs = json_decode($displayData->attribs); $images = json_decode($displayData->images); diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons.php b/templates/shaper_helix3/html/layouts/joomla/content/icons.php index 1567bbe..56cc19f 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons.php @@ -6,10 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -use Joomla\CMS\HTML\HTMLHelper; - defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; + $canEdit = $displayData['params']->get('access-edit'); $articleId = $displayData['item']->id; ?> diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php index 7aeed9d..7d72512 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/create.php @@ -6,10 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -use Joomla\CMS\Language\Text; - defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; + $params = $displayData['params']; ?> get('show_icons')) : ?> diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php index f7d45dc..5714a5b 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('_JEXEC') or die; + use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -defined('_JEXEC') or die; - $article = $displayData['article']; $currentDate = Factory::getDate()->format('Y-m-d H:i:s'); diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php index 197985b..3a8a09a 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/edit_lock.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('_JEXEC') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -defined('_JEXEC') or die; - $tooltip = $displayData['tooltip']; ?> diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php index 06e58f0..b75d583 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/email.php @@ -6,10 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ -use Joomla\CMS\Language\Text; - defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; + $params = $displayData['params']; ?> get('show_icons')) : ?> diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php index cc48fe0..e46f05d 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_popup.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('_JEXEC') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -defined('_JEXEC') or die; - $params = $displayData['params']; $legacy = $displayData['legacy']; diff --git a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php index cc48fe0..e46f05d 100644 --- a/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/icons/print_screen.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('_JEXEC') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -defined('_JEXEC') or die; - $params = $displayData['params']; $legacy = $displayData['legacy']; diff --git a/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php b/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php index 82e8e43..ec65929 100755 --- a/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php +++ b/templates/shaper_helix3/html/layouts/joomla/content/info_block/author.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or later */ +defined('JPATH_BASE') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -defined('JPATH_BASE') or die; - ?>

        - params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?> + params->get('logindescription_show') == 1 && str_replace(' ', '', !empty($this->params->get('login_description')) ? $this->params->get('login_description') : '') != '') || $this->params->get('login_image') != '') : ?> diff --git a/templates/shaper_helix3/html/layouts/chromes/sp_xhtml.php b/templates/shaper_helix3/html/layouts/chromes/sp_xhtml.php index 36c8ba9..2f81675 100644 --- a/templates/shaper_helix3/html/layouts/chromes/sp_xhtml.php +++ b/templates/shaper_helix3/html/layouts/chromes/sp_xhtml.php @@ -17,15 +17,15 @@ return; } -$moduleTag = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8'); +$moduleTag = htmlspecialchars(!empty($params->get('module_tag', 'div')) ? $params->get('module_tag', 'div') : '', ENT_QUOTES, 'UTF-8'); $bootstrapSize = (int) $params->get('bootstrap_size', 0); $moduleClass = $bootstrapSize !== 0 ? ' col-sm-' . $bootstrapSize : ''; -$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8'); -$headerClass = htmlspecialchars($params->get('header_class', 'sp-module-title'), ENT_COMPAT, 'UTF-8'); +$headerTag = htmlspecialchars(!empty($params->get('header_tag', 'h3')) ? $params->get('header_tag', 'h3') : '', ENT_QUOTES, 'UTF-8'); +$headerClass = htmlspecialchars(!empty($params->get('header_class', 'sp-module-title')) ? $params->get('header_class', 'sp-module-title') : '', ENT_COMPAT, 'UTF-8'); if ($module->content) { - echo '<' . $moduleTag . ' class="sp-module ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass . '">'; + echo '<' . $moduleTag . ' class="sp-module ' . htmlspecialchars(!empty($params->get('moduleclass_sfx')) ? $params->get('moduleclass_sfx') : '', ENT_COMPAT, 'UTF-8') . $moduleClass . '">'; if ($module->showtitle) { echo '<' . $headerTag . ' class="' . $headerClass . '">' . $module->title . ''; From a113f93e34c7666a37ea718d9dcfff539d52afd8 Mon Sep 17 00:00:00 2001 From: prakash-a7x Date: Wed, 19 Oct 2022 10:32:14 +0600 Subject: [PATCH 14/29] helix.php warning fix --- plugins/system/helix3/helix3.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/system/helix3/helix3.php b/plugins/system/helix3/helix3.php index 6296963..926300f 100644 --- a/plugins/system/helix3/helix3.php +++ b/plugins/system/helix3/helix3.php @@ -258,7 +258,7 @@ function onAfterRender() { $body = Factory::getApplication()->getBody(); $preset = Helix3::Preset(); - $body = str_replace('{helix_preset}', $preset, $body); + $body = str_replace('{helix_preset}', !empty($preset) ? $preset : '', $body); Factory::getApplication()->setBody($body); } From 71faa9153e9071076c607420b5e2e780b10fd9a3 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Wed, 2 Nov 2022 12:25:15 +0600 Subject: [PATCH 15/29] update routehelper --- .../shaper_helix3/html/com_content/featured/default_item.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/shaper_helix3/html/com_content/featured/default_item.php b/templates/shaper_helix3/html/com_content/featured/default_item.php index 4955ee4..4654e39 100755 --- a/templates/shaper_helix3/html/com_content/featured/default_item.php +++ b/templates/shaper_helix3/html/com_content/featured/default_item.php @@ -14,7 +14,6 @@ use Joomla\CMS\Router\Route; use Joomla\Registry\Registry; use Joomla\CMS\Layout\LayoutHelper; -use Joomla\Component\Content\Site\Helper\RouteHelper; // Create a shortcut for params. $params = &$this->item->params; @@ -75,13 +74,13 @@ get('show_readmore') && $this->item->readmore) : if ($params->get('access-view')) : - $link = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $link = Route::_(version_compare(JVERSION,'4.0.0', '<') ? ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language) : Joomla\Component\Content\Site\Helper\RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); else : $menu = Factory::getApplication()->getMenu(); $active = $menu->getActive(); $itemId = $active->id; $link1 = Route::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + $returnURL = Route::_(version_compare(JVERSION,'4.0.0', '<') ? ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language) : Joomla\Component\Content\Site\Helper\RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); $link = new Uri($link1); $link->setVar('return', base64_encode($returnURL)); endif; ?> From a000e102e3d08a36cd6f3fe46ffe333893c505f2 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Wed, 2 Nov 2022 15:26:51 +0600 Subject: [PATCH 16/29] remove call_to_action, image_content, testimonialpro addon overwride --- .../addons/call_to_action/admin.php | 189 --------- .../addons/call_to_action/icon.png | Bin 1346 -> 0 bytes .../addons/call_to_action/site.php | 134 ------ .../addons/image_content/admin.php | 393 ------------------ .../addons/image_content/icon.png | Bin 656 -> 0 bytes .../addons/image_content/site.php | 271 ------------ .../addons/testimonialpro/admin.php | 144 ------- .../addons/testimonialpro/icon.png | Bin 1472 -> 0 bytes .../addons/testimonialpro/site.php | 151 ------- templates/shaper_helix3/templateDetails.xml | 1 - 10 files changed, 1283 deletions(-) delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/call_to_action/icon.png delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/call_to_action/site.php delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/image_content/icon.png delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/image_content/site.php delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/testimonialpro/icon.png delete mode 100755 templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php diff --git a/templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php b/templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php deleted file mode 100755 index 0dd1376..0000000 --- a/templates/shaper_helix3/sppagebuilder/addons/call_to_action/admin.php +++ /dev/null @@ -1,189 +0,0 @@ -'content', - 'addon_name'=>'sp_call_to_action', - 'category'=>'Helix 3', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_DESC'), - 'attr'=>array( - 'title'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_TITLE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_TITLE_DESC'), - 'std'=>'Call to action title', - ), - - 'heading_selector'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_DESC'), - 'values'=>array( - 'h1'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H1'), - 'h2'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H2'), - 'h3'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H3'), - 'h4'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H4'), - 'h5'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H5'), - 'h6'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H6'), - ), - 'std'=>'h3', - ), - - 'title_fontsize'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE_DESC'), - 'std'=>'' - ), - - 'title_text_color'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR_DESC'), - ), - - 'title_margin_top'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP_DESC'), - 'placeholder'=>'10', - ), - - 'title_margin_bottom'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM_DESC'), - 'placeholder'=>'10', - ), - - 'subtitle'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_SUBTITLE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_SUBTITLE_DESC'), - 'std'=>'Call to action sub title', - ), - 'subtitle_fontsize'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_FONT_SIZE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_FONT_SIZE_DESC'), - 'std'=>'' - ), - 'subtitle_text_color'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_TEXT_COLOR'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_SUB_TITLE_TEXT_COLOR_DESC'), - ), - 'text'=>array( - 'type'=>'editor', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_CONTENT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_CONTENT_DESC'), - ), - 'background'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BACKGROUND'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BACKGROUND_DESC'), - ), - 'color'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_COLOR'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_COLOR_DESC'), - ), - 'padding'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_PADDING'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_PADDING_DESC'), - 'placeholder'=>'20', - ), - //Button - 'button_text'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TEXT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TEXT_DESC'), - 'std'=>'Button Text', - ), - 'button_url'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_URL'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_URL_DESC'), - 'std'=>'http://' - ), - 'button_size'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_DESC'), - 'values'=>array( - ''=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_DEFAULT'), - 'lg'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_LARGE'), - 'sm'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_SMALL'), - 'xs'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_SIZE_EXTRA_SAMLL'), - ), - ), - 'button_type'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TYPE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_TYPE_DESC'), - 'values'=>array( - 'default'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DEFAULT'), - 'primary'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_PRIMARY'), - 'success'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_SUCCESS'), - 'info'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_INFO'), - 'warning'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_WARNING'), - 'danger'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DANGER'), - 'link'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK'), - ), - 'std'=>'default', - ), - 'button_icon'=>array( - 'type'=>'icon', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_ICON'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_BUTTON_ICON_DESC'), - ), - 'button_block'=>array( - 'type'=>'select', - 'title'=> 'Button Full Width', - 'desc'=>'Button block', - 'values'=>array( - ''=> 'No', - 'sppb-btn-block'=> 'Yes' - ) - ), - 'button_target'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_DESC'), - 'values'=>array( - ''=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_SAME_WINDOW'), - '_blank'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_NEW_WINDOW'), - ), - ), - 'button_position'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_BUTTON_POSITION'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CTA_BUTTON_POSITION_DESC'), - 'values'=>array( - 'right'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_RIGHT'), - 'bottom'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_BOTTOM'), - ), - ), - 'class'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), - 'std'=> '' - ), - ) - ) - ); \ No newline at end of file diff --git a/templates/shaper_helix3/sppagebuilder/addons/call_to_action/icon.png b/templates/shaper_helix3/sppagebuilder/addons/call_to_action/icon.png deleted file mode 100755 index d1040c4f8501969b05067d9ae4485c02e2f34c4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1346 zcmbVMT}&KR6rN=f8l;2}l2SwMWN6ybFgyRdGgFrBvb)%AT%bTw8k@-cTwsKm+0G2? zLaV!ALR&~0e5+|%#k6Uwi80nxk{Y`)w1ya4v}qsuV8v)`P*Y7cMJwQ4V9^Kk!AWNB zz2~0qobUY2iRQ-VHWocogdoVq=-zM(T+!^ip#XmE!NFhQve}8WJFRA?laMTc1XWW8 zXjGTFKnsx6fy2|F7D3!et*zZ@k3BCcrtXolI-aB+hiC+;4J6}|(gPe+23?xr#~xn2 zhM}73#}05YG8PYkZf)k5v1Pj=+-JoE zhAyi(J$`J3RC}x$4Ve}|IS+>`Bu$|{!9#JJ&qvpwG)b`pNf8u-Q-a8{B1xjF4+gzi zYNyx|ZdmmNPkyZ1apEFDBoYZvg7KJE7eNVvK#(*+(>T~?V_j{#Z6FSa z7GRrwmICY1S(O9B-2JzstRiG1Hdz`hiqso6l|CI9PBiSt;EhMsRFRiERa)`UxR>R@x9OO6w;4x6q2;QhJ7bcf8ChX< zwoof^hk>Q_1GT|2b#yt?qP89jj`s=@OXI4{kT3(XfJ-uLAz6}X;Po-Q!1=IMy!wAL zNI+6Vwq5?wJ~h>J^d`}8_ z|IxOc`J)vDCFR4F9dx>cbP4GMvL*A`6q)JBY{}H??x*yF73KAl6^o1Wx8j%nWELus z%cst4ExVW!7H{v!pTS3lKE0Znx$By&DR{E@eQIP=&nsWvaLw0jzw>yTkggbu{^s9b zg5H&_qfIlenoo+0=ccC)oILl(*^8yg)FYppDXbddKg?&`% '', - "heading_selector" => 'h3', - "title_fontsize" => '', - "title_text_color" => '', - "title_margin_top" => '', - "title_margin_bottom" => '', - "subtitle_fontsize" => '', - "subtitle" => '', - "subtitle_text_color" => '', - "text" => '', - "background" => '', - "color" => '', - "padding" => '', - "button_text" =>'', - "button_url" =>'', - "button_size" =>'', - "button_type" =>'', - "button_icon" =>'', - "button_block" =>'', - "button_target" =>'', - "button_position" =>'', - "class"=>'', - ), $atts)); - - $style = ''; - - if($button_icon) { - $button_text = ' ' . $button_text; - } - - if($background) { - $style .= 'background-color: ' . $background . ';padding:40px 20px;'; - } - - if($color) { - $style .= 'color: ' . $color . ';'; - } - - if($padding) { - $style .= 'padding: ' . (int)$padding . 'px;'; - } - - $button_output = '' . $button_text . ''; - - $output = '
        '; - - if($button_position=='right') { - - $output .= '
        '; - - $output .= '
        '; - - if($title) { - - $title_style = ''; - if($title_margin_top) $title_style .= 'margin-top:' . (int) $title_margin_top . 'px;'; - if($title_margin_bottom) $title_style .= 'margin-bottom:' . (int) $title_margin_bottom . 'px;'; - if($title_text_color) $title_style .= 'color:' . $title_text_color . ';'; - if($title_fontsize) $title_style .= 'font-size:'.$title_fontsize.'px;line-height:'.$title_fontsize.'px;'; - - $output .= '<'.$heading_selector.' class="sppb-cta-title" style="' . $title_style . '">' . $title . ''; - } - - if($subtitle) { - - $subtitle_style = ''; - - if($subtitle_text_color) $subtitle_style .= 'color:' . $subtitle_text_color . ';'; - if($subtitle_fontsize) $subtitle_style .= 'font-size:'.$subtitle_fontsize.'px;line-height:'.$subtitle_fontsize.'px;'; - - $output .= '

        ' . $subtitle . '

        '; - } - - - if($text) $output .= '

        ' . $text . '

        '; - - $output .= '
        '; - - $output .= '
        '; - $output .= $button_output; - $output .= '
        '; - - $output .= '
        '; - - - } else { - - $output .= '
        '; - - if($title) { - - $title_style = ''; - if($title_margin_top) $title_style .= 'margin-top:' . (int) $title_margin_top . 'px;'; - if($title_margin_bottom) $title_style .= 'margin-bottom:' . (int) $title_margin_bottom . 'px;'; - if($title_text_color) $title_style .= 'color:' . $title_text_color . ';'; - if($title_fontsize) $title_style .= 'font-size:'.$title_fontsize.'px;line-height:'.$title_fontsize.'px;'; - - $output .= '<'.$heading_selector.' class="sppb-cta-title" style="' . $title_style . '">' . $title . ''; - } - - if($subtitle) { - - $subtitle_style = ''; - - if($subtitle_text_color) $subtitle_style .= 'color:' . $subtitle_text_color . ';'; - if($subtitle_fontsize) $subtitle_style .= 'font-size:'.$subtitle_fontsize.'px;line-height:'.$subtitle_fontsize.'px;'; - - $output .= '

        ' . $subtitle . '

        '; - } - - if($text) $output .= '

        ' . $text . '

        '; - - $output .= '
        '; - $output .= $button_output; - $output .= '
        '; - - $output .= '
        '; - - } - - $output .= '
        '; - - return $output; - -} diff --git a/templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php b/templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php deleted file mode 100755 index 927c53e..0000000 --- a/templates/shaper_helix3/sppagebuilder/addons/image_content/admin.php +++ /dev/null @@ -1,393 +0,0 @@ -'content', - 'addon_name'=>'sp_image_content', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_DESC'), - 'attr'=>array( - 'general' => array( - - 'admin_label'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL_DESC'), - 'std'=> '' - ), - - 'separator1'=>array( - 'type'=>'separator', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE') - ), - - 'image'=>array( - 'type'=>'media', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE'), - ), - - 'image_alignment'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE_ALIGNMENT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_IMAGE_ALIGNMENT_DESC'), - 'values'=>array( - 'left'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LEFT'), - 'right'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_RIGHT'), - ), - 'std'=>'left', - ), - - 'separator2'=>array( - 'type'=>'separator', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT') - ), - - 'title'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_TITLE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_TITLE_DESC'), - ), - - 'heading_selector'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_DESC'), - 'values'=>array( - 'h1'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H1'), - 'h2'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H2'), - 'h3'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H3'), - 'h4'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H4'), - 'h5'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H5'), - 'h6'=>Text::_('COM_SPPAGEBUILDER_ADDON_HEADINGS_H6'), - ), - 'std'=>'h3', - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_fontsize'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_SIZE_DESC'), - 'std'=>'', - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_lineheight'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_LINE_HEIGHT'), - 'std'=>'', - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_fontstyle'=>array( - 'type'=>'select', - 'title'=> Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_STYLE'), - 'values'=>array( - 'underline'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UNDERLINE'), - 'uppercase'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UPPERCASE'), - 'italic'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_ITALIC'), - 'lighter'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_LIGHTER'), - 'normal'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_NORMAL'), - 'bold'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLD'), - 'bolder'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLDER'), - ), - 'multiple'=>true, - 'std'=>'', - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_letterspace'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LETTER_SPACING'), - 'values'=>array( - '0'=> 'Default', - '1px'=> '1px', - '2px'=> '2px', - '3px'=> '3px', - '4px'=> '4px', - '5px'=> '5px', - '6px'=> '6px', - '7px'=> '7px', - '8px'=> '8px', - '9px'=> '9px', - '10px'=> '10px' - ), - 'std'=>'0', - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_fontweight'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_WEIGHT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_FONT_WEIGHT_DESC'), - 'std'=>'', - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_text_color'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_TEXT_COLOR_DESC'), - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_margin_top'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_TOP_DESC'), - 'placeholder'=>'10', - 'depends'=>array(array('title', '!=', '')), - ), - - 'title_margin_bottom'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TITLE_MARGIN_BOTTOM_DESC'), - 'placeholder'=>'10', - 'depends'=>array(array('title', '!=', '')), - ), - - 'text'=>array( - 'type'=>'editor', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_IMAGE_CONTENT_CONTENT_DESC'), - ), - - //Button - 'button_text'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_TEXT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_TEXT_DESC'), - 'std'=>'Button Text', - ), - - 'button_fontstyle'=>array( - 'type'=>'select', - 'title'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_FONT_STYLE'), - 'values'=>array( - 'underline'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UNDERLINE'), - 'uppercase'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_UPPERCASE'), - 'italic'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_ITALIC'), - 'lighter'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_LIGHTER'), - 'normal'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_NORMAL'), - 'bold'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLD'), - 'bolder'=> Text::_('COM_SPPAGEBUILDER_GLOBAL_FONT_STYLE_BOLDER'), - ), - 'multiple'=>true, - 'std'=>'', - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_letterspace'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_LETTER_SPACING'), - 'values'=>array( - '0'=> 'Default', - '1px'=> '1px', - '2px'=> '2px', - '3px'=> '3px', - '4px'=> '4px', - '5px'=> '5px', - '6px'=> '6px', - '7px'=> '7px', - '8px'=> '8px', - '9px'=> '9px', - '10px'=> '10px' - ), - 'std'=>'0', - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_url'=>array( - 'type'=>'media', - 'format'=>'attachment', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_URL'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_URL_DESC'), - 'placeholder'=>'http://', - 'depends'=> array( - array('button_text', '!=', ''), - ), - ), - - 'button_target'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK_NEWTAB'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK_NEWTAB_DESC'), - 'values'=>array( - ''=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_SAME_WINDOW'), - '_blank'=>Text::_('COM_SPPAGEBUILDER_ADDON_GLOBAL_TARGET_NEW_WINDOW'), - ), - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_type'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_STYLE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_STYLE_DESC'), - 'values'=>array( - 'default'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DEFAULT'), - 'primary'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_PRIMARY'), - 'success'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_SUCCESS'), - 'info'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_INFO'), - 'warning'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_WARNING'), - 'danger'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_DANGER'), - 'link'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LINK'), - 'custom'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_CUSTOM'), - ), - 'std'=>'default', - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_appearance'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_DESC'), - 'values'=>array( - ''=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_FLAT'), - 'outline'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_OUTLINE'), - '3d'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_APPEARANCE_3D'), - ), - 'std'=>'flat', - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_background_color'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_DESC'), - 'std' => '#444444', - 'depends'=> array( - array('button_type', '=', 'custom'), - array('button_text', '!=', ''), - ) - ), - - 'button_color'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_DESC'), - 'std' => '#fff', - 'depends'=> array( - array('button_type', '=', 'custom'), - array('button_text', '!=', ''), - ) - ), - - 'button_background_color_hover'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_HOVER'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BACKGROUND_COLOR_HOVER_DESC'), - 'std' => '#222', - 'depends'=> array( - array('button_type', '=', 'custom'), - array('button_text', '!=', ''), - ) - ), - - 'button_color_hover'=>array( - 'type'=>'color', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_HOVER'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_COLOR_HOVER_DESC'), - 'std' => '#fff', - 'depends'=> array( - array('button_type', '=', 'custom'), - array('button_text', '!=', ''), - ) - ), - - 'button_size'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_DESC'), - 'values'=>array( - ''=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_DEFAULT'), - 'lg'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_LARGE'), - 'xlg'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_XLARGE'), - 'sm'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_SMALL'), - 'xs'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SIZE_EXTRA_SAMLL'), - ), - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_shape'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_DESC'), - 'values'=>array( - 'rounded'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_ROUNDED'), - 'square'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_SQUARE'), - 'round'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_SHAPE_ROUND'), - ), - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_block'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BLOCK'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_BLOCK_DESC'), - 'values'=>array( - ''=>Text::_('JNO'), - 'sppb-btn-block'=>Text::_('JYES'), - ), - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_icon'=>array( - 'type'=>'icon', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON_DESC'), - 'depends'=> array( - array('button_text', '!=', ''), - ) - ), - - 'button_icon_position'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_BUTTON_ICON_POSITION'), - 'values'=>array( - 'left'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_LEFT'), - 'right'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_RIGHT'), - ), - 'depends'=> array( - array('button_text', '!=', ''), - ), - ), - - 'class'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), - 'std'=>'' - ), - - ), - ), - ) -); diff --git a/templates/shaper_helix3/sppagebuilder/addons/image_content/icon.png b/templates/shaper_helix3/sppagebuilder/addons/image_content/icon.png deleted file mode 100755 index ada79d815a31014b9cf36c2c1403e9e17390ab63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 656 zcmV;B0&o3^P)1RCwBA{E~0N00q84TnNObK+MBH z8}J2)PXlou5N`nqFhM0+fOr!SJJQf{2B_H}J2pe@WMBk_fDcq)Ab=kz1d1324ithM zU^0LXFabG$cK{v0%fv9iVAKIDC>;BA1_mzDlf>U+YZ(52d_b84SUgJ@*xkd)GUUId zJHxj+SIQi~tgHj3zZRG>Fq=j)Fp5YM`I+SG}H|380#E$4`aluduNO&Nal zpoR(~zXD!If#g}76Bzz~|AJkflZWBY>Fo^vAD_f@06103sw3E zAUn!HZNmSf?SWAT473A251{>DKn^%FfDSkfazOt8I-s8k+AnM!0LwvkZiXeo8X)!u q;{BjzAq_443bn%zY9|9gfB^vL6|iDv7@;@-0000addon->settings->class) && $this->addon->settings->class) ? $this->addon->settings->class : ''; - $title = (isset($this->addon->settings->title) && $this->addon->settings->title) ? $this->addon->settings->title : ''; - $heading_selector = (isset($this->addon->settings->heading_selector) && $this->addon->settings->heading_selector) ? $this->addon->settings->heading_selector : 'h3'; - - //Options - $image = (isset($this->addon->settings->image) && $this->addon->settings->image) ? $this->addon->settings->image : ''; - $image_width = (isset($this->addon->settings->image_width) && $this->addon->settings->image_width) ? $this->addon->settings->image_width : ''; - $image_alignment = (isset($this->addon->settings->image_alignment) && $this->addon->settings->image_alignment) ? $this->addon->settings->image_alignment : ''; - $text = (isset($this->addon->settings->text) && $this->addon->settings->text) ? $this->addon->settings->text : ''; - $button_text = (isset($this->addon->settings->button_text) && $this->addon->settings->button_text) ? $this->addon->settings->button_text : ''; - $button_url = (isset($this->addon->settings->button_url) && $this->addon->settings->button_url) ? $this->addon->settings->button_url : ''; - $button_classes = (isset($this->addon->settings->button_size) && $this->addon->settings->button_size) ? ' sppb-btn-' . $this->addon->settings->button_size : ''; - $button_classes .= (isset($this->addon->settings->button_type) && $this->addon->settings->button_type) ? ' sppb-btn-' . $this->addon->settings->button_type : ''; - $button_classes .= (isset($this->addon->settings->button_shape) && $this->addon->settings->button_shape) ? ' sppb-btn-' . $this->addon->settings->button_shape: ' sppb-btn-rounded'; - $button_classes .= (isset($this->addon->settings->button_appearance) && $this->addon->settings->button_appearance) ? ' sppb-btn-' . $this->addon->settings->button_appearance : ''; - $button_classes .= (isset($this->addon->settings->button_block) && $this->addon->settings->button_block) ? ' ' . $this->addon->settings->button_block : ''; - $button_icon = (isset($this->addon->settings->button_icon) && $this->addon->settings->button_icon) ? $this->addon->settings->button_icon : ''; - $button_icon_position = (isset($this->addon->settings->button_icon_position) && $this->addon->settings->button_icon_position) ? $this->addon->settings->button_icon_position: 'left'; - $button_position = (isset($this->addon->settings->button_position) && $this->addon->settings->button_position) ? $this->addon->settings->button_position : ''; - $button_attribs = (isset($this->addon->settings->button_target) && $this->addon->settings->button_target) ? ' target="' . $this->addon->settings->button_target . '"' : ''; - $button_attribs .= (isset($this->addon->settings->button_url) && $this->addon->settings->button_url) ? ' href="' . $this->addon->settings->button_url . '"' : ''; - - if($button_icon_position == 'left') { - $button_text = ($button_icon) ? ' ' . $button_text : $button_text; - } else { - $button_text = ($button_icon) ? $button_text . ' ' : $button_text; - } - $button_output = ''; - if ($button_text) { - $button_output = '' . $button_text . ''; - } - - if($image_alignment=='left') { - $content_class = ' sppb-col-sm-offset-6'; - } else { - $content_class = ''; - } - - if($image && $text) { - - $output = '
        '; - - //Image - $output .= '
        '; - $output .= '
        '; - - //Content - $output .= '
        '; - $output .= '
        '; - - $output .= '
        '; - $output .= '
        '; - $output .= ($title) ? '<'.$heading_selector.' class="sppb-image-content-title">' . $title . '' : ''; - $output .= ($text) ? '

        ' . $text . '

        ' : ''; - - $output .= $button_output; - - $output .= '
        '; - $output .= '
        '; - $output .= '
        '; - $output .= '
        '; - - $output .= '
        '; - - return $output; - } - - return; - } - - public function css() { - $addon_id = '#sppb-addon-' . $this->addon->id; - $layout_path = JPATH_ROOT . '/components/com_sppagebuilder/layouts'; - $css_path = new JLayoutFile('addon.css.button', $layout_path); - return $css_path->render(array('addon_id' => $addon_id, 'options' => $this->addon->settings, 'id' => 'btn-' . $this->addon->id)); - } - - public static function getTemplate() { - $output = ' - <# - var content_class = ""; - if(data.image_alignment == "left") { - content_class = " sppb-col-sm-offset-6"; - } - - var button_text = data.button_text; - if(data.button_icon_position == "left" && data.button_icon) { - button_text = \' \' + data.button_text; - } else if(data.button_icon){ - button_text = data.button_text + \' \'; - } - - var button_classes = ""; - - if(data.button_size){ - button_classes = button_classes + " sppb-btn-" + data.button_size; - } - - if(data.button_type){ - button_classes = button_classes + " sppb-btn-" + data.button_type; - } - - if(data.button_shape){ - button_classes = button_classes + " sppb-btn-" + data.button_shape; - } else { - button_classes = button_classes + " sppb-btn-rounded"; - } - - if(data.button_appearance){ - button_classes = button_classes + " sppb-btn-" + data.button_appearance; - } - - if(data.button_block){ - button_classes = button_classes + " " + data.button_block; - } - - var button_fontstyle = data.button_fontstyle || ""; - - var padding = ""; - var padding_sm = ""; - var padding_xs = ""; - if(data.content_padding){ - if(_.isObject(data.content_padding)){ - if(data.content_padding.md.trim() !== ""){ - padding = data.content_padding.md.split(" ").map(item => { - if(_.isEmpty(item)){ - return "0"; - } - return item; - }).join(" ") - } - - if(data.content_padding.sm.trim() !== ""){ - padding_sm = data.content_padding.sm.split(" ").map(item => { - if(_.isEmpty(item)){ - return "0"; - } - return item; - }).join(" ") - } - - if(data.content_padding.xs.trim() !== ""){ - padding_xs = data.content_padding.xs.split(" ").map(item => { - if(_.isEmpty(item)){ - return "0"; - } - return item; - }).join(" ") - } - } - - } - #> - -
        -
        -
        -
        - <# if(data.image_alignment == "left") { #> -
        - <# } #> -
        -
        - <# if( !_.isEmpty( data.title ) ){ #><{{ data.heading_selector }} class="sppb-image-content-title sppb-addon-title">{{ data.title }}<# } #> - <# if(data.text){ #>

        {{{ data.text }}}

        <# } #> - <# if(button_text){ #>{{{ button_text }}}<# } #> -
        -
        -
        -
        -
        - '; - - return $output; - } - -} diff --git a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php b/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php deleted file mode 100755 index 6000af4..0000000 --- a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/admin.php +++ /dev/null @@ -1,144 +0,0 @@ -'repeatable', - 'addon_name'=>'sp_testimonialpro', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_DESC'), - 'category'=>'Slider', - 'attr'=>array( - 'general' => array( - - 'admin_label'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_ADMIN_LABEL_DESC'), - 'std'=> '' - ), - - 'autoplay'=>array( - 'type'=>'checkbox', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_AUTOPLAY'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_AUTOPLAY_DESC'), - 'values'=>array( - 1=>Text::_('JYES'), - 0=>Text::_('JNO'), - ), - 'std'=>1, - ), - - 'interval'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_INTERVAL'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_INTERVAL_DESC'), - 'std'=> 5, - 'depends'=> array( - array('autoplay', '=', 1), - ) - ), - - 'speed'=>array( - 'type'=>'number', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SPEED'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SPEED_DESC'), - 'std'=> 600, - ), - - 'controls'=>array( - 'type'=>'checkbox', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CAROUSEL_SHOW_CONTROLLERS'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CAROUSEL_SHOW_CONTROLLERS_DESC'), - 'values'=>array( - 1=>Text::_('JYES'), - 0=>Text::_('JNO'), - ), - 'std'=>1, - ), - - 'avatar_width'=>array( - 'type'=>'slider', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_WIDTH'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_WIDTH_DESC'), - 'std'=>32, - 'min'=>16, - 'max'=>128 - ), - - 'avatar_shape'=>array( - 'type'=>'select', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_CLIENT_AVATAR_SHAPE'), - 'values' =>array( - 'sppb-avatar-sqaure'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_SQUARE'), - 'sppb-avatar-round'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_ROUNDED'), - 'sppb-avatar-circle'=>Text::_('COM_SPPAGEBUILDER_GLOBAL_CIRCLE'), - ), - 'std' => 'sppb-avatar-circle' - ), - - 'arrows'=>array( - 'type'=>'checkbox', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SHOW_ARROWS'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_SHOW_ARROWS_DESC'), - 'values'=>array( - 1=>Text::_('JYES'), - 0=>Text::_('JNO'), - ), - 'std'=>1, - ), - - 'class'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_CLASS_DESC'), - 'std'=> '' - ), - - // Repeatable Items - 'sp_testimonialpro_item'=>array( - 'title'=>Text::_('Testimonials'), - - 'attr'=>array( - 'title'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TITLE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TITLE_DESC'), - 'std'=>'John Doe', - ), - - 'avatar'=>array( - 'type'=>'media', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_IMAGE'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_IMAGE_DESC'), - ), - - 'message'=>array( - 'type'=>'editor', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TEXT'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_ITEM_TEXT_DESC'), - 'std'=> 'Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.' - ), - - 'url'=>array( - 'type'=>'text', - 'title'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_URL'), - 'desc'=>Text::_('COM_SPPAGEBUILDER_ADDON_TESTIMONIAL_PRO_CLIENT_URL_DESC'), - ), - - ), - ), - ), - ), - ) -); diff --git a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/icon.png b/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/icon.png deleted file mode 100755 index cf2c99450aa5c35719f238898c096c122c3eb808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1472 zcmbVMeM}Q)7(Z-i9RU<%i3*IPjE%Wn?}Izq9#r~q1sg07tQ$^edcAuKH@sfG9&lx% z)j1*+r)Hb`a*Jb$A=!e2u`E%e#*Z0|3C@`~#xjBF+>DD(UChLoU4gRwLHuKv+`aGn zyuaV`{akl_ZFNT4(liKyGCV7o25p5C?|i-XjdXO}*On!UyHQys1(kMI29Sf70s!`i zY!hezEFax?4pcypP8EEON~3or%}Jt(O<+u_7}nSjR8gshS*`^rZ~!z3A)E2`k>f^K z;BCfNC@yFjzBqC*C&I%<7fM+;}=jg`yc3YFFrh(KXsRooDY(5lTirI*(B2{CGf zryxp;%{c8;qqiP*Niu*b6NPXXfx~9238yHtnRp2%Fq}j&9K}l!+)9%qjbZT2W7Mq4 ze2{Kns%C6yC!4WZQNlEewzs#N+DlE6+=Sv*s};ovlpqidfkdJqg;kMIq$sI@0TE6X z!ipe;;DkmtAhjwsqvq*!2x8dlomCu)%p^)n8LF~j6gOe0C??{XLPwMa@UI(lq9eX& z7@!RxBDKn#R*zs&lC0(K$%Ya@%^SK-7PO+U8yJae6+uYxFgBxhW8wv#wgiGa!I=r9 z3@ZyDB!!hB7L4N&mSRZ@iJ2*u4#dlJrR25@(my+%(9Cwozf*~yCDuyI+f-qA| zlIsaY6gI?xq-{a7J;P<5$faE}U=>OBNz#U77t}XPiWF&W%;ANljKr)I&mpBa3lNecOA!kI7KCI8qRbjFTRAIkoZ<8T zH-o6=6q;z4|Fln1r1fNCJ39>8VRoEANSh&98m())Ef+lgWH`cvp_&dZ`1$jNNd0%-`zo+V5iPtLuH)+p?DxLTOp?@1bHlv!ltMZ+~wcb`v@ZPVc^| zUN5jkt3TD*qj|o;@p-Uy&qwF(?H>2to48)x1=fZpTA`wWHIKKD89l0D(=+zTt%$cP-QJ^l$qI{yYH3 diff --git a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php b/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php deleted file mode 100755 index 4be5cad..0000000 --- a/templates/shaper_helix3/sppagebuilder/addons/testimonialpro/site.php +++ /dev/null @@ -1,151 +0,0 @@ -addon->settings->class) && $this->addon->settings->class) ? $this->addon->settings->class : ''; - $style = (isset($this->addon->settings->style) && $this->addon->settings->style) ? $this->addon->settings->style : ''; - - //Options - $autoplay = (isset($this->addon->settings->autoplay) && $this->addon->settings->autoplay) ? ' data-sppb-ride="sppb-carousel"' : ''; - $arrows = (isset($this->addon->settings->arrows) && $this->addon->settings->arrows) ? $this->addon->settings->arrows : ''; - $controls = ''; - $interval = (isset($this->addon->settings->interval) && $this->addon->settings->interval) ? ((int) $this->addon->settings->interval * 1000) : 5000; - $avatar_size = (isset($this->addon->settings->avatar_size) && $this->addon->settings->avatar_size) ? $this->addon->settings->avatar_size : ''; - $avatar_shape = (isset($this->addon->settings->avatar_shape) && $this->addon->settings->avatar_shape) ? $this->addon->settings->avatar_shape : 'sppb-avatar-circle'; - - //Output - $output = '
        '; - - if($controls) { - $output .= '
          '; - foreach ($this->addon->settings->sp_testimonialpro_item as $key1 => $value) { - $output .= '
        1. ' . "\n"; - } - $output .= '
        '; - } - - //$output .= ''; - $output .= '
        '; - - foreach ($this->addon->settings->sp_testimonialpro_item as $key => $value) { - $output .= '
        '; - $name = (isset($value->title) && $value->title) ? $value->title : ''; - - $output .= (isset($value->avatar) && $value->avatar) ? ''.$name.'' : ''; - $output .= '
        ' . $value->message . '
        '; - $output .= '
        '; - $output .= $name ? '' . $name . '' : ''; - $output .= (isset($value->url) && $value->url) ? ' ' . $value->url . '' : ''; - $output .= '
        '; - - $output .= '
        '; - } - $output .= '
        '; - - if($arrows) { - $output .= ''; - $output .= ''; - } - - $output .= '
        '; - - return $output; - - } - - public function css() { - $addon_id = '#sppb-addon-' . $this->addon->id; - $css = ''; - - $speed = (isset($this->addon->settings->speed) && $this->addon->settings->speed) ? $this->addon->settings->speed : 600; - - $css .= $addon_id.' .sppb-carousel-inner > .sppb-item{-webkit-transition-duration: '.$speed.'ms; transition-duration: '.$speed.'ms;}'; - - return $css; - } - - public static function getTemplate(){ - - $output = ' - <# - let interval = (data.interval)? (data.interval*1000):5000 - let autoplay = (data.autoplay)? \'data-sppb-ride="sppb-carousel"\':"" - let avatar_size = data.avatar_width || 76 - let avatar_shape = data.avatar_shape || "sppb-avatar-circle" - - #> -
        - - <# if(data.controls) { #> -
          - <# - _.each(data.sp_testimonialpro_item, function(item,key){ - let activeClass - if (key == 0) { - activeClass = "class=active" - }else{ - activeClass = "" - } - #> -
        1. - <# }) #> -
        - <# } #> - - -
        - <# - _.each(data.sp_testimonialpro_item, function(itemSlide, index) { - let slideActClass = "" - if (index == 0) { - slideActClass = " active" - } else { - slideActClass = "" - } - #> - -
        - - <# if (!_.isEmpty(itemSlide.avatar)) { #> - - <# } #> - -
        {{{ itemSlide.message }}}
        - -
        - - <# if( !_.isEmpty(itemSlide.title) ) { #> - {{ itemSlide.title }} - <# if( !_.isEmpty(itemSlide.url) ) { #> -  {{ itemSlide.url }} - <# } #> - <# } #> -
        -
        - - <# }) #> -
        - - <# if(data.arrows) { #> - - - <# } #> - -
        - '; - - return $output; - } -} diff --git a/templates/shaper_helix3/templateDetails.xml b/templates/shaper_helix3/templateDetails.xml index f7e9497..ceed767 100755 --- a/templates/shaper_helix3/templateDetails.xml +++ b/templates/shaper_helix3/templateDetails.xml @@ -74,7 +74,6 @@ js/ layout/ less/ - sppagebuilder/ From 2e0b483c415990ccf783e07b85ad4165c149c5d5 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Fri, 18 Nov 2022 17:21:44 +0600 Subject: [PATCH 17/29] joomla 4 modal css --- templates/shaper_helix3/css/template.css | 77 ++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/templates/shaper_helix3/css/template.css b/templates/shaper_helix3/css/template.css index 3b9892c..899628b 100755 --- a/templates/shaper_helix3/css/template.css +++ b/templates/shaper_helix3/css/template.css @@ -2864,3 +2864,80 @@ a.modal { width: auto !important; height: auto !important; } + + +/*Joomla 4 Modal*/ +.jviewport-height10 { + height: 10vh; +} +.jviewport-height20 { + height: 20vh; +} +.jviewport-height30 { + height: 30vh; +} +.jviewport-height40 { + height: 40vh; +} +.jviewport-height50 { + height: 50vh; +} +.jviewport-height60 { + height: 60vh; +} +.jviewport-height70 { + height: 70vh; +} +.jviewport-height80 { + height: 80vh; +} +.jviewport-height90 { + height: 90vh; +} +.jviewport-height100 { + height: 100vh; +} + +[class*=jviewport-height] iframe { + height: 100%; +} + +.modal-dialog.jviewport-width10 { + width: 10vw; +} +.modal-dialog.jviewport-width20 { + width: 20vw; + max-width: none; +} +.modal-dialog.jviewport-width30 { + width: 30vw; + max-width: none; +} +.modal-dialog.jviewport-width40 { + width: 40vw; + max-width: none; +} +.modal-dialog.jviewport-width50 { + width: 50vw; + max-width: none; +} +.modal-dialog.jviewport-width60 { + width: 60vw; + max-width: none; +} +.modal-dialog.jviewport-width70 { + width: 70vw; + max-width: none; +} +.modal-dialog.jviewport-width80 { + width: 80vw; + max-width: none; +} +.modal-dialog.jviewport-width90 { + width: 90vw; + max-width: none; +} +.modal-dialog.jviewport-width100 { + width: 100vw; + max-width: none; +} \ No newline at end of file From 63ae0cfb54dc86ac620ee6d87a7685a906add31c Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Fri, 18 Nov 2022 17:31:31 +0600 Subject: [PATCH 18/29] update css for jviewport --- .../system/helix3/core/classes/lessc.inc.php | 2 +- templates/shaper_helix3/css/template.css | 74 ----------------- .../shaper_helix3/less/frontend-edit.less | 83 +++++++++++++++++++ 3 files changed, 84 insertions(+), 75 deletions(-) diff --git a/plugins/system/helix3/core/classes/lessc.inc.php b/plugins/system/helix3/core/classes/lessc.inc.php index af05549..ef33b33 100644 --- a/plugins/system/helix3/core/classes/lessc.inc.php +++ b/plugins/system/helix3/core/classes/lessc.inc.php @@ -1669,7 +1669,7 @@ protected function coerceColor($value) { $width = strlen($colorStr) == 3 ? 16 : 256; for ($i = 3; $i > 0; $i--) { // 3 2 1 - $t = $num % $width; + $t = floor($num % $width); $num /= $width; $c[$i] = $t * (256/$width) + $t * floor(16/$width); diff --git a/templates/shaper_helix3/css/template.css b/templates/shaper_helix3/css/template.css index 899628b..f5b0a29 100755 --- a/templates/shaper_helix3/css/template.css +++ b/templates/shaper_helix3/css/template.css @@ -2867,77 +2867,3 @@ a.modal { /*Joomla 4 Modal*/ -.jviewport-height10 { - height: 10vh; -} -.jviewport-height20 { - height: 20vh; -} -.jviewport-height30 { - height: 30vh; -} -.jviewport-height40 { - height: 40vh; -} -.jviewport-height50 { - height: 50vh; -} -.jviewport-height60 { - height: 60vh; -} -.jviewport-height70 { - height: 70vh; -} -.jviewport-height80 { - height: 80vh; -} -.jviewport-height90 { - height: 90vh; -} -.jviewport-height100 { - height: 100vh; -} - -[class*=jviewport-height] iframe { - height: 100%; -} - -.modal-dialog.jviewport-width10 { - width: 10vw; -} -.modal-dialog.jviewport-width20 { - width: 20vw; - max-width: none; -} -.modal-dialog.jviewport-width30 { - width: 30vw; - max-width: none; -} -.modal-dialog.jviewport-width40 { - width: 40vw; - max-width: none; -} -.modal-dialog.jviewport-width50 { - width: 50vw; - max-width: none; -} -.modal-dialog.jviewport-width60 { - width: 60vw; - max-width: none; -} -.modal-dialog.jviewport-width70 { - width: 70vw; - max-width: none; -} -.modal-dialog.jviewport-width80 { - width: 80vw; - max-width: none; -} -.modal-dialog.jviewport-width90 { - width: 90vw; - max-width: none; -} -.modal-dialog.jviewport-width100 { - width: 100vw; - max-width: none; -} \ No newline at end of file diff --git a/templates/shaper_helix3/less/frontend-edit.less b/templates/shaper_helix3/less/frontend-edit.less index aef12de..f0e786a 100755 --- a/templates/shaper_helix3/less/frontend-edit.less +++ b/templates/shaper_helix3/less/frontend-edit.less @@ -21,6 +21,89 @@ } } +/*====================================== + *======= jviewport ============ + *=====================================*/ + +.jviewport-height10 { + height: 10vh; + } + .jviewport-height20 { + height: 20vh; + } + .jviewport-height30 { + height: 30vh; + } + .jviewport-height40 { + height: 40vh; + } + .jviewport-height50 { + height: 50vh; + } + .jviewport-height60 { + height: 60vh; + } + .jviewport-height70 { + height: 70vh; + } + .jviewport-height80 { + height: 80vh; + } + .jviewport-height90 { + height: 90vh; + } + .jviewport-height100 { + height: 100vh; + } + + [class*=jviewport-height] iframe { + height: 100%; + } + + /*======= modal-dialog ============ + *=====================================*/ + +.modal-dialog { + .jviewport-width10 { + width: 10vw; + } + .jviewport-width20 { + width: 20vw; + max-width: none; + } + .jviewport-width30 { + width: 30vw; + max-width: none; + } + .jviewport-width40 { + width: 40vw; + max-width: none; + } + .jviewport-width50 { + width: 50vw; + max-width: none; + } + .jviewport-width60 { + width: 60vw; + max-width: none; + } + .jviewport-width70 { + width: 70vw; + max-width: none; + } + .jviewport-width80 { + width: 80vw; + max-width: none; + } + .jviewport-width90 { + width: 90vw; + max-width: none; + } + .jviewport-width100 { + width: 100vw; + max-width: none; + } +} /*====================================== *======= Media ============ *=====================================*/ From 7ec04f119a1b83c586b1257eca73ad909fd69c93 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Fri, 18 Nov 2022 17:38:40 +0600 Subject: [PATCH 19/29] fix Implicit conversion from float issue --- plugins/system/helix3/core/classes/lessc.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/system/helix3/core/classes/lessc.inc.php b/plugins/system/helix3/core/classes/lessc.inc.php index ef33b33..5906d34 100644 --- a/plugins/system/helix3/core/classes/lessc.inc.php +++ b/plugins/system/helix3/core/classes/lessc.inc.php @@ -1669,7 +1669,7 @@ protected function coerceColor($value) { $width = strlen($colorStr) == 3 ? 16 : 256; for ($i = 3; $i > 0; $i--) { // 3 2 1 - $t = floor($num % $width); + $t = floor($num) % floor($width); $num /= $width; $c[$i] = $t * (256/$width) + $t * floor(16/$width); From d68491a6d2b0a3749528b775203624bdb1fba088 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Fri, 18 Nov 2022 17:46:41 +0600 Subject: [PATCH 20/29] fix login logout page issue --- .../shaper_helix3/html/com_users/login/default_login.php | 2 +- .../shaper_helix3/html/com_users/login/default_logout.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/shaper_helix3/html/com_users/login/default_login.php b/templates/shaper_helix3/html/com_users/login/default_login.php index 21eda53..7348bee 100644 --- a/templates/shaper_helix3/html/com_users/login/default_login.php +++ b/templates/shaper_helix3/html/com_users/login/default_login.php @@ -79,7 +79,7 @@
        form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem'))); ?> - +
        diff --git a/templates/shaper_helix3/html/com_users/login/default_logout.php b/templates/shaper_helix3/html/com_users/login/default_logout.php index dd226c7..8d85000 100644 --- a/templates/shaper_helix3/html/com_users/login/default_logout.php +++ b/templates/shaper_helix3/html/com_users/login/default_logout.php @@ -23,7 +23,7 @@ - params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?> + params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description') ?? '') != '')|| $this->params->get('logout_image') != '') : ?>
        @@ -35,7 +35,7 @@

        <?php echo Text::_('COM_USER_LOGOUT_IMAGE_ALT')?>

        - params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?> + params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description') ?? '') != '')|| $this->params->get('logout_image') != '') : ?>
        From 9344a0699a9a51180b21ff0dcd3a7d331cf8e18a Mon Sep 17 00:00:00 2001 From: prakash-a7x Date: Fri, 18 Nov 2022 17:55:50 +0600 Subject: [PATCH 21/29] sp pagebuilder & helix compress issue fix --- plugins/system/helix3/core/helix3.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/system/helix3/core/helix3.php b/plugins/system/helix3/core/helix3.php index b6f8973..72d8dac 100644 --- a/plugins/system/helix3/core/helix3.php +++ b/plugins/system/helix3/core/helix3.php @@ -1183,6 +1183,11 @@ public static function compressJS($excludes = '') { $js_file = str_replace($root_url, JPATH_ROOT, $key); + // disable js compress for sp_pagebuilder + if(strpos($js_file, 'com_sppagebuilder')) { + continue; + } + if (strpos($js_file, JPATH_ROOT) === false) { $js_file = JPATH_ROOT . $key; } @@ -1270,6 +1275,11 @@ public static function compressCSS() { $css_file = str_replace($root_url, JPATH_ROOT, $key); + // disable css compress for sp_pagebuilder + if(strpos($css_file, 'com_sppagebuilder')) { + continue; + } + if (strpos($css_file, JPATH_ROOT) === false) { $css_file = JPATH_ROOT . $key; } From 50278dec50a829196cc5b782b4224a67924c21d4 Mon Sep 17 00:00:00 2001 From: prakash-a7x Date: Mon, 21 Nov 2022 11:13:13 +0600 Subject: [PATCH 22/29] smart search issue fix --- .../html/com_finder/search/default_form.php | 41 +++++++++++++++++-- .../com_finder/search/default_results.php | 22 ++++++++-- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/templates/shaper_helix3/html/com_finder/search/default_form.php b/templates/shaper_helix3/html/com_finder/search/default_form.php index efee0bb..0bb8b95 100644 --- a/templates/shaper_helix3/html/com_finder/search/default_form.php +++ b/templates/shaper_helix3/html/com_finder/search/default_form.php @@ -68,6 +68,28 @@ } else { + HTMLHelper::_('jquery.framework'); + + $script = " + jQuery(function() {"; + + $script .= " + jQuery('.ads').on('click', function(e){ + if(jQuery('#advancedSearch').hasClass('hide')) { + jQuery('#advancedSearch').removeClass('hide'); + jQuery('#advancedSearch').slideDown(300); + + } else { + jQuery('#advancedSearch').addClass('hide'); + jQuery('#advancedSearch').slideUp(300); + } + });"; + + $script .= " + });"; + + Factory::getDocument()->addScriptDeclaration($script); + if ($this->params->get('show_autosuggest', 1)) { $this->document->getWebAssetManager()->usePreset('awesomplete'); @@ -101,16 +123,27 @@ params->get('show_advanced', 1)) : ?> - + + + + + + + +
      params->get('show_advanced', 1)) : ?> +
      + +
      + params->get('show_advanced_tips', 1)) : ?>
      diff --git a/templates/shaper_helix3/html/com_finder/search/default_results.php b/templates/shaper_helix3/html/com_finder/search/default_results.php index 1818092..7cd4028 100644 --- a/templates/shaper_helix3/html/com_finder/search/default_results.php +++ b/templates/shaper_helix3/html/com_finder/search/default_results.php @@ -17,7 +17,7 @@ ?> suggested && $this->params->get('show_suggested_query', 1)) || ($this->explained && $this->params->get('show_explained_query', 1))) : ?> -
      +
      suggested && $this->params->get('show_suggested_query', 1)) : ?> @@ -45,11 +45,27 @@ query->highlight) && $this->params->get('highlight_terms', 1)) : ?> - query->highlight); ?> + query->highlight); + } + else + { + $this->document->getWebAssetManager()->useScript('highlight'); + $this->document->addScriptOptions( + 'highlight', + [[ + 'class' => 'js-highlight', + 'highLight' => $this->query->highlight, + ]] + ); + } + ?>
      -
        +
          baseUrl = Uri::getInstance()->toString(array('scheme', 'host', 'port')); ?> results as $result) : ?> result = &$result; ?> From 41085ce5073b78d50c5bfa5b882b601c9ef355d4 Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Mon, 21 Nov 2022 12:26:48 +0600 Subject: [PATCH 23/29] fix logout page issue --- templates/shaper_helix3/html/com_users/login/default_login.php | 2 +- templates/shaper_helix3/html/com_users/login/default_logout.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/shaper_helix3/html/com_users/login/default_login.php b/templates/shaper_helix3/html/com_users/login/default_login.php index 7348bee..aff7359 100644 --- a/templates/shaper_helix3/html/com_users/login/default_login.php +++ b/templates/shaper_helix3/html/com_users/login/default_login.php @@ -79,7 +79,7 @@
      form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem'))); ?> - +
      diff --git a/templates/shaper_helix3/html/com_users/login/default_logout.php b/templates/shaper_helix3/html/com_users/login/default_logout.php index 8d85000..60bcf8a 100644 --- a/templates/shaper_helix3/html/com_users/login/default_logout.php +++ b/templates/shaper_helix3/html/com_users/login/default_logout.php @@ -46,7 +46,7 @@ params->get('logout_redirect_url')) : ?> - + From cff756cb7ec68efbedb9a21085b715967039d68c Mon Sep 17 00:00:00 2001 From: Md Siddiqur Rahman Date: Mon, 21 Nov 2022 20:58:29 +0600 Subject: [PATCH 24/29] update HTMLHelper function --- plugins/system/helix3/fields/layoutlist.php | 5 +- plugins/system/helix3/layout/types/color.php | 2 +- templates/shaper_helix3/comingsoon.php | 2 +- .../css/font-awesome-v4-shims.min.css | 5 +- templates/shaper_helix3/css/frontend-edit.css | 72 + .../css/joomla-fontawesome.min.css | 7800 +---------------- templates/shaper_helix3/css/template.css | 3 - .../shaper_helix3/fonts/fa-brands-400.eot | Bin 134346 -> 134294 bytes .../shaper_helix3/fonts/fa-brands-400.svg | 82 +- .../shaper_helix3/fonts/fa-brands-400.ttf | Bin 134040 -> 133988 bytes .../shaper_helix3/fonts/fa-brands-400.woff | Bin 90060 -> 89988 bytes .../shaper_helix3/fonts/fa-brands-400.woff2 | Bin 76764 -> 76736 bytes .../shaper_helix3/fonts/fa-regular-400.eot | Bin 34034 -> 34034 bytes .../shaper_helix3/fonts/fa-regular-400.svg | 4 +- .../shaper_helix3/fonts/fa-regular-400.ttf | Bin 33736 -> 33736 bytes .../shaper_helix3/fonts/fa-regular-400.woff | Bin 16276 -> 16276 bytes .../shaper_helix3/fonts/fa-regular-400.woff2 | Bin 13276 -> 13224 bytes .../shaper_helix3/fonts/fa-solid-900.eot | Bin 203030 -> 203030 bytes .../shaper_helix3/fonts/fa-solid-900.svg | 4 +- .../shaper_helix3/fonts/fa-solid-900.ttf | Bin 202744 -> 202744 bytes .../shaper_helix3/fonts/fa-solid-900.woff | Bin 101652 -> 101648 bytes .../shaper_helix3/fonts/fa-solid-900.woff2 | Bin 78196 -> 78268 bytes .../html/com_content/form/edit.php | 24 +- templates/shaper_helix3/templateDetails.xml | 2 +- 24 files changed, 198 insertions(+), 7807 deletions(-) diff --git a/plugins/system/helix3/fields/layoutlist.php b/plugins/system/helix3/fields/layoutlist.php index 52ca92a..1c9886e 100644 --- a/plugins/system/helix3/fields/layoutlist.php +++ b/plugins/system/helix3/fields/layoutlist.php @@ -10,6 +10,7 @@ defined ('_JEXEC') or die ('resticted aceess'); use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Form\FormField; use Joomla\CMS\Filesystem\Folder; @@ -34,8 +35,8 @@ public function getInput() } $htmls .= '
      '; - $htmls .= '
      '. JText::_('HELIX_SAVE_COPY') .''; - $htmls .= ''. JText::_('HELIX_DELETE') .'
      '; + $htmls .= '
      '. Text::_('HELIX_SAVE_COPY') .''; + $htmls .= ''. Text::_('HELIX_DELETE') .'
      '; return $htmls; } diff --git a/plugins/system/helix3/layout/types/color.php b/plugins/system/helix3/layout/types/color.php index 136b9a6..d8b0d54 100644 --- a/plugins/system/helix3/layout/types/color.php +++ b/plugins/system/helix3/layout/types/color.php @@ -22,7 +22,7 @@ static function getInput($key, $attr) // Including fallback code for HTML5 non supported browsers. HTMLHelper::_('jquery.framework'); - HTMLHelper::_('script', 'system/html5fallback.js', false, true); + HTMLHelper::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); $output = '
      '; $output .= ''; diff --git a/templates/shaper_helix3/comingsoon.php b/templates/shaper_helix3/comingsoon.php index 0ca01b8..28ecb6a 100755 --- a/templates/shaper_helix3/comingsoon.php +++ b/templates/shaper_helix3/comingsoon.php @@ -217,7 +217,7 @@