+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/vendor/manager/src/components/helpers/ResponsiveToggle.vue b/assets/vendor/manager/src/components/helpers/ResponsiveToggle.vue
new file mode 100644
index 00000000..530071d6
--- /dev/null
+++ b/assets/vendor/manager/src/components/helpers/ResponsiveToggle.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/vendor/manager/src/components/helpers/Spacing.vue b/assets/vendor/manager/src/components/helpers/Spacing.vue
index b57fc8cb..a86f3852 100644
--- a/assets/vendor/manager/src/components/helpers/Spacing.vue
+++ b/assets/vendor/manager/src/components/helpers/Spacing.vue
@@ -1,12 +1,28 @@
-
+
-
@@ -73,14 +97,8 @@ function updateUnit() {
-
-
+
-
-
-
-
-
+
diff --git a/assets/vendor/manager/src/components/helpers/SwitchBox.vue b/assets/vendor/manager/src/components/helpers/SwitchBox.vue
new file mode 100644
index 00000000..9923f54e
--- /dev/null
+++ b/assets/vendor/manager/src/components/helpers/SwitchBox.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/vendor/manager/src/components/helpers/TypoResponsive.vue b/assets/vendor/manager/src/components/helpers/TypoResponsive.vue
index 78b0019e..ada9b7bd 100644
--- a/assets/vendor/manager/src/components/helpers/TypoResponsive.vue
+++ b/assets/vendor/manager/src/components/helpers/TypoResponsive.vue
@@ -1,11 +1,20 @@
-
+
{{ props.field.input.lang[props.fieldname] }}
-
-
-
+
-
-
-
-
-
+
diff --git a/assets/vendor/manager/src/components/helpers/Typography.vue b/assets/vendor/manager/src/components/helpers/Typography.vue
index 32e69abe..fce315b6 100644
--- a/assets/vendor/manager/src/components/helpers/Typography.vue
+++ b/assets/vendor/manager/src/components/helpers/Typography.vue
@@ -58,7 +58,8 @@ const fontSelected= ref({
});
const fonttypes = ref(['system','google'])
const font_type = ref('google');
-const currentDevice = ref('desktop');
+const currentDevice = ref('mobile');
+const collapse = ref(false);
function getFontType(font_face) {
if (font_face.search(/^library-font-/) !== -1) {
@@ -149,8 +150,18 @@ watch(fontSelected, (newFont) => {
}
})
-function changeDeviceStatus(device) {
+const updateStatus = ref({
+ font_size: false,
+ letter_spacing: false,
+ line_height: false
+});
+function changeDeviceStatus(device, fieldname) {
currentDevice.value = device;
+ Object.keys(updateStatus.value).forEach(key => {
+ if (key !== fieldname) {
+ updateStatus.value[key] = true;
+ }
+ });
}
const _showColorPicker = ref(false);
@@ -199,9 +210,47 @@ function getRandomInt(min, max) {
max = Math.floor(max);
return Math.floor(Math.random() * (max - min + 1)) + min;
}
+
+function toggleCollapse() {
+ collapse.value = !collapse.value;
+}
-
-
+
+
+
+
+
+
+
+
+
+ {{ fontSelected.text === '' || fontSelected.text === 'Default' ? props.field.input.lang.inherit : fontSelected.text }}
+
+
+
+
+
+
+ {{ props.field.input.lang.font_size }}
+ {{ props.modelValue['font_size'][currentDevice] !== '' ? props.modelValue['font_size'][currentDevice]+props.modelValue['font_size_unit'][currentDevice] : props.field.input.lang.inherit }}
+ /
+
+
+ {{ props.field.input.lang.line_height }}
+ {{ props.modelValue['line_height'][currentDevice] !== '' ? props.modelValue['line_height'][currentDevice]+props.modelValue['line_height_unit'][currentDevice] : props.field.input.lang.inherit }}
+
@@ -251,7 +300,10 @@ function getRandomInt(min, max) {
:field="props.field"
:fieldname="'font_size'"
:current-device="currentDevice"
- @update:change-device="changeDeviceStatus" />
+ @update:change-device="changeDeviceStatus"
+ :fieldChanged="updateStatus.font_size"
+ @update:statusField="status => (updateStatus.font_size = status)"
+ />
+
+
+
\ No newline at end of file
diff --git a/assets/vendor/manager/src/main.js b/assets/vendor/manager/src/main.js
index 0cdf9557..80eba0cf 100644
--- a/assets/vendor/manager/src/main.js
+++ b/assets/vendor/manager/src/main.js
@@ -5,7 +5,6 @@ import Module from './Module.vue';
import "vue-search-select/dist/VueSearchSelect.css"
import 'vue-color-kit/dist/vue-color-kit.css'
import 'quill/dist/quill.snow.css'
-import { FontAwesomeIcon, FontAwesomeLayers, FontAwesomeLayersText } from '@fortawesome/vue-fontawesome'
import { install as VueMonacoEditorPlugin } from '@guolao/vue-monaco-editor'
let astroid_app = document.getElementById('astroid-app');
let as_widgets = document.querySelectorAll('.as-article-widget-data');
@@ -19,9 +18,6 @@ if (typeof(astroid_app) !== 'undefined' && astroid_app !== null)
vs: 'https://cdn.jsdelivr.net/npm/monaco-editor@0.36.0/min/vs'
},
});
- app.component('font-awesome-icon', FontAwesomeIcon);
- app.component('font-awesome-layers', FontAwesomeLayers);
- app.component('font-awesome-layers-text', FontAwesomeLayersText);
app.mount('#astroid-app')
}
else if (as_widgets.length > 0) {
@@ -35,13 +31,10 @@ else if (as_widgets.length > 0) {
vs: 'https://cdn.jsdelivr.net/npm/monaco-editor@0.36.0/min/vs'
},
});
- app.component('font-awesome-icon', FontAwesomeIcon);
- app.component('font-awesome-layers', FontAwesomeLayers);
- app.component('font-awesome-layers-text', FontAwesomeLayersText);
app.mount('#'+as_widget.id);
});
}
-if (typeof(as_module) !== 'undefined' && as_module !== null)
+else if (typeof(as_module) !== 'undefined' && as_module !== null)
{
const app = createApp(Module);
app.use(VueMonacoEditorPlugin, {
diff --git a/astroid.xml b/astroid.xml
index 565a922d..daf5cf66 100644
--- a/astroid.xml
+++ b/astroid.xml
@@ -3,8 +3,8 @@
Astroid Framework
astroid
Astroid Framework Team
- December 2024
- 3.1.9
+ Jan 2025
+ 3.1.10-rc5
https://astroidframe.work/
Copyright (C) 2024 TemPlaza, Inc. All rights reserved.
GNU General Public License version 3 or later; see LICENSE.txt
diff --git a/framework/elements/articles/articles.php b/framework/elements/articles/articles.php
index 41fd6d1d..300e50ac 100644
--- a/framework/elements/articles/articles.php
+++ b/framework/elements/articles/articles.php
@@ -189,6 +189,7 @@
// Image Options
$layout = $params->get('layout', 'classic');
+$thumbnail_only = $params->get('thumbnail_only', 0);
$enable_image_cover = $params->get('enable_image_cover', 0);
$min_height = $params->get('min_height', 500);
$height = $params->get('height', '');
@@ -256,63 +257,67 @@
foreach ($items as $key => $item) {
$link = RouteHelper::getArticleRoute($item->slug, $item->catid, $item->language);
$media = '';
- switch ($item->post_format) {
- case 'gallery':
- $gallery = (array) $item->params->get('astroid_article_gallery_items', array());
- if (count($gallery)) {
- $has_gallery = true;
- $media = '
0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
';
- $media .= '
';
- $active = true;
- foreach ($gallery as $gallery_item) {
- $media .= '';
- }
- 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_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 = '
';
+ 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_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 = '';
+ }
}
+ } elseif (!empty($video_local_url)) {
+ $document->loadVideoBG();
+ $media = '';
+ }
+ break;
+ case 'audio':
+ $renderer = new FileLayout('blog.audio', JPATH_LIBRARIES . '/astroid/framework/frontend');
+ $media = $renderer->render(['article' => $item]);
+ break;
+ default:
+ if (!empty($item->image_thumbnail)) {
+ $media = '';
}
- } elseif (!empty($video_local_url)) {
- $document->loadVideoBG();
- $media = '';
- }
- break;
- case 'audio':
- $renderer = new FileLayout('blog.audio', JPATH_LIBRARIES . '/astroid/framework/frontend');
- $media = $renderer->render(['article' => $item]);
- break;
- default:
- if (!empty($item->image_thumbnail)) {
- $media = '';
- }
- break;
+ break;
+ }
}
$item_image_cover = !empty($item->image_thumbnail) && ($enable_image_cover || $layout == 'overlay');
if ($item_image_cover && ($item->post_format !== 'video' || $video_type !== 'local')) {
diff --git a/framework/elements/articles/articles.xml b/framework/elements/articles/articles.xml
index 86695f39..0f90b755 100644
--- a/framework/elements/articles/articles.xml
+++ b/framework/elements/articles/articles.xml
@@ -343,6 +343,7 @@
+
diff --git a/framework/elements/button/button.php b/framework/elements/button/button.php
index 3b3681f3..67ef20d6 100644
--- a/framework/elements/button/button.php
+++ b/framework/elements/button/button.php
@@ -12,7 +12,7 @@
// No direct access.
defined('_JEXEC') or die;
-
+use Astroid\Helper;
use Astroid\Helper\Style;
extract($displayData);
@@ -33,7 +33,7 @@
$button_size = $button_size ? ' '. $button_size : '';
echo '';
@@ -77,4 +107,8 @@
$element->style->child('.btn')->addStyle(Style::spacingValue($props, "padding"), $device);
}
}
+ $button_font_style = $params->get('button_font_style');
+ if (!empty($button_font_style)) {
+ Style::renderTypography('#'.$element->id.' .btn', $button_font_style);
+ }
}
\ No newline at end of file
diff --git a/framework/elements/button/button.xml b/framework/elements/button/button.xml
index 353843fa..0a35a1b8 100644
--- a/framework/elements/button/button.xml
+++ b/framework/elements/button/button.xml
@@ -37,7 +37,16 @@
+
+
+
+
+
+
@@ -57,6 +66,8 @@
+
diff --git a/framework/elements/default.xml b/framework/elements/default.xml
index 10a7c508..03715038 100644
--- a/framework/elements/default.xml
+++ b/framework/elements/default.xml
@@ -147,7 +147,8 @@
diff --git a/framework/fields/astroidlayoutdata.php b/framework/fields/astroidlayoutdata.php
index 77801fd3..9b07522b 100644
--- a/framework/fields/astroidlayoutdata.php
+++ b/framework/fields/astroidlayoutdata.php
@@ -100,7 +100,10 @@ protected function getInput() {
}
}
$element['params'] = $availableElements;
- $article_data = Path::clean(JPATH_SITE . '/media/templates/site/' . $article_layout->template . '/astroid/article_widget_data/'. $id . '_' . $element['id'] . '.json');
+ $article_data = Path::clean(JPATH_SITE . '/media/templates/site/' . $article_layout->template . '/params/article_widget_data/'. $id . '_' . $element['id'] . '.json');
+ if (!file_exists($article_data)) {
+ $article_data = Path::clean(JPATH_SITE . '/media/templates/site/' . $article_layout->template . '/astroid/article_widget_data/'. $id . '_' . $element['id'] . '.json');
+ }
if (file_exists($article_data)) {
$widget_data = file_get_contents($article_data);
$widget_data = json_decode($widget_data, true);
diff --git a/framework/fields/astroidlayoutmodule.php b/framework/fields/astroidlayoutmodule.php
index 7809e187..12671cf0 100644
--- a/framework/fields/astroidlayoutmodule.php
+++ b/framework/fields/astroidlayoutmodule.php
@@ -31,29 +31,24 @@ class JFormFieldAstroidLayoutModule extends FormField {
protected function getInput() {
$app = Factory::getApplication();
- if ($app->input->get('option', '') == 'com_modules'
- && $app->input->get('view', '') == 'module'
- && $app->input->get('layout', '') == 'edit') {
- $id = $app->input->get('id');
- $layout = Layout::loadModuleLayout($id);
- $constant = Helper\Constants::manager_configs('joomla_module');
- $json = [
- 'id' => $this->id,
- 'name' => $this->name,
- 'layout' => $layout,
- 'constant' => $constant,
- ];
- $html = '';
- $html .= '';
- $wa = Factory::getApplication()->getDocument()->getWebAssetManager();
- $wa->registerAndUseStyle('astroid.manager', "media/astroid/assets/vendor/manager/dist/index.css");
- $wa->registerAndUseStyle('astroid.icons', "media/astroid/assets/vendor/linearicons/font.min.css");
- $wa->useScript('bootstrap.tab');
- $wa->useScript('bootstrap.modal');
- $wa->registerAndUseScript('astroid.manager', 'media/astroid/assets/vendor/manager/dist/index.js', ['relative' => true, 'version' => 'auto'], ['type' => 'module']);
- $wa->addInlineScript("(function ($) { $(document).ready(function () { $('#astroid-layout-module').parent().prev().remove(); }); })(jQuery)");
- return $html;
- }
- return 'This field is only available in module edit layout.';
+ $id = $app->input->get('id');
+ $layout = Layout::loadModuleLayout($id);
+ $constant = Helper\Constants::manager_configs('joomla_module');
+ $json = [
+ 'id' => $this->id,
+ 'name' => $this->name,
+ 'layout' => $layout,
+ 'constant' => $constant,
+ ];
+ $html = '';
+ $html .= '';
+ $wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+ $wa->registerAndUseStyle('astroid.manager', "media/astroid/assets/vendor/manager/dist/index.css");
+ $wa->registerAndUseStyle('astroid.icons', "media/astroid/assets/vendor/linearicons/font.min.css");
+ $wa->useScript('bootstrap.tab');
+ $wa->useScript('bootstrap.modal');
+ $wa->registerAndUseScript('astroid.manager', 'media/astroid/assets/vendor/manager/dist/index.js', ['relative' => true, 'version' => 'auto'], ['type' => 'module']);
+ $wa->addInlineScript("(function ($) { $(document).ready(function () { $('#astroid-layout-module').parent().prev().remove(); }); })(jQuery)");
+ return $html;
}
}
diff --git a/framework/fields/astroidrange.php b/framework/fields/astroidrange.php
index 3d951c16..4cf0f884 100644
--- a/framework/fields/astroidrange.php
+++ b/framework/fields/astroidrange.php
@@ -18,6 +18,11 @@ class JFormFieldAstroidRange extends FormField {
protected $ordering;
public function getInput() {
+ if (isset($this->element['responsive'])) {
+ $responsive = (bool) $this->element['responsive'];
+ } else {
+ $responsive = false;
+ }
$json = [
'id' => $this->id,
'name' => $this->name,
@@ -26,10 +31,10 @@ public function getInput() {
'max' => (string)$this->element['max'],
'step' => (string)$this->element['step'],
'postfix' => (string)$this->element['postfix'],
+ 'responsive' => $responsive,
'type' => strtolower($this->type),
];
return json_encode($json);
}
-
}
diff --git a/framework/fields/astroidtypography.php b/framework/fields/astroidtypography.php
index 60cc4b6b..31c9f381 100644
--- a/framework/fields/astroidtypography.php
+++ b/framework/fields/astroidtypography.php
@@ -190,6 +190,12 @@ public function getInput()
$extraData['preview'] = true;
}
+ if (isset($this->element['collapse']) && $this->element['collapse'] == 'false') {
+ $extraData['collapse'] = false;
+ } else {
+ $extraData['collapse'] = true;
+ }
+
$extraData['colormode'] = $color_mode;
$system_fonts = array();
foreach (Astroid\Helper\Font::$system_fonts as $s_font_value => $s_font_title) {
diff --git a/framework/frontend/backtotop.php b/framework/frontend/backtotop.php
index b630bcf8..261ca058 100644
--- a/framework/frontend/backtotop.php
+++ b/framework/frontend/backtotop.php
@@ -26,19 +26,17 @@
$backtotop_icon = $params->get('backtotop_icon', 'fas fa-arrow-up');
$backtotop_icon_size = $params->get('backtotop_icon_size', 20);
$backtotop_icon_padding = $params->get('backtotop_icon_padding', 10);
-$backtotop_icon_border_size = $params->get('backtotop_icon_border_size', 0);
$backtotop_icon_color = Style::getColor($params->get('backtotop_icon_color', ''));
$backtotop_icon_bgcolor = Style::getColor($params->get('backtotop_icon_bgcolor', ''));
-$backtotop_icon_bdcolor = Style::getColor($params->get('backtotop_icon_bordercolor', ''));
$backtotop_icon_style = $params->get('backtotop_icon_style', 'circle');
$backtotop_on_mobile = $params->get('backtotop_on_mobile', 1);
$paddingpercent = 10;
-$padding = ($backtotop_icon_size / $paddingpercent);
+$padding = 15;
$a_style = new Style('#astroid-backtotop');
$a_style_dark = new Style('#astroid-backtotop', 'dark');
$i_style = new Style('#astroid-backtotop > i');
$i_style_dark = new Style('#astroid-backtotop > i', 'dark');
-$i_style->addCss('font-size', $backtotop_icon_size . 'px');
+$i_style->addResponsiveCSS('font-size', $backtotop_icon_size , 'px');
$i_style->addCss('color', $backtotop_icon_color['light']);
$i_style_dark->addCss('color', $backtotop_icon_color['dark']);
@@ -47,23 +45,23 @@
$a_style->addCss('border-radius', round($padding) . 'px !important');
break;
case 'square':
- $i_style->addCss('line-height', $backtotop_icon_size . 'px');
+ $i_style->addResponsiveCSS('line-height', $backtotop_icon_size , 'px');
$i_style->addCss('padding', round($padding) . 'px');
break;
default:
- $i_style->addCss('width', $backtotop_icon_size . 'px');
- $i_style->addCss('height', $backtotop_icon_size . 'px');
- $i_style->addCss('line-height', $backtotop_icon_size . 'px');
+ $i_style->addResponsiveCSS('width', $backtotop_icon_size , 'px');
+ $i_style->addResponsiveCSS('height', $backtotop_icon_size , 'px');
+ $i_style->addResponsiveCSS('line-height', $backtotop_icon_size , 'px');
$i_style->addCss('text-align', 'center');
break;
}
$a_style->addCss('background', $backtotop_icon_bgcolor['light']);
$a_style_dark->addCss('background', $backtotop_icon_bgcolor['dark']);
-$a_style->addCss('padding', $backtotop_icon_padding . 'px');
-if (!empty($backtotop_icon_border_size)) {
- $a_style->addCss('border', $backtotop_icon_border_size.'px solid ' . $backtotop_icon_bdcolor['light']);
- $a_style_dark->addCss('border-color', $backtotop_icon_bdcolor['dark']);
+$a_style->addResponsiveCSS('padding', $backtotop_icon_padding , 'px');
+$border = json_decode($params->get('backtotop_border_style', ''), true);
+if (!empty($border)) {
+ $a_style->addBorder($border);
}
$a_style->render();
diff --git a/framework/frontend/document/body.php b/framework/frontend/document/body.php
index f7d3a9b5..d3a77dc8 100644
--- a/framework/frontend/document/body.php
+++ b/framework/frontend/document/body.php
@@ -37,10 +37,19 @@
$header = $params->get('header', TRUE);
$header_mode = $params->get('header_mode', 'horizontal');
+$container_class = ['astroid-container']; // container class
$astroid_content_class = ['astroid-content']; // astroid_content_class
if ($header && !empty($header_mode) && $header_mode == 'sidebar') {
$astroid_content_class[] = 'has-sidebar';
- $astroid_content_class[] = 'sidebar-dir-' . $params->get('header_sidebar_menu_mode', 'left');
+ $mode = $params->get('header_sidebar_menu_mode', 'left');
+ if ($mode == 'topbar') {
+ $sidebar_position = $params->get('sidebar_position', 'left');
+ } else {
+ $sidebar_position = $mode;
+ }
+ $astroid_content_class[] = 'sidebar-dir-' . $sidebar_position;
+ array_push($container_class, 'row', 'g-0');
+ $astroid_content_class[] = 'col';
}
if ($header && !empty($header_mode) && $header_mode != 'sidebar') {
$wa->registerAndUseScript('astroid.jquery.easing', 'astroid/jquery.easing.min.js', ['relative' => true, 'version' => 'auto'], [], ['jquery']);
@@ -68,12 +77,10 @@
}
?>
-
- ';
- $media .= '';
- $media .= '
';
- if ($video_type == 'youtube' && !empty($item->image_thumbnail)) {
- $media = '';
+ $media .= '';
+ $media .= '
';
+ if ($video_type == 'youtube' && !empty($item->image_thumbnail)) {
+ $media = '
+
include('containerStart'); // Container Start
$document->include('header.sidebar'); // sidebar
- $document->include('offcanvas'); // offcanvas
- $document->include('mobilemenu'); // mobile menu
?>
diff --git a/framework/frontend/header/horizontal.php b/framework/frontend/header/horizontal.php
index db65b760..2193ee26 100644
--- a/framework/frontend/header/horizontal.php
+++ b/framework/frontend/header/horizontal.php
@@ -38,7 +38,7 @@
$offcanvas_togglevisibility = $params->get('offcanvas_togglevisibility', 'd-block');
$class = ['astroid-header', 'astroid-horizontal-header', 'astroid-horizontal-' . $mode . '-header'];
$navClass = ['nav', 'astroid-nav', 'd-none', 'd-'.$header_breakpoint.'-flex'];
-$navWrapperClass = ['align-self-center', 'px-2', 'd-none', 'd-'.$header_breakpoint.'-block'];
+$navWrapperClass = ['align-self-center', 'd-none', 'd-'.$header_breakpoint.'-block'];
$headAttrs = $header_menu_method == 'default' ? ' data-megamenu data-megamenu-class=".has-megamenu" data-megamenu-content-class=".megamenu-container" data-dropdown-arrow="'.($params->get('dropdown_arrow', 0) ? 'true' : 'false').'" data-header-offset="true" data-transition-speed="'.$params->get('dropdown_animation_speed', 300).'" data-megamenu-animation="'.$params->get('dropdown_animation_type', 'fade').'" data-easing="'.$params->get('dropdown_animation_ease', 'linear').'" data-astroid-trigger="'.$params->get('dropdown_trigger', 'hover').'" data-megamenu-submenu-class=".nav-submenu,.nav-submenu-static"' : '';
?>
@@ -51,7 +51,7 @@
@@ -100,7 +107,9 @@
?>
- include('containerEnd'); // Container End
+ include('containerEnd'); // Container End
+ $document->include('offcanvas'); // offcanvas
+ $document->include('mobilemenu'); // mobile menu
?>
+
'; ?>
include('offcanvas.trigger', ['offcanvas' => '#astroid-offcanvas', 'visibility' => $offcanvas_togglevisibility, 'effect' => $offcanvas_animation, 'direction' => $offcanvas_direction]); ?>
@@ -103,7 +103,7 @@
}
?>
-
+
-
+
';
@@ -132,7 +132,7 @@
- '; ?>
+ '; ?>
include('offcanvas.trigger', ['offcanvas' => '#astroid-offcanvas', 'visibility' => $offcanvas_togglevisibility, 'effect' => $offcanvas_animation, 'direction' => $offcanvas_direction]); ?>
'; ?>
diff --git a/framework/frontend/header/sidebar.php b/framework/frontend/header/sidebar.php
index dc190836..e933a03e 100644
--- a/framework/frontend/header/sidebar.php
+++ b/framework/frontend/header/sidebar.php
@@ -27,6 +27,11 @@
}
$mode = $params->get('header_sidebar_menu_mode', 'left');
+if ($mode == 'topbar') {
+ $sidebar_position = $params->get('sidebar_position', 'left');
+} else {
+ $sidebar_position = $mode;
+}
$block_2_type = $params->get('header_block_2_type', 'blank');
$block_2_position = $params->get('header_block_2_position', '');
@@ -35,6 +40,11 @@
$block_1_type = $params->get('header_block_1_type', 'blank');
$block_1_position = $params->get('header_block_1_position', '');
$block_1_custom = $params->get('header_block_1_custom', '');
+
+$block_3_type = $params->get('header_block_3_type', 'blank');
+$block_3_position = $params->get('header_block_3_position', '');
+$block_3_custom = $params->get('header_block_3_custom', '');
+
$header_menu = $params->get('header_menu', 'mainmenu');
$header_menu_method = $params->get('header_menu_method', 'default');
$header_menu_module_position = $params->get('header_menu_module_position', 'astroid-header-menu');
@@ -42,17 +52,58 @@
$header_mobile_menu = $params->get('header_mobile_menu', '');
$offcanvas_animation = $params->get('offcanvas_animation', 'st-effect-1');
$offcanvas_togglevisibility = $params->get('offcanvas_togglevisibility', 'd-block');
-$class = ['astroid-header', 'astroid-sidebar-header', 'sidebar-dir-' . $mode, 'h-100', 'has-sidebar'];
+$class = ['astroid-header', 'astroid-sidebar-header', 'col-12', 'col-xl-auto', 'astroid-sidebar-' . $mode, 'sidebar-dir-' . $sidebar_position, 'has-sidebar'];
+if ($sidebar_position == 'right') {
+ $class[] = 'order-xl-1';
+}
$navClass = ['nav', 'astroid-nav', 'd-none', 'd-lg-flex'];
$navWrapperClass = ['align-self-center', 'px-2', 'd-none', 'd-lg-block'];
+$position_count = 0;
?>
-
-
+
+
+