From f00933754c20801c8dd07bfd4b78e72b94c63756 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Fri, 26 Jul 2024 09:17:27 +0700 Subject: [PATCH 01/50] Improve Semantic of HTML --- framework/library/astroid/Component/Menu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/library/astroid/Component/Menu.php b/framework/library/astroid/Component/Menu.php index 970be2c2..8d031562 100644 --- a/framework/library/astroid/Component/Menu.php +++ b/framework/library/astroid/Component/Menu.php @@ -61,7 +61,7 @@ public static function getMenu($menutype = '', $nav_class = [], $logo = null, $l $return = []; // Menu Wrapper - echo '
' + echo '
'; + . ''; } // Joomla Functions From 7ca901c38cb1082e10894cf7863baf7197616590 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Mon, 29 Jul 2024 12:18:09 +0700 Subject: [PATCH 02/50] Remove unnecessary code --- framework/html/com_content/category/blog_item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/html/com_content/category/blog_item.php b/framework/html/com_content/category/blog_item.php index b7c9af70..44eb2f08 100644 --- a/framework/html/com_content/category/blog_item.php +++ b/framework/html/com_content/category/blog_item.php @@ -73,7 +73,7 @@ $clsItemContainer = $astroidArticle->getStyle('container'); $clsItemBody = $astroidArticle->getStyle('body'); ?> -
+
From 18e0b2f9ea116714244559f728a53f7134e8293b Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 12:24:55 +0700 Subject: [PATCH 03/50] Fix issue validate html when Intro Image is null --- framework/html/com_content/category/blog_item.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/html/com_content/category/blog_item.php b/framework/html/com_content/category/blog_item.php index 44eb2f08..9fb01150 100644 --- a/framework/html/com_content/category/blog_item.php +++ b/framework/html/com_content/category/blog_item.php @@ -164,9 +164,11 @@
'; - echo '
'; + if (((!empty($images->image_intro)) && $post_format == 'standard') || (is_string($image) && !empty($image))) { + if (($image_position == 'left' || $image_position == 'right')) { + echo '
'; + echo ''; + } } ?> From 3731c45d9c401f5bd8f26368023631e4cd475f6a Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 14:27:08 +0700 Subject: [PATCH 04/50] Add Masonry library --- framework/library/astroid/Document.php | 101 +++++++++++++++---------- 1 file changed, 63 insertions(+), 38 deletions(-) diff --git a/framework/library/astroid/Document.php b/framework/library/astroid/Document.php index aa5f513b..4f41d9c0 100644 --- a/framework/library/astroid/Document.php +++ b/framework/library/astroid/Document.php @@ -34,6 +34,8 @@ class Document protected $minify_html = false; protected static $_fontawesome = false; protected static $_fancybox = false; + protected static $_masonry = false; + protected static $_slick = false; protected static $_layout_paths = []; protected $type = null; protected $modules = null; @@ -60,7 +62,7 @@ public function getType() return $this->type; } - public function addLayoutPath($path) + public function addLayoutPath($path): void { self::$_layout_paths[] = $path; } @@ -116,7 +118,7 @@ public function include($section, $data = [], $return = false) echo trim($content); } - public function compress() + public function compress(): void { $app = Factory::getApplication(); $body = $app->getBody(); @@ -133,7 +135,7 @@ public function compress() $app->setBody($body); } - public function isFrontendEditing() + public function isFrontendEditing(): bool { if (!Framework::isSite()) { return false; @@ -219,7 +221,7 @@ function addProtocol($url) } - public function minifyCSS($html) + public function minifyCSS($html): array|string { Framework::getDebugger()->log('Minifying CSS'); $stylesheets = []; @@ -381,7 +383,7 @@ public function minifyJS($html) return $html; } - public function minifyHTML($html) + public function minifyHTML($html): array|string|null { Framework::getDebugger()->log('Minifying HTML'); $level = Framework::getTemplate()->getParams()->get('minify_html_level', 'basic'); @@ -476,7 +478,7 @@ public function minifyHTML($html) return trim($html); } - public function _replace($rx, $replacement, $code, $callback = null) + public function _replace($rx, $replacement, $code, $callback = null): array|string|null { if ($callback === null) { return preg_replace($rx, $replacement, $code); @@ -515,7 +517,7 @@ public function _minifyAssets($m) return $m[0]; } - private function _assetsHash() + private function _assetsHash(): string { $assets = []; $assets[] = \json_encode($this->_styles); @@ -529,7 +531,7 @@ private function _assetsHash() return md5(serialize($assets)); } - public function position($position, $style = 'none') + public function position($position, $style = 'none'): string { if (empty($position)) { return ''; @@ -547,7 +549,7 @@ public function position($position, $style = 'none') return $return; } - public function hasModule($position, $module) + public function hasModule($position, $module): bool { return in_array($module, array_column(ModuleHelper::getModules($position), 'module')); } @@ -582,7 +584,7 @@ public function loadModule($content) return $content; } - private function _modulePosition($position) + private function _modulePosition($position): false|string { $this->modules[$position] = ''; $document = Factory::getDocument(); @@ -599,7 +601,7 @@ private function _modulePosition($position) return $this->modules[$position]; } - private function _moduleId($id) + private function _moduleId($id): false|string { $this->modules[$id] = ''; $document = Factory::getDocument(); @@ -664,7 +666,7 @@ private function _positionLayouts() return $return; } - protected function checkDev() + protected function checkDev(): void { $params = Framework::getTemplate()->getParams(); if ($params->exists('developemnt_mode')) { @@ -675,7 +677,7 @@ protected function checkDev() $this->_dev = ($dev ? true : false); } - public function isDev() + public function isDev(): bool { if ($this->_dev === null) { $this->checkDev(); @@ -683,7 +685,7 @@ public function isDev() return $this->_dev; } - public function addMeta($name, $content, $attribs = []) + public function addMeta($name, $content, $attribs = []): void { $this->_metas[$name] = [ 'name' => $name, @@ -692,7 +694,7 @@ public function addMeta($name, $content, $attribs = []) ]; } - public function addLink($href = '', $rel = 'stylesheet', $attribs = ['type' => 'text/css']) + public function addLink($href = '', $rel = 'stylesheet', $attribs = ['type' => 'text/css']): void { $this->_links[md5($href)] = [ 'href' => $href, @@ -701,7 +703,7 @@ public function addLink($href = '', $rel = 'stylesheet', $attribs = ['type' => ' ]; } - public function renderMeta() + public function renderMeta(): string { $html = ''; foreach ($this->_metas as $meta) { @@ -720,7 +722,7 @@ public function renderMeta() return $html; } - public function renderLinks() + public function renderLinks(): string { $html = ''; foreach ($this->_links as $link) { @@ -739,7 +741,7 @@ public function renderLinks() return $html; } - public function beutifyURL($url) + public function beutifyURL($url): array|string { $url = str_replace('?' . Helper::joomlaMediaVersion(), '', $url); $url = str_replace(Uri::root(), '', $url); @@ -754,7 +756,7 @@ public function beutifyURL($url) return $url; } - public function addScript($url, $position = 'head', $options = [], $attribs = [], $type = '') + public function addScript($url, $position = 'head', $options = [], $attribs = [], $type = ''): void { if (!is_array($url)) { $url = [$url]; @@ -771,7 +773,7 @@ public function addScript($url, $position = 'head', $options = [], $attribs = [] } } - public function getScripts($position = 'head') + public function getScripts($position = 'head'): string { $html = ''; foreach ($this->_javascripts[$position] as $javascript) { @@ -783,7 +785,7 @@ public function getScripts($position = 'head') return $html; } - public function getCustomTags($position = 'head') + public function getCustomTags($position = 'head'): string { $content = ''; foreach ($this->_customtags[$position] as $tag) { @@ -792,7 +794,7 @@ public function getCustomTags($position = 'head') return $content; } - public function addScriptOptions($key, $options, $merge = true) + public function addScriptOptions($key, $options, $merge = true): static { if (empty($this->scriptOptions[$key])) { $this->scriptOptions[$key] = []; @@ -816,7 +818,7 @@ public function getScriptOptions($key = null) return $this->scriptOptions; } - protected function _systemUrl($url, $version = true) + protected function _systemUrl($url, $version = true): string { $config = Factory::getApplication()->getConfig(); $params = Helper::getPluginParams(); @@ -848,7 +850,7 @@ protected function _systemUrl($url, $version = true) return $url.$postfix ; } - public function addScriptDeclaration($content, $position = 'head', $type = 'text/javascript') + public function addScriptDeclaration($content, $position = 'head', $type = 'text/javascript'): void { if (empty($content)) { return; @@ -859,7 +861,7 @@ public function addScriptDeclaration($content, $position = 'head', $type = 'text $this->_scripts[$position][] = $script; } - public function addStyleDeclaration($content, $device = 'desktop') + public function addStyleDeclaration($content, $device = 'desktop'): void { if (empty($content)) { return; @@ -867,7 +869,7 @@ public function addStyleDeclaration($content, $device = 'desktop') $this->_styles[$device][] = trim($content); } - public function addStyleSheet($url, $attribs = ['rel' => 'stylesheet', 'type' => 'text/css'], $shifted = 0) + public function addStyleSheet($url, $attribs = ['rel' => 'stylesheet', 'type' => 'text/css'], $shifted = 0): void { if (!is_array($url)) { $url = [$url]; @@ -886,7 +888,7 @@ public function addStyleSheet($url, $attribs = ['rel' => 'stylesheet', 'type' => } } - public function addCustomTag($content, $position = 'head') + public function addCustomTag($content, $position = 'head'): void { if (empty($content)) { return; @@ -897,7 +899,7 @@ public function addCustomTag($content, $position = 'head') } } - public function loadFontAwesome() + public function loadFontAwesome(): void { if (self::$_fontawesome) { return; @@ -905,7 +907,7 @@ public function loadFontAwesome() Helper\Font::loadFontAwesome(); } - public function loadFancyBox() + public function loadFancyBox(): void { if (self::$_fancybox) { return; @@ -916,13 +918,35 @@ public function loadFancyBox() self::$_fancybox = true; } - public function moveFile(&$array, $a, $b) + public function loadMasonry(): void + { + if (!self::$_masonry) { + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseScript('masonry', 'astroid/masonry.pkgd.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); + self::$_masonry = true; + } + } + + public function loadSlick($obj = '', $config = ''): void + { + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + if (!self::$_slick) { + $wa->registerAndUseStyle('slick.css', 'astroid/slick.min.css'); + $wa->registerAndUseScript('slick.js', 'astroid/slick.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); + self::$_slick = true; + } + if (!empty($obj) && !empty($config)) { + $wa->addInlineScript('jQuery(document).ready(function(){jQuery(\''.$obj.'\').slick({'.$config.'})});'); + } + } + + public function moveFile(&$array, $a, $b): void { $out = array_splice($array, $a, 1); array_splice($array, $b, 0, $out); } - public function getStylesheets() + public function getStylesheets(): string { $keys = array_keys($this->_stylesheets); foreach ($keys as $index => $key) { @@ -943,7 +967,7 @@ public function getStylesheets() return $content; } - public function renderScss($path) + public function renderScss($path): void { ini_set('memory_limit', '1024M'); Framework::getDebugger()->log('Rendering Scss'); @@ -1071,7 +1095,7 @@ public function renderScss($path) Helper::putContents($path, $css->getCss()); } - public function renderCss() + public function renderCss(): string { /* if (Framework::isSite()) { $template = Framework::getTemplate(); @@ -1090,7 +1114,7 @@ public function renderCss() return $cssScript; } - public function getBodyClass($extra_class = '') + public function getBodyClass($extra_class = ''): string { $template = Framework::getTemplate(); @@ -1160,7 +1184,7 @@ public function getBodyClass($extra_class = '') return implode(' ', $class); } - public function isBuilder() + public function isBuilder(): bool { $jinput = Factory::getApplication()->input; $option = $jinput->get('option', ''); @@ -1193,7 +1217,7 @@ public static function getDir($dir, $extension = null, &$results = array()) return $results; } - public static function scssHash() + public static function scssHash(): string { $params = Helper::getPluginParams(); $debug = $params->get('astroid_debug', 0); @@ -1220,7 +1244,7 @@ public static function scssHash() return md5($name); } - public function astroidCSS() + public function astroidCSS(): void { $getPluginParams = Helper::getPluginParams(); $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); @@ -1292,7 +1316,8 @@ public function astroidCustomCSS() { } } - public function astroidInlineCSS() { + public function astroidInlineCSS(): string + { // css on page $getPluginParams = Helper::getPluginParams(); $astroid_inline_css = $getPluginParams->get('astroid_inline_css', 0); From df8782dbda92e1ce5ff4763303b4b39eaea7c712 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 15:05:09 +0700 Subject: [PATCH 05/50] Update Image Group Widget use Masonry --- framework/elements/imagegroup/imagegroup.php | 14 +++++++------- framework/elements/imagegroup/imagegroup.xml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/framework/elements/imagegroup/imagegroup.php b/framework/elements/imagegroup/imagegroup.php index 4c9b6746..a3421f91 100644 --- a/framework/elements/imagegroup/imagegroup.php +++ b/framework/elements/imagegroup/imagegroup.php @@ -13,7 +13,7 @@ // No direct access. defined('_JEXEC') or die; -use Joomla\CMS\Factory; +use Astroid\Framework; use Astroid\Helper\Style; extract($displayData); @@ -27,6 +27,7 @@ } $enable_slider = $params->get('enable_slider', 0); +$use_masonry = $params->get('use_masonry', 0); $slider_autoplay = $params->get('slider_autoplay', 0); $slider_nav = $params->get('slider_nav', 1); $slider_dotnav = $params->get('slider_dotnav', 0); @@ -144,7 +145,7 @@ $text_color_mode = $params->get('text_color_mode', ''); $text_color_mode = $text_color_mode !== '' ? ' ' . $text_color_mode : ''; -echo '
'; +echo '
'; foreach ($images as $image) { $image_params = Style::getSubFormParams($image->params); if (!empty($image_params['image'])) { @@ -162,10 +163,9 @@ } } echo '
'; +$document = Framework::getDocument(); if ($enable_slider) { - $mainframe = Factory::getApplication(); - $wa = $mainframe->getDocument()->getWebAssetManager(); - $wa->registerAndUseStyle('slick.css', 'astroid/slick.min.css'); - $wa->registerAndUseScript('slick.js', 'astroid/slick.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); - echo ''; + $document->loadSlick('#'.$element->id.' .astroid-slick', implode(',', $slide_settings)); +} elseif ($use_masonry) { + $document->loadMasonry(); } \ No newline at end of file diff --git a/framework/elements/imagegroup/imagegroup.xml b/framework/elements/imagegroup/imagegroup.xml index 79e18fe8..ec66d96f 100644 --- a/framework/elements/imagegroup/imagegroup.xml +++ b/framework/elements/imagegroup/imagegroup.xml @@ -204,6 +204,7 @@ + From dff131e29383cb7228d76e40d6b4133fbd4cbcfa Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 15:25:00 +0700 Subject: [PATCH 06/50] Update blog use Masonry --- framework/html/com_content/category/blog.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/html/com_content/category/blog.php b/framework/html/com_content/category/blog.php index aea75265..58e7eb69 100644 --- a/framework/html/com_content/category/blog.php +++ b/framework/html/com_content/category/blog.php @@ -13,6 +13,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; use Joomla\CMS\Layout\LayoutHelper; +use Astroid\Framework; $app = Factory::getApplication(); @@ -31,6 +32,13 @@ $htag = $this->params->get('show_page_heading') ? 'h2' : 'h1'; +$use_masonry = $this->params->get('use_masonry', 0); + +if ($use_masonry) { + $document = Framework::getDocument(); + $document->loadMasonry(); +} + ?>
params->get('show_page_heading')) : ?> @@ -109,7 +117,7 @@ params->get('num_columns'); ?>
-
+
> intro_items as $key => &$item) : ?>
Date: Wed, 31 Jul 2024 15:34:02 +0700 Subject: [PATCH 07/50] Update dark mode for Image Widget --- framework/elements/image/image.php | 10 +++++++++- framework/elements/image/image.xml | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/framework/elements/image/image.php b/framework/elements/image/image.php index 5c900751..21f9be31 100644 --- a/framework/elements/image/image.php +++ b/framework/elements/image/image.php @@ -15,6 +15,7 @@ extract($displayData); $title = $params->get('title', ''); $image = $params->get('image', ''); +$image_dark = $params->get('image_dark', ''); $use_link = $params->get('use_link', 0); $link = $params->get('link', ''); $target = $params->get('target', ''); @@ -39,9 +40,16 @@ if ($use_link) { echo ''; } - echo '
'; + echo '
'; echo ''.$title.''; echo '
'; + if (!empty($image_dark)) { + echo '
'; + echo ''.$title.''; + echo '
'; + $element->style_dark->child('.as-image')->addCss('display', 'none !important'); + $element->style_dark->child('.as-image-dark')->addCss('display', 'inline-block !important'); + } if ($use_link) { echo ''; } diff --git a/framework/elements/image/image.xml b/framework/elements/image/image.xml index ffed2e11..68bad41b 100644 --- a/framework/elements/image/image.xml +++ b/framework/elements/image/image.xml @@ -9,7 +9,12 @@
- + + + + + + From 7a87c798cece7ae6795b549e707d0b88a8d23388 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 15:38:25 +0700 Subject: [PATCH 08/50] Update language --- language/en-GB/en-GB.astroid.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/language/en-GB/en-GB.astroid.ini b/language/en-GB/en-GB.astroid.ini index 43aeeaa6..f82b8593 100644 --- a/language/en-GB/en-GB.astroid.ini +++ b/language/en-GB/en-GB.astroid.ini @@ -118,6 +118,7 @@ TPL_ASTROID_SAVE_AS_DEFAULT="Save as Default" TPL_ASTROID_LOAD_DEFAULT_SETTINGS="Load Default Settings" TPL_ASTROID_SELECT_YOUR_THUMBNAIL="Select your thumbnail" TPL_ASTROID_THUMBNAIL="Thumbnail" +ASTROID_USE_MASONRY="Use Masonry" ; Tab Headings ASTROID_OPTIONS_BASIC="Basic" @@ -818,6 +819,8 @@ TPL_ASTROID_NEW_FOLDER_NAME_INVALID="Invalid folder name." TPL_ASTROID_REFRESH="Refresh" TPL_ASTROID_SELECT_IMAGES="Select Image" TPL_ASTROID_SELECT_IMAGE="Select Image" +TPL_ASTROID_SELECT_IMAGE_LIGHT="Select Image (Light Mode)" +TPL_ASTROID_SELECT_IMAGE_DARK="Select Image (Dark Mode)" TPL_ASTROID_CHANGE_IMAGES="Change Image" TPL_ASTROID_CHANGE_IMAGE="Change Image" TPL_ASTROID_SELECT_VIDEOS="Select Video" From bc083d693bde127798d31ae9d99542460cb3d757 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 15:41:21 +0700 Subject: [PATCH 09/50] Create masonry.pkgd.min.js --- js/masonry.pkgd.min.js | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 js/masonry.pkgd.min.js diff --git a/js/masonry.pkgd.min.js b/js/masonry.pkgd.min.js new file mode 100644 index 00000000..53386ae6 --- /dev/null +++ b/js/masonry.pkgd.min.js @@ -0,0 +1,9 @@ +/*! + * Masonry PACKAGED v4.2.2 + * Cascading grid layout library + * https://masonry.desandro.com + * MIT License + * by David DeSandro + */ + +!function(t,e){"function"==typeof define&&define.amd?define("jquery-bridget/jquery-bridget",["jquery"],function(i){return e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("jquery")):t.jQueryBridget=e(t,t.jQuery)}(window,function(t,e){"use strict";function i(i,r,a){function h(t,e,n){var o,r="$()."+i+'("'+e+'")';return t.each(function(t,h){var u=a.data(h,i);if(!u)return void s(i+" not initialized. Cannot call methods, i.e. "+r);var d=u[e];if(!d||"_"==e.charAt(0))return void s(r+" is not a valid method");var l=d.apply(u,n);o=void 0===o?l:o}),void 0!==o?o:t}function u(t,e){t.each(function(t,n){var o=a.data(n,i);o?(o.option(e),o._init()):(o=new r(n,e),a.data(n,i,o))})}a=a||e||t.jQuery,a&&(r.prototype.option||(r.prototype.option=function(t){a.isPlainObject(t)&&(this.options=a.extend(!0,this.options,t))}),a.fn[i]=function(t){if("string"==typeof t){var e=o.call(arguments,1);return h(this,t,e)}return u(this,t),this},n(a))}function n(t){!t||t&&t.bridget||(t.bridget=i)}var o=Array.prototype.slice,r=t.console,s="undefined"==typeof r?function(){}:function(t){r.error(t)};return n(e||t.jQuery),i}),function(t,e){"function"==typeof define&&define.amd?define("ev-emitter/ev-emitter",e):"object"==typeof module&&module.exports?module.exports=e():t.EvEmitter=e()}("undefined"!=typeof window?window:this,function(){function t(){}var e=t.prototype;return e.on=function(t,e){if(t&&e){var i=this._events=this._events||{},n=i[t]=i[t]||[];return-1==n.indexOf(e)&&n.push(e),this}},e.once=function(t,e){if(t&&e){this.on(t,e);var i=this._onceEvents=this._onceEvents||{},n=i[t]=i[t]||{};return n[e]=!0,this}},e.off=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){var n=i.indexOf(e);return-1!=n&&i.splice(n,1),this}},e.emitEvent=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){i=i.slice(0),e=e||[];for(var n=this._onceEvents&&this._onceEvents[t],o=0;oe;e++){var i=h[e];t[i]=0}return t}function n(t){var e=getComputedStyle(t);return e||a("Style returned "+e+". Are you running this code in a hidden iframe on Firefox? See https://bit.ly/getsizebug1"),e}function o(){if(!d){d=!0;var e=document.createElement("div");e.style.width="200px",e.style.padding="1px 2px 3px 4px",e.style.borderStyle="solid",e.style.borderWidth="1px 2px 3px 4px",e.style.boxSizing="border-box";var i=document.body||document.documentElement;i.appendChild(e);var o=n(e);s=200==Math.round(t(o.width)),r.isBoxSizeOuter=s,i.removeChild(e)}}function r(e){if(o(),"string"==typeof e&&(e=document.querySelector(e)),e&&"object"==typeof e&&e.nodeType){var r=n(e);if("none"==r.display)return i();var a={};a.width=e.offsetWidth,a.height=e.offsetHeight;for(var d=a.isBorderBox="border-box"==r.boxSizing,l=0;u>l;l++){var c=h[l],f=r[c],m=parseFloat(f);a[c]=isNaN(m)?0:m}var p=a.paddingLeft+a.paddingRight,g=a.paddingTop+a.paddingBottom,y=a.marginLeft+a.marginRight,v=a.marginTop+a.marginBottom,_=a.borderLeftWidth+a.borderRightWidth,z=a.borderTopWidth+a.borderBottomWidth,E=d&&s,b=t(r.width);b!==!1&&(a.width=b+(E?0:p+_));var x=t(r.height);return x!==!1&&(a.height=x+(E?0:g+z)),a.innerWidth=a.width-(p+_),a.innerHeight=a.height-(g+z),a.outerWidth=a.width+y,a.outerHeight=a.height+v,a}}var s,a="undefined"==typeof console?e:function(t){console.error(t)},h=["paddingLeft","paddingRight","paddingTop","paddingBottom","marginLeft","marginRight","marginTop","marginBottom","borderLeftWidth","borderRightWidth","borderTopWidth","borderBottomWidth"],u=h.length,d=!1;return r}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("desandro-matches-selector/matches-selector",e):"object"==typeof module&&module.exports?module.exports=e():t.matchesSelector=e()}(window,function(){"use strict";var t=function(){var t=window.Element.prototype;if(t.matches)return"matches";if(t.matchesSelector)return"matchesSelector";for(var e=["webkit","moz","ms","o"],i=0;is?"round":"floor";r=Math[a](r),this.cols=Math.max(r,1)},n.getContainerWidth=function(){var t=this._getOption("fitWidth"),i=t?this.element.parentNode:this.element,n=e(i);this.containerWidth=n&&n.innerWidth},n._getItemLayoutPosition=function(t){t.getSize();var e=t.size.outerWidth%this.columnWidth,i=e&&1>e?"round":"ceil",n=Math[i](t.size.outerWidth/this.columnWidth);n=Math.min(n,this.cols);for(var o=this.options.horizontalOrder?"_getHorizontalColPosition":"_getTopColPosition",r=this[o](n,t),s={x:this.columnWidth*r.col,y:r.y},a=r.y+t.size.outerHeight,h=n+r.col,u=r.col;h>u;u++)this.colYs[u]=a;return s},n._getTopColPosition=function(t){var e=this._getTopColGroup(t),i=Math.min.apply(Math,e);return{col:e.indexOf(i),y:i}},n._getTopColGroup=function(t){if(2>t)return this.colYs;for(var e=[],i=this.cols+1-t,n=0;i>n;n++)e[n]=this._getColGroupY(n,t);return e},n._getColGroupY=function(t,e){if(2>e)return this.colYs[t];var i=this.colYs.slice(t,t+e);return Math.max.apply(Math,i)},n._getHorizontalColPosition=function(t,e){var i=this.horizontalColIndex%this.cols,n=t>1&&i+t>this.cols;i=n?0:i;var o=e.size.outerWidth&&e.size.outerHeight;return this.horizontalColIndex=o?i+t:this.horizontalColIndex,{col:i,y:this._getColGroupY(i,t)}},n._manageStamp=function(t){var i=e(t),n=this._getElementOffset(t),o=this._getOption("originLeft"),r=o?n.left:n.right,s=r+i.outerWidth,a=Math.floor(r/this.columnWidth);a=Math.max(0,a);var h=Math.floor(s/this.columnWidth);h-=s%this.columnWidth?0:1,h=Math.min(this.cols-1,h);for(var u=this._getOption("originTop"),d=(u?n.top:n.bottom)+i.outerHeight,l=a;h>=l;l++)this.colYs[l]=Math.max(d,this.colYs[l])},n._getContainerSize=function(){this.maxY=Math.max.apply(Math,this.colYs);var t={height:this.maxY};return this._getOption("fitWidth")&&(t.width=this._getContainerFitWidth()),t},n._getContainerFitWidth=function(){for(var t=0,e=this.cols;--e&&0===this.colYs[e];)t++;return(this.cols-t)*this.columnWidth-this.gutter},n.needsResizeLayout=function(){var t=this.containerWidth;return this.getContainerWidth(),t!=this.containerWidth},i}); \ No newline at end of file From 65bef8b904cdadcb63e3b58b13d46adf52769c0f Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 16:00:41 +0700 Subject: [PATCH 10/50] Update menu_blog.xml --- framework/forms/menu_blog.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/framework/forms/menu_blog.xml b/framework/forms/menu_blog.xml index f9551520..4726203d 100644 --- a/framework/forms/menu_blog.xml +++ b/framework/forms/menu_blog.xml @@ -16,6 +16,10 @@ + + + + From b0b333c7eae28a158c7def587a23d8197e69dce4 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 17:11:40 +0700 Subject: [PATCH 11/50] Fix issue image display is incorrect in left or right mode --- assets/vendor/astroid/scss/joomla/_com_content.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/vendor/astroid/scss/joomla/_com_content.scss b/assets/vendor/astroid/scss/joomla/_com_content.scss index efdf022b..1aff20a0 100644 --- a/assets/vendor/astroid/scss/joomla/_com_content.scss +++ b/assets/vendor/astroid/scss/joomla/_com_content.scss @@ -30,7 +30,7 @@ bottom: 0; } @each $breakpoint, $width in $grid-breakpoints { - @include media-breakpoint-up($breakpoint, $grid-breakpoints) { + @include media-breakpoint-between($breakpoint, breakpoint-next($breakpoint), $grid-breakpoints) { @if ($breakpoint == 'xs') { &:not(.col-12) { > * { From 221e7e855573004d1128c6bdfb5ee5e409b005ff Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 31 Jul 2024 17:36:36 +0700 Subject: [PATCH 12/50] Fix issue warning when user param is null --- .../astroid/src/Extension/AstroidPlugin.php | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/astroid/src/Extension/AstroidPlugin.php b/plugins/astroid/src/Extension/AstroidPlugin.php index c89f07b6..a5f2185b 100644 --- a/plugins/astroid/src/Extension/AstroidPlugin.php +++ b/plugins/astroid/src/Extension/AstroidPlugin.php @@ -101,7 +101,7 @@ public function onAfterRespond() public function onContentPrepareData($context, $user) { // Fix issue Attempt to assign property "astroid_author_social0" on array of User Component - if ($context == 'com_users.profile') { + if ($context == 'com_users.profile' && isset($user->params) && !empty($user->params)) { $params = new \Joomla\Registry\Registry(); $params->loadArray($user->params); if (is_array($params->get('astroid_author_social')) && !count($params->get('astroid_author_social'))) { @@ -118,14 +118,16 @@ public function onContentPrepareData($context, $user) public function onUserAfterSave($user, $isnew, $success, $msg): void { // Fix issue Attempt to assign property "astroid_author_social0" on array of User Component - $params = new \Joomla\Registry\Registry($user['params']); - if (is_array($params->get('astroid_author_social')) && !count($params->get('astroid_author_social'))) { - $params->remove('astroid_author_social'); - $db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class); - $object = new \stdClass(); - $object->id = $user['id']; - $object->params = $params->toString(); - $db->updateObject('#__users', $object, 'id'); + if (isset($user['params']) && !empty($user['params'])) { + $params = new \Joomla\Registry\Registry($user['params']); + if (is_array($params->get('astroid_author_social')) && !count($params->get('astroid_author_social'))) { + $params->remove('astroid_author_social'); + $db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class); + $object = new \stdClass(); + $object->id = $user['id']; + $object->params = $params->toString(); + $db->updateObject('#__users', $object, 'id'); + } } } From e5a803d74f1ef6801d75c9cb025df8986674d5fd Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Thu, 1 Aug 2024 11:24:33 +0700 Subject: [PATCH 13/50] Improve Related article style --- framework/frontend/blog/modules/related.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/framework/frontend/blog/modules/related.php b/framework/frontend/blog/modules/related.php index b1fdfa10..3b4c71d5 100644 --- a/framework/frontend/blog/modules/related.php +++ b/framework/frontend/blog/modules/related.php @@ -11,6 +11,7 @@ */ use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; +use Joomla\Registry\Registry; // No direct access. defined('_JEXEC') or die; @@ -25,16 +26,25 @@
images); $astroidArticle = new Astroid\Article($item, true); + // Post Format + $post_attribs = new Registry(json_decode($item->attribs)); + $post_format = $post_attribs->get('post_format', 'standard'); + $image = $astroidArticle->getImage(); ?>
image_intro)) { + echo ''; + } else if (is_string($image) && !empty($image)) { + echo '
'; + $document->include('blog.modules.image', ['image' => $image, 'title' => $item->title, 'item' => $item]); + echo '
'; + } else { + echo LayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $post_attribs, 'item' => $item)); + } ?> - - - -

title; ?> From 7cd72e0aea9b6f991810560549104cf354ae0e10 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Thu, 1 Aug 2024 12:07:59 +0700 Subject: [PATCH 14/50] Update Document.php --- framework/library/astroid/Document.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/library/astroid/Document.php b/framework/library/astroid/Document.php index 4f41d9c0..23644696 100644 --- a/framework/library/astroid/Document.php +++ b/framework/library/astroid/Document.php @@ -921,8 +921,9 @@ public function loadFancyBox(): void public function loadMasonry(): void { if (!self::$_masonry) { - $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); - $wa->registerAndUseScript('masonry', 'astroid/masonry.pkgd.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); +// $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); +// $wa->registerAndUseScript('masonry', 'astroid/masonry.pkgd.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); + $this->addScript('media/astroid/js/masonry.pkgd.min.js'); self::$_masonry = true; } } From 675123fb610649e2f8df79895b9d8e3c583f4cf9 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Thu, 1 Aug 2024 15:19:25 +0700 Subject: [PATCH 15/50] Update Masonry script --- framework/elements/imagegroup/imagegroup.php | 7 ++++++- framework/html/com_content/category/blog.php | 7 +++++-- framework/library/astroid/Document.php | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/framework/elements/imagegroup/imagegroup.php b/framework/elements/imagegroup/imagegroup.php index a3421f91..c4f4d0e0 100644 --- a/framework/elements/imagegroup/imagegroup.php +++ b/framework/elements/imagegroup/imagegroup.php @@ -37,6 +37,10 @@ $row_column_cls = 'row'; +if ($use_masonry && !$enable_slider) { + $row_column_cls .= ' as-masonry'; +} + $xxl_column = $params->get('xxl_column', ''); if ($xxl_column) { $slide_settings[]= 'slidesToShow: ' . $xxl_column; @@ -145,7 +149,7 @@ $text_color_mode = $params->get('text_color_mode', ''); $text_color_mode = $text_color_mode !== '' ? ' ' . $text_color_mode : ''; -echo '
'; +echo '
'; foreach ($images as $image) { $image_params = Style::getSubFormParams($image->params); if (!empty($image_params['image'])) { @@ -164,6 +168,7 @@ } echo '
'; $document = Framework::getDocument(); + if ($enable_slider) { $document->loadSlick('#'.$element->id.' .astroid-slick', implode(',', $slide_settings)); } elseif ($use_masonry) { diff --git a/framework/html/com_content/category/blog.php b/framework/html/com_content/category/blog.php index 58e7eb69..affba30c 100644 --- a/framework/html/com_content/category/blog.php +++ b/framework/html/com_content/category/blog.php @@ -114,10 +114,13 @@ intro_items)) : ?> params->get('blog_class', ''); ?> params->get('num_columns') > 1) : ?> - params->get('num_columns'); ?> + params->get('num_columns'); + $blogClass .= $use_masonry ? ' as-masonry' : ''; + ?>
-
> +
intro_items as $key => &$item) : ?>
getDocument()->getWebAssetManager(); -// $wa->registerAndUseScript('masonry', 'astroid/masonry.pkgd.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); - $this->addScript('media/astroid/js/masonry.pkgd.min.js'); + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseScript('masonry', 'astroid/masonry.pkgd.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); + $wa->addInlineScript('jQuery(document).ready(function(){$(\'.as-masonry\').masonry({itemSelector: \'.as-masonry > div\',percentPosition: true});});'); self::$_masonry = true; } } From 4165d000c76d65e25e845e048c2b1175d02c96b9 Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 7 Aug 2024 11:58:27 +0700 Subject: [PATCH 16/50] Update Article Widget use Masonry --- framework/elements/articles/articles.php | 17 ++++++++++++----- framework/elements/articles/articles.xml | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/framework/elements/articles/articles.php b/framework/elements/articles/articles.php index 9daf1028..5ceba5bf 100644 --- a/framework/elements/articles/articles.php +++ b/framework/elements/articles/articles.php @@ -15,6 +15,7 @@ use Astroid\Helper\Style; use Astroid\Component\Article; +use Astroid\Framework; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Layout\FileLayout; use Joomla\CMS\Factory; @@ -37,6 +38,7 @@ $items = Article::getArticles($limit, $ordering, $categories); $enable_slider = $params->get('enable_slider', 0); +$use_masonry = $params->get('use_masonry', 0); $slider_autoplay = $params->get('slider_autoplay', 0); $slider_nav = $params->get('slider_nav', 1); $slider_dotnav = $params->get('slider_dotnav', 0); @@ -48,6 +50,10 @@ $style_dark = new Style('#'. $element->id, 'dark'); $row_column_cls = 'row'; +if ($use_masonry && !$enable_slider) { + $row_column_cls .= ' as-masonry'; +} + $xxl_column = $params->get('xxl_column', ''); if ($xxl_column) { $slide_settings[]= 'slidesToShow: ' . $xxl_column; @@ -276,7 +282,7 @@ $media = $renderer->render(['article' => $item]); break; } - $item_image_cover = !empty($item->image_thumbnail) ? $enable_image_cover : 0; + $item_image_cover = !empty($item->image_thumbnail) && ($enable_image_cover || $layout == 'overlay'); if ($item_image_cover) { $media = '
'.$item->title.'
'; } @@ -293,7 +299,7 @@ echo '
'; } - echo '
'; // Start Card-Body + echo '
'; // Start Card-Body if ($media_position == 'inside') { echo $media; @@ -352,10 +358,11 @@ if ($has_gallery) { $wa->useScript('bootstrap.carousel'); } +$document = Framework::getDocument(); if ($enable_slider) { - $wa->registerAndUseStyle('slick.css', 'astroid/slick.min.css'); - $wa->registerAndUseScript('slick.js', 'astroid/slick.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); - echo ''; + $document->loadSlick('#'.$element->id.' .astroid-slick', implode(',', $slide_settings)); +} elseif ($use_masonry) { + $document->loadMasonry(); } if ($params->get('card_size', '') == 'custom') { $card_padding = $params->get('card_padding', ''); diff --git a/framework/elements/articles/articles.xml b/framework/elements/articles/articles.xml index 36ac5017..efd405ca 100644 --- a/framework/elements/articles/articles.xml +++ b/framework/elements/articles/articles.xml @@ -196,6 +196,8 @@ + + From 9a5c0db9792de3da927d531203c00fa3fafbf4ed Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Wed, 7 Aug 2024 16:12:32 +0700 Subject: [PATCH 17/50] Add more options for Grid media left/right --- framework/elements/grid/grid.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/framework/elements/grid/grid.xml b/framework/elements/grid/grid.xml index afb62a08..4dac13bc 100644 --- a/framework/elements/grid/grid.xml +++ b/framework/elements/grid/grid.xml @@ -282,6 +282,8 @@ + + @@ -294,6 +296,8 @@ + + @@ -306,6 +310,8 @@ + + @@ -318,6 +324,8 @@ + + @@ -330,6 +338,8 @@ + + @@ -342,6 +352,8 @@ + + From bf35c8fd0bf04d341c31ac15bf613e5053b749aa Mon Sep 17 00:00:00 2001 From: Sonny Le Date: Thu, 8 Aug 2024 14:43:41 +0700 Subject: [PATCH 18/50] Add local video to Video article type --- assets/vendor/astroid/scss/_variables.scss | 2 ++ .../vendor/astroid/scss/components/_blog.scss | 13 +++++++++ framework/elements/articles/articles.php | 29 ++++++++++++++----- framework/elements/section-default.xml | 2 +- framework/forms/article.xml | 4 ++- framework/frontend/blog/modules/posttype.php | 5 +++- framework/frontend/blog/video.php | 17 ++++++++--- framework/frontend/comingsoon.php | 2 +- .../html/com_content/category/blog_item.php | 18 ++++++++++-- framework/layouts/system/error.php | 2 +- framework/library/astroid/Document.php | 12 +++++++- .../library/astroid/Element/BaseElement.php | 10 ++++--- js/videobg.js | 19 ++++++++---- js/videobg.min.js | 2 +- 14 files changed, 106 insertions(+), 31 deletions(-) diff --git a/assets/vendor/astroid/scss/_variables.scss b/assets/vendor/astroid/scss/_variables.scss index 2c03bb37..b9e14573 100644 --- a/assets/vendor/astroid/scss/_variables.scss +++ b/assets/vendor/astroid/scss/_variables.scss @@ -98,6 +98,7 @@ $selection-text-color: $white !default; $post-type-quote-bg: #bfe6ff !default; $post-type-gallery-bg: #e5f9f1 !default; $post-type-review-bg: #f5db8b !default; +$post-type-video-local-bg: #fee8eb !default; $post-type-youtube-bg: #fee8eb !default; $post-type-vimeo-bg: #76d3f2 !default; $post-type-soundcloud-bg: #fff1ea !default; @@ -106,6 +107,7 @@ $post-type-regular-color: #fff !default; $post-type-quote-color: #45a9ea !default; $post-type-gallery-color: #0dc772 !default; $post-type-review-color: #bb900b !default; +$post-type-video-local-color: #f23453 !default; $post-type-youtube-color: #f23453 !default; $post-type-vimeo-color: #1dabda !default; $post-type-soundcloud-color: #ff7930 !default; diff --git a/assets/vendor/astroid/scss/components/_blog.scss b/assets/vendor/astroid/scss/components/_blog.scss index 09d3663c..1f0f7c80 100644 --- a/assets/vendor/astroid/scss/components/_blog.scss +++ b/assets/vendor/astroid/scss/components/_blog.scss @@ -130,6 +130,19 @@ $article-posttype-spacing: 40px; } } + &.article-icon-local { + background-color: $post-type-video-local-bg; + color: $post-type-video-local-color; + + &:before { + @include triangle(6px, darken($post-type-video-local-bg, 15%), down-left); + } + + &:after { + @include triangle($article-posttype-icon-width $article-posttype-icon-width/2, transparent $post-type-video-local-bg, up); + } + } + &.article-icon-vimeo { background-color: $post-type-vimeo-bg; color: $post-type-vimeo-color; diff --git a/framework/elements/articles/articles.php b/framework/elements/articles/articles.php index 5ceba5bf..5af2a1ec 100644 --- a/framework/elements/articles/articles.php +++ b/framework/elements/articles/articles.php @@ -22,6 +22,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; use Joomla\Component\Content\Site\Helper\RouteHelper; +use Joomla\CMS\Uri\Uri; extract($displayData); $catids = json_decode($params->get('catids', '[]'), true); @@ -33,6 +34,7 @@ foreach ($catids as $catid) { $categories[] = $catid['value']; } +$document = Framework::getDocument(); $limit = $params->get('limit', 3); $ordering = $params->get('ordering', 'latest'); $items = Article::getArticles($limit, $ordering, $categories); @@ -266,16 +268,23 @@ break; case 'video': $video_url = $item->params->get('astroid_article_video_url', ''); + $video_local_url = $item->params->get('astroid_article_video_local', ''); $video_type = $item->params->get('astroid_article_video_type', ''); $video_src = Article::getVideoSrc($video_url); - if ($video_src) { - if ($video_type == 'vimeo') { - $video_src .= '?autoplay=1&loop=1&muted=1&autopause=0&title=0&byline=0&portrait=0&controls=0'; + if ($video_type !== 'local') { + if ($video_src) { + if ($video_type == 'vimeo') { + $video_src .= '?autoplay=1&loop=1&muted=1&autopause=0&title=0&byline=0&portrait=0&controls=0'; + } + $media = '
'; + $media .= ''; + $media .= '
'; } - $media = '
'; - $media .= ''; - $media .= '
'; + } elseif (!empty($video_local_url)) { + $document->loadVideoBG(); + $media = '
image_thumbnail) ? ' data-as-video-poster="'.$item->image_thumbnail.'"' : '').'>
'; } + break; case 'audio': $renderer = new FileLayout('blog.audio', JPATH_LIBRARIES . '/astroid/framework/frontend'); @@ -283,7 +292,7 @@ break; } $item_image_cover = !empty($item->image_thumbnail) && ($enable_image_cover || $layout == 'overlay'); - if ($item_image_cover) { + if ($item_image_cover && ($item->post_format !== 'video' || $video_type !== 'local')) { $media = '
'.$item->title.'
'; } echo '
'; @@ -358,7 +367,7 @@ if ($has_gallery) { $wa->useScript('bootstrap.carousel'); } -$document = Framework::getDocument(); + if ($enable_slider) { $document->loadSlick('#'.$element->id.' .astroid-slick', implode(',', $slide_settings)); } elseif ($use_masonry) { @@ -406,11 +415,15 @@ $overlay_color = Style::getColor($params->get('overlay_color', '')); $style->child('.astroid-image-overlay-cover:after')->addCss('background-color', $overlay_color['light']); $style_dark->child('.astroid-image-overlay-cover:after')->addCss('background-color', $overlay_color['dark']); + + $style->child('.astroid-element-overlay:before')->addCss('background-color', $overlay_color['light']); + $style_dark->child('.astroid-element-overlay:before')->addCss('background-color', $overlay_color['dark']); break; case 'background-color': $overlay_gradient = $params->get('overlay_gradient', ''); if (!empty($overlay_gradient)) { $style->child('.astroid-image-overlay-cover:after')->addCss('background-image', Style::getGradientValue($overlay_gradient)); + $style->child('.astroid-element-overlay:before')->addCss('background-image', Style::getGradientValue($overlay_gradient)); } break; } diff --git a/framework/elements/section-default.xml b/framework/elements/section-default.xml index 4ec38171..3adc0728 100644 --- a/framework/elements/section-default.xml +++ b/framework/elements/section-default.xml @@ -40,7 +40,7 @@ - + diff --git a/framework/forms/article.xml b/framework/forms/article.xml index d5329aed..89b8852e 100644 --- a/framework/forms/article.xml +++ b/framework/forms/article.xml @@ -15,8 +15,10 @@ + - + + diff --git a/framework/frontend/blog/modules/posttype.php b/framework/frontend/blog/modules/posttype.php index 152c40c7..d5c4f5ab 100644 --- a/framework/frontend/blog/modules/posttype.php +++ b/framework/frontend/blog/modules/posttype.php @@ -23,7 +23,10 @@ switch ($type) { case 'video': $type = $params->get('astroid_article_video_type', 'youtube'); - $icon = 'fab fa-' . $type; + $icon = match ($type) { + 'local' => 'fa-solid fa-video', + default => 'fab fa-' . $type, + }; break; case 'gallery': $icon = 'far fa-images'; diff --git a/framework/frontend/blog/video.php b/framework/frontend/blog/video.php index 054359f0..3d65a94f 100644 --- a/framework/frontend/blog/video.php +++ b/framework/frontend/blog/video.php @@ -17,11 +17,20 @@ $type = $params->get('astroid_article_video_type', 'youtube'); $url = $params->get('astroid_article_video_url', ''); -$content = Astroid\Helper\Video::getVideoByTypeUrl($type, $url, true); -$thumbnail = Astroid\Helper\Video::getVideoThumbnailByTypeUrl($type, $url); -if (empty($content)) { - return; +$local_url = $params->get('astroid_article_video_local', ''); + +if ($type !== 'local') { + $content = Astroid\Helper\Video::getVideoByTypeUrl($type, $url, true); + $thumbnail = Astroid\Helper\Video::getVideoThumbnailByTypeUrl($type, $url); + if (empty($content)) { + return; + } +} elseif (!empty($local_url)) { + $content = ''; +} else { + return; } + ?>
diff --git a/framework/frontend/comingsoon.php b/framework/frontend/comingsoon.php index c83ffafd..9ff6b257 100644 --- a/framework/frontend/comingsoon.php +++ b/framework/frontend/comingsoon.php @@ -79,7 +79,7 @@ $attributes = []; $background_video = $params->get('background_video', ''); if (!empty($background_video)) { - $attributes['data-jd-video-bg'] = Uri::root() . Astroid\Helper\Media::getPath() . '/' . $background_video; + $attributes['data-as-video-bg'] = Uri::root() . Astroid\Helper\Media::getPath() . '/' . $background_video; $wa->registerAndUseScript('astroid.videobg', 'astroid/videobg.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); } diff --git a/framework/html/com_content/category/blog_item.php b/framework/html/com_content/category/blog_item.php index 9fb01150..00c20ead 100644 --- a/framework/html/com_content/category/blog_item.php +++ b/framework/html/com_content/category/blog_item.php @@ -44,6 +44,8 @@ // Post Format $post_attribs = new Registry(json_decode($this->item->attribs)); $post_format = $post_attribs->get('post_format', 'standard'); +$astroid_article_type = $post_attribs->get('astroid_article_type', ''); +$astroid_article_video_type = $post_attribs->get('astroid_article_video_type', ''); // Image position $image_width = array(); @@ -78,7 +80,12 @@
getImage(); + if ($astroid_article_type == 'video' && $astroid_article_video_type == 'local') { + $astroid_article_video_local = $post_attribs->get('astroid_article_video_local', ''); + $image = '
image_intro) ? ' data-as-video-poster="'.$images->image_intro.'"' : '').'>
'; + } else { + $image = $astroidArticle->getImage(); + } if (((!empty($images->image_intro)) && $post_format == 'standard') || (is_string($image) && !empty($image))) { if ($image_position == 'left' || $image_position == 'right' || $image_position == 'bottom') { if ($image_position == 'left' || $image_position == 'right') { @@ -90,11 +97,16 @@ } } // Generate media - if ((!empty($images->image_intro)) && $post_format == 'standard') { + if ((!empty($images->image_intro)) && $post_format == 'standard' && ($astroid_article_type !== 'video' || $astroid_article_video_type !== 'local')) { echo LayoutHelper::render('joomla.content.intro_image', $this->item); } else if (is_string($image) && !empty($image)) { echo '
'; - $document->include('blog.modules.image', ['image' => $image, 'title' => $this->item->title, 'item' => $this->item]); + if ($astroid_article_type == 'video' && $astroid_article_video_type == 'local') { + $document->loadVideoBG(); + echo $image; + } else { + $document->include('blog.modules.image', ['image' => $image, 'title' => $this->item->title, 'item' => $this->item]); + } echo '
'; } else { echo LayoutHelper::render('joomla.content.post_formats.post_' . $post_format, array('params' => $post_attribs, 'item' => $this->item)); diff --git a/framework/layouts/system/error.php b/framework/layouts/system/error.php index fbea1489..81b91ad8 100644 --- a/framework/layouts/system/error.php +++ b/framework/layouts/system/error.php @@ -32,7 +32,7 @@ if ($background_setting_404 == 'video' && !empty($background_video_404)) { $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); $wa->registerAndUseScript('astroid.videobg', 'astroid/videobg.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); - $bodyAttrs[] = 'data-jd-video-bg="' . Uri::root() . Astroid\Helper\Media::getPath() . '/' . $background_video_404 . '"'; + $bodyAttrs[] = 'data-as-video-bg="' . Uri::root() . Astroid\Helper\Media::getPath() . '/' . $background_video_404 . '"'; } ?> diff --git a/framework/library/astroid/Document.php b/framework/library/astroid/Document.php index c162e13e..4a2354cc 100644 --- a/framework/library/astroid/Document.php +++ b/framework/library/astroid/Document.php @@ -36,6 +36,7 @@ class Document protected static $_fancybox = false; protected static $_masonry = false; protected static $_slick = false; + protected static $_videojs = false; protected static $_layout_paths = []; protected $type = null; protected $modules = null; @@ -923,7 +924,7 @@ public function loadMasonry(): void if (!self::$_masonry) { $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); $wa->registerAndUseScript('masonry', 'astroid/masonry.pkgd.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); - $wa->addInlineScript('jQuery(document).ready(function(){$(\'.as-masonry\').masonry({itemSelector: \'.as-masonry > div\',percentPosition: true});});'); + $wa->addInlineScript('jQuery(window).on("load", function(){$(\'.as-masonry\').masonry({itemSelector: \'.as-masonry > div\',percentPosition: true});});'); self::$_masonry = true; } } @@ -941,6 +942,15 @@ public function loadSlick($obj = '', $config = ''): void } } + public function loadVideoBG(): void + { + if (!self::$_videojs) { + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseScript('astroid.videobg', 'astroid/videobg.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); + self::$_videojs = true; + } + } + public function moveFile(&$array, $a, $b): void { $out = array_splice($array, $a, 1); diff --git a/framework/library/astroid/Element/BaseElement.php b/framework/library/astroid/Element/BaseElement.php index 9e9377bb..bcd019b3 100644 --- a/framework/library/astroid/Element/BaseElement.php +++ b/framework/library/astroid/Element/BaseElement.php @@ -18,6 +18,7 @@ use Astroid\Helper; use Astroid\Helper\Media; use Astroid\Helper\Style; +use Astroid\Framework; use Joomla\CMS\Factory; use Joomla\Registry\Registry; use Joomla\CMS\Uri\Uri; @@ -210,7 +211,7 @@ protected function _background() $this->style_dark->addCss('background-color', $background_color['dark']); $image = $this->params->get('background_image', ''); if (!empty($image)) { - $this->style->addCss('background-image', 'url(' . Uri::root() . Media::getPath() . '/' . $image . ')'); + $this->style->addCss('background-image', 'url(' . Uri::base(true) . '/' . Media::getPath() . '/' . $image . ')'); $this->style->addCss('background-repeat', $this->params->get('background_repeat', '')); $this->style->addCss('background-size', $this->params->get('background_size', '')); $this->style->addCss('background-attachment', $this->params->get('background_attchment', '')); @@ -220,10 +221,11 @@ protected function _background() break; case 'video': // if video background $video = $this->params->get('background_video', ''); + $poster = $this->params->get('background_image', ''); if (!empty($video)) { - $this->addAttribute('data-jd-video-bg', Uri::root() . Media::getPath() . '/' . $video); - $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); - $wa->registerAndUseScript('astroid.videobg', 'astroid/videobg.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']); + $this->addAttribute('data-as-video-bg', Uri::base(true) . '/' . Media::getPath() . '/' . $video); + $this->addAttribute('data-as-video-poster', Uri::base(true) . '/' . Media::getPath() . '/' . $poster); + Framework::getDocument()->loadVideoBG(); $this->addOverlayColor(); } break; diff --git a/js/videobg.js b/js/videobg.js index 81f0e532..3843118c 100644 --- a/js/videobg.js +++ b/js/videobg.js @@ -1,7 +1,8 @@ (function ($) { - $.fn.JDVideoBG = function () { + $.fn.ASVideoBG = function () { return this.each(function () { - var _url = $(this).data('jd-video-bg'); + var _url = $(this).data('as-video-bg'), + _poster = $(this).data('as-video-poster'); $(this).css('position', 'relative'); $(this).children().css('position', 'relative'); $(this).children().css('z-index', '1'); @@ -20,8 +21,14 @@ playsinline: true, autoplay: true, loop: true, - src: _url + src: _url, }); + + if (typeof _poster !== 'undefined' && _poster) { + _container.css('background', 'url('+_poster+')'); + _container.css('background-size', 'cover'); + _container.css('background-position', 'center center'); + } _video.css('position', 'absolute'); _video.css('top', '50%'); _video.css('left', '50%'); @@ -33,12 +40,14 @@ _video.css('transform', 'translate(-50%, -50%)'); _video.css('max-width', 'inherit'); _video.prop('muted', true); - _container.append(_video); + $(window).on('load', function () { + _container.append(_video); + }); $(this).prepend(_container); }); }; $(function () { - $('[data-jd-video-bg]').JDVideoBG(); + $('[data-as-video-bg]').ASVideoBG(); }); }(jQuery)); diff --git a/js/videobg.min.js b/js/videobg.min.js index 384db30b..7d54c898 100644 --- a/js/videobg.min.js +++ b/js/videobg.min.js @@ -1 +1 @@ -(function($){$.fn.JDVideoBG=function(){return this.each(function(){var _url=$(this).data("jd-video-bg");$(this).css("position","relative");$(this).children().css("position","relative");$(this).children().css("z-index","1");var _container=$("
");_container.addClass("astroid-element-overlay");_container.css("position","absolute");_container.css("top","0");_container.css("left","0");_container.css("width","100%");_container.css("height","100%");_container.css("overflow","hidden");_container.css("z-index","0");var _video=$("