Skip to content

Commit cd3d398

Browse files
siddik-websiddik-web
authored
Merge pull request #531 from JoomShaper/dev
v2.2.3
2 parents 5fd2ff8 + bb7e7c5 commit cd3d398

File tree

12 files changed

+67
-23
lines changed

12 files changed

+67
-23
lines changed

‎gulpfile.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ const config = {
1414
srcPath: path.resolve(__dirname),
1515
buildPath: path.resolve(__dirname, './package/'),
1616
qsPath: path.resolve(__dirname, './package/helix_ultimate_quickstart/'),
17-
qsPackageName: 'helixultimate_quickstart_j5_2.2.2.zip',
18-
packageName: 'helixultimate_template_v2.2.2.zip',
19-
pluginPackageName: 'plg_system_helixultimate_v2.2.2.zip',
17+
qsPackageName: 'helixultimate_quickstart_j5_2.2.3.zip',
18+
packageName: 'helixultimate_template_v2.2.3.zip',
19+
pluginPackageName: 'plg_system_helixultimate_v2.2.3.zip',
2020

2121
templateFileExtensions: 'xml, json, php, png, scss, js, ico, svg, jpg, eot, ttf, woff, woff2, otf, css, html',
2222
pluginFileExtensions: function () {

‎plugins/system/helixultimate/helixultimate.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,10 @@ public function onExtensionBeforeSave($context, $table, $isNew)
227227
{
228228
$app = Factory::getApplication();
229229
$id = $app->input->get('id', 0);
230+
if (!$id)
231+
{
232+
return true;
233+
}
230234
$params = $this->getTemplateStyleParams($id);
231235
$table->params = $params;
232236
}

‎plugins/system/helixultimate/helixultimate.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
1111
<authorEmail>[email protected]</authorEmail>
1212
<authorUrl>www.joomshaper.com</authorUrl>
13-
<version>2.2.2</version>
13+
<version>2.2.3</version>
1414
<description>Helix Ultimate Framework - Joomla Template Framework by JoomShaper</description>
1515

1616
<updateservers>

‎plugins/system/helixultimate/layouts/cpanel/control-board/fieldset/fields.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
defined('_JEXEC') or die();
1010

11-
use HelixUltimate\Framework\Platform\Settings;
1211
use Joomla\CMS\Language\Text;
1312
use Joomla\CMS\Layout\LayoutHelper;
1413

‎plugins/system/helixultimate/overrides/layouts/joomla/content/blog_style_default_item_title.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,23 @@
1717
// Create a shortcut for params.
1818
$params = $displayData->params;
1919
$canEdit = $displayData->params->get('access-edit');
20+
$heading = $displayData->heading ?? 'h2';
2021

2122
$currentDate = Factory::getDate()->format('Y-m-d H:i:s');
2223
$link = RouteHelper::getArticleRoute($displayData->slug, $displayData->catid, $displayData->language);
2324
?>
2425
<?php if ($displayData->state == 0 || $params->get('show_title') || ($params->get('show_author') && !empty($displayData->author))) : ?>
2526
<div class="article-header">
2627
<?php if ($params->get('show_title')) : ?>
27-
<h4>
28+
<<?php echo $heading; ?>>
2829
<?php if ($params->get('link_titles') && ($params->get('access-view') || $params->get('show_noauth', '0') == '1')) : ?>
2930
<a href="<?php echo Route::_($link); ?>">
3031
<?php echo $this->escape($displayData->title); ?>
3132
</a>
3233
<?php else : ?>
3334
<?php echo $this->escape($displayData->title); ?>
3435
<?php endif; ?>
35-
</h4>
36+
</<?php echo $heading; ?>>
3637
<?php endif; ?>
3738

3839
<?php if ($displayData->state == 0) : ?>

‎plugins/system/helixultimate/overrides/layouts/joomla/content/related_article.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
2323
$article_format = (isset($attribs->helix_ultimate_article_format) && $attribs->helix_ultimate_article_format) ? $attribs->helix_ultimate_article_format : 'standard';
2424

25+
$item->heading = 'h4';
26+
2527
$version = new Version();
2628
$JoomlaVersion = $version->getShortVersion();
2729
?>

‎plugins/system/helixultimate/overrides/layouts/joomla/content/related_articles.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
<?php if( $tmpl_params->get('related_article_view_type') === 'list' ): ?>
4343
<ul class="article-list related-article-list">
4444
<?php foreach( $articles as $item ): ?>
45-
<li class="related-article-list-item">
45+
<li class="related-article-list-item">
46+
<?php $item->heading = 'h4'; ?>
4647
<?php echo LayoutHelper::render('joomla.content.blog_style_default_item_title', $item); ?>
4748
<?php echo LayoutHelper::render('joomla.content.info_block.publish_date', array('item' => $item, 'params' => $item->params,'articleView'=>'intro')); ?>
4849
</li>

‎plugins/system/helixultimate/src/Core/HelixUltimate.php‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,31 @@ public function head()
313313
}
314314

315315
// Favicon
316-
if ($favicon = $this->params->get('favicon'))
316+
$favicon = $this->params->get('favicon');
317+
if ($favicon)
317318
{
318-
$this->doc->addFavicon(Uri::base(true) . '/' . $favicon);
319+
$url = Uri::base(true) . '/' . $favicon;
320+
$ext = strtolower(pathinfo($url, PATHINFO_EXTENSION));
321+
322+
switch ($ext)
323+
{
324+
case 'svg':
325+
$type = 'image/svg+xml';
326+
break;
327+
case 'gif':
328+
$type = 'image/gif';
329+
case 'png':
330+
$type = 'image/png';
331+
break;
332+
case 'jpg':
333+
case 'jpeg':
334+
$type = 'image/jpeg';
335+
break;
336+
default:
337+
$type = 'image/vnd.microsoft.icon';
338+
break;
339+
}
340+
$this->doc->addFavicon($url, $type);
319341
}
320342
else
321343
{
@@ -1889,6 +1911,7 @@ public static function getRelatedArticles($params)
18891911
->select('id')
18901912
->from($db->quoteName('#__content'))
18911913
->where($db->quoteName('catid') . " = " . $catId)
1914+
->where($db->quoteName('state') . ' = 1')
18921915
->setLimit($maximum + 1);
18931916

18941917
$db->setQuery($catQuery);

‎templates/shaper_helixultimate/features/logo.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,17 @@ public function renderFeature($isToggle = true)
8181

8282
$html = '';
8383

84-
if ($isToggle && $offcanvas_position === 'left')
84+
$predefinedHeader = $this->params->get('predefined_header', 'none');
85+
86+
if ($isToggle && $offcanvas_position === 'left' && $predefinedHeader === 'none')
8587
{
8688
if ($menu_type === 'mega')
8789
{
88-
$html .= '<a id="offcanvas-toggler" aria-label="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '" class="offcanvas-toggler-left d-flex d-lg-none" href="#" aria-hidden="true" title="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '"><div class="burger-icon"><span></span><span></span><span></span></div></a>';
90+
$html .= '<a id="offcanvas-toggler" aria-label="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '" class="offcanvas-toggler-left offcanvas-toggler-custom d-lg-none" href="#" aria-hidden="true" title="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '"><div class="burger-icon"><span></span><span></span><span></span></div></a>';
8991
}
9092
else
9193
{
92-
$html .= '<a id="offcanvas-toggler" aria-label="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '" class="offcanvas-toggler-left d-flex align-items-center" href="#" aria-hidden="true" title="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '"><div class="burger-icon"><span></span><span></span><span></span></div></a>';
94+
$html .= '<a id="offcanvas-toggler" aria-label="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '" class="offcanvas-toggler-left offcanvas-toggler-custom align-items-center" href="#" aria-hidden="true" title="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '"><div class="burger-icon"><span></span><span></span><span></span></div></a>';
9395
}
9496
}
9597

‎templates/shaper_helixultimate/features/menu.php‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,37 @@ public function __construct($params)
6767
public function renderFeature()
6868
{
6969
$menu_type = $this->params->get('menu_type');
70+
$offcanvas_position = $this->params->get('offcanvas_position', 'right');
71+
$html = '';
72+
73+
$predefinedHeader = $this->params->get('predefined_header', 'none');
74+
75+
if ($offcanvas_position === 'right' && $predefinedHeader === 'none' && $menu_type !== 'mega_offcanvas')
76+
{
77+
if ($menu_type === 'mega')
78+
{
79+
$html .= '<a id="offcanvas-toggler" aria-label="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '" class="offcanvas-toggler-right offcanvas-toggler-custom d-lg-none" href="#" aria-hidden="true" title="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '"><div class="burger-icon"><span></span><span></span><span></span></div></a>';
80+
}
81+
else
82+
{
83+
$html .= '<a id="offcanvas-toggler" aria-label="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '" class="offcanvas-toggler-right offcanvas-toggler-custom align-items-center" href="#" aria-hidden="true" title="' . Text::_('HELIX_ULTIMATE_NAVIGATION') . '"><div class="burger-icon"><span></span><span></span><span></span></div></a>';
84+
}
85+
}
86+
7087

7188
if ($menu_type === 'mega_offcanvas' || $menu_type === 'mega')
7289
{
7390
$output = '<nav class="sp-megamenu-wrapper d-flex" role="navigation" aria-label="' . Text::_('HELIX_ULTIMATE_AIRA_NAVIGATION') . '">';
7491
$menu = new HelixultimateMenu('d-none d-lg-block', ''); // desktop only
7592
$output .= $menu->render();
93+
$output .= $html;
7694
$output .= '</nav>';
95+
7796

7897
return $output;
7998
}
80-
81-
return '';
99+
100+
return $html;
82101
}
83102

84103

0 commit comments

Comments
 (0)