From 97ea01b8393f86a5358b6eed0766dfac2445e0d9 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Fri, 24 Nov 2023 11:04:05 +0700 Subject: [PATCH 1/4] Optimized Override code --- .../library/astroid/Helper/Overrides.php | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/framework/library/astroid/Helper/Overrides.php b/framework/library/astroid/Helper/Overrides.php index 58eb7a0e..4e03f723 100644 --- a/framework/library/astroid/Helper/Overrides.php +++ b/framework/library/astroid/Helper/Overrides.php @@ -62,13 +62,7 @@ public static function getHTMLTemplate(): string { $backtrace = \debug_backtrace(); $callPath = $backtrace[0]['file'] ?? ''; - $template_name = ASTROID_TEMPLATE_NAME; - $isChildTemplate = Helper::isChildTemplate($template_name); - - if ($isChildTemplate && isset($isChildTemplate['isChild']) && $isChildTemplate['isChild']) { - $template_name = $isChildTemplate['parent']; - } - $htmlTemplatePath = JPATH_ROOT . '/templates/'.$template_name.'/html'; + $htmlTemplatePath = JPATH_ROOT . '/templates/'.ASTROID_TEMPLATE_NAME.'/html'; $htmlAstroidPath = JPATH_LIBRARIES . '/astroid/framework/html'; if (\strpos($callPath, $htmlTemplatePath) === 0) { @@ -76,7 +70,17 @@ public static function getHTMLTemplate(): string { } if (empty($relativePath)) { - return self::generateExtensionPath(\substr($callPath, stripos($callPath, '/html/') + 5)); + // Check if template is child-template and file is not exist then select html from parent + $isChildTemplate = Helper::isChildTemplate(ASTROID_TEMPLATE_NAME); + if ($isChildTemplate && isset($isChildTemplate['isChild']) && $isChildTemplate['isChild']) { + $htmlTemplatePath = JPATH_ROOT . '/templates/'.$isChildTemplate['parent'].'/html'; + } + if (\strpos($callPath, $htmlTemplatePath) === 0) { + $relativePath = \substr($callPath, \strlen($htmlTemplatePath)); + } + if (empty($relativePath)) { + return self::generateExtensionPath(\substr($callPath, stripos($callPath, '/html/') + 5)); + } } $astroidOverridePath = $htmlAstroidPath . $relativePath; From a1f1b8f66604732a627d26bb0e39398b7d95ef80 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Fri, 24 Nov 2023 16:17:09 +0700 Subject: [PATCH 2/4] Update style for Login, Article Related, Tags Popular --- assets/vendor/astroid/scss/joomla/_base.scss | 3 + framework/frontend/blog/modules/related.php | 14 +- framework/html/mod_login/card.php | 139 +++++++++++++++++++ framework/html/mod_login/default.php | 137 ++++++++++++++++++ framework/html/mod_tags_popular/default.php | 34 +++++ framework/html/mod_tags_popular/index.html | 9 ++ 6 files changed, 329 insertions(+), 7 deletions(-) create mode 100644 framework/html/mod_login/card.php create mode 100644 framework/html/mod_login/default.php create mode 100644 framework/html/mod_tags_popular/default.php create mode 100644 framework/html/mod_tags_popular/index.html diff --git a/assets/vendor/astroid/scss/joomla/_base.scss b/assets/vendor/astroid/scss/joomla/_base.scss index 44737d40..c861944e 100644 --- a/assets/vendor/astroid/scss/joomla/_base.scss +++ b/assets/vendor/astroid/scss/joomla/_base.scss @@ -19,4 +19,7 @@ ul.tags { --bs-btn-padding-y: 0.3rem; --bs-btn-padding-x: 1rem; } +} +.pagenavigation .pagination a { + padding: 5px 15px; } \ No newline at end of file diff --git a/framework/frontend/blog/modules/related.php b/framework/frontend/blog/modules/related.php index bb684942..c220013c 100644 --- a/framework/frontend/blog/modules/related.php +++ b/framework/frontend/blog/modules/related.php @@ -12,21 +12,21 @@ use Joomla\CMS\Language\Text; // No direct access. defined('_JEXEC') or die; -jimport('astroid.framework.article'); extract($displayData); if (empty($items)) { return; } +$document = Astroid\Framework::getDocument(); ?>

-
+
images); - $astroidArticle = new AstroidFrameworkArticle($item, true); + $astroidArticle = new Astroid\Article($item, true); ?> -
-
+
+
image_intro)) { ?> @@ -37,10 +37,10 @@
include('blog.modules.posttype', ['article' => $astroidArticle]); + $document->include('blog.modules.posttype', ['article' => $astroidArticle]); } if ($display_badge) { - Astroid\Framework::getDocument()->include('blog.modules.badge', ['article' => $astroidArticle]); + $document->include('blog.modules.badge', ['article' => $astroidArticle]); } ?> category_title; ?> diff --git a/framework/html/mod_login/card.php b/framework/html/mod_login/card.php new file mode 100644 index 00000000..22805a46 --- /dev/null +++ b/framework/html/mod_login/card.php @@ -0,0 +1,139 @@ +getDocument()->getWebAssetManager() + ->useScript('core') + ->useScript('keepalive') + ->useScript('field.passwordview'); + +Text::script('JSHOWPASSWORD'); +Text::script('JHIDEPASSWORD'); +?> +
+ +
\ No newline at end of file diff --git a/framework/html/mod_login/default.php b/framework/html/mod_login/default.php new file mode 100644 index 00000000..0caa362e --- /dev/null +++ b/framework/html/mod_login/default.php @@ -0,0 +1,137 @@ +getDocument()->getWebAssetManager() + ->useScript('core') + ->useScript('keepalive') + ->useScript('field.passwordview'); + +Text::script('JSHOWPASSWORD'); +Text::script('JHIDEPASSWORD'); +?> + \ No newline at end of file diff --git a/framework/html/mod_tags_popular/default.php b/framework/html/mod_tags_popular/default.php new file mode 100644 index 00000000..55ef4a9f --- /dev/null +++ b/framework/html/mod_tags_popular/default.php @@ -0,0 +1,34 @@ + +
+ +
+ + +
+ +
+ + + +
+ +
\ No newline at end of file diff --git a/framework/html/mod_tags_popular/index.html b/framework/html/mod_tags_popular/index.html new file mode 100644 index 00000000..f211c87d --- /dev/null +++ b/framework/html/mod_tags_popular/index.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From a1409a37613f8123405b27254e34309bc68432af Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Sat, 25 Nov 2023 15:48:14 +0700 Subject: [PATCH 3/4] Fix issue offcanvas is hidden #472 --- framework/html/layouts/chromes/astroidxhtml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/html/layouts/chromes/astroidxhtml.php b/framework/html/layouts/chromes/astroidxhtml.php index c58f86d7..921c46dc 100644 --- a/framework/html/layouts/chromes/astroidxhtml.php +++ b/framework/html/layouts/chromes/astroidxhtml.php @@ -21,7 +21,7 @@ $moduleTag = $params->get('module_tag', 'div'); $moduleAttribs = []; -$moduleAttribs['class'] = $module->position . ' moduletable ' . htmlspecialchars($params->get('moduleclass_sfx', ''), ENT_QUOTES, 'UTF-8'); +$moduleAttribs['class'] = $module->position . '-position moduletable ' . htmlspecialchars($params->get('moduleclass_sfx', ''), ENT_QUOTES, 'UTF-8'); $headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8'); $headerClass = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8'); $headerAttribs = []; From 56e5bd3d8f1d5a4742898de420db3968cbaef366 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Tue, 28 Nov 2023 09:31:35 +0700 Subject: [PATCH 4/4] Update v3.0.6 --- astroid.xml | 2 +- astroid_framework.xml | 4 ++-- framework/library/astroid/Helper/Constants.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/astroid.xml b/astroid.xml index 50092790..dbe0bf31 100644 --- a/astroid.xml +++ b/astroid.xml @@ -4,7 +4,7 @@ astroid Astroid Framework Team November 2023 - 3.0.5 + 3.0.6 https://astroidframe.work/ Copyright (C) 2023 TemPlaza, Inc. All rights reserved. GNU General Public License version 3 or later; see LICENSE.txt diff --git a/astroid_framework.xml b/astroid_framework.xml index db80c9a0..25a38a30 100644 --- a/astroid_framework.xml +++ b/astroid_framework.xml @@ -1,13 +1,13 @@ Astroid Framework - 3.0.5 + 3.0.6 https://astroidframe.work/ astroid library 0 - https://github.com/templaza/astroid-framework/releases/download/v3.0.5/astroid-framework-3.0.5.zip + https://github.com/templaza/astroid-framework/releases/download/v3.0.6/astroid-framework-3.0.6.zip stable diff --git a/framework/library/astroid/Helper/Constants.php b/framework/library/astroid/Helper/Constants.php index 327aa880..adb8517e 100644 --- a/framework/library/astroid/Helper/Constants.php +++ b/framework/library/astroid/Helper/Constants.php @@ -13,7 +13,7 @@ class Constants { - public static $astroid_version = '3.0.5'; + public static $astroid_version = '3.0.6'; public static $fontawesome_version = '6.4.2'; public static $animatecss_version = '3.7.0'; public static $forum_link = 'https://github.com/templaza/astroid-framework/issues';