diff --git a/assets/vendor/astroid/scss/utilities/_carousel.scss b/assets/vendor/astroid/scss/utilities/_carousel.scss index 593923d8..ebce8855 100644 --- a/assets/vendor/astroid/scss/utilities/_carousel.scss +++ b/assets/vendor/astroid/scss/utilities/_carousel.scss @@ -67,12 +67,22 @@ content: "\f053"; } } + &.nav-outside { + .slick-next { + right: auto; + left: 100%; + } + .slick-prev { + left: auto; + right: 100%; + } + } .slick-dots { display: block; width: 100%; padding: 0; - margin: 10px 0 0; + margin: 10px -6px 0; list-style: none; text-align: center; li { diff --git a/framework/elements/article_pageheading/article_pageheading.php b/framework/elements/article_pageheading/article_pageheading.php index ef618e46..3ef2761a 100644 --- a/framework/elements/article_pageheading/article_pageheading.php +++ b/framework/elements/article_pageheading/article_pageheading.php @@ -14,6 +14,6 @@ defined('_JEXEC') or die; extract($displayData); $item = $options['article']; -if ($item->other_params->get('show_page_heading')) { +if (isset($item->other_params) && $item->other_params->get('show_page_heading')) { echo '

'.$item->other_params->get('page_heading').'

'; } \ No newline at end of file diff --git a/framework/elements/testimonials/testimonials.php b/framework/elements/testimonials/testimonials.php index 07771c1f..97deaf6c 100644 --- a/framework/elements/testimonials/testimonials.php +++ b/framework/elements/testimonials/testimonials.php @@ -14,6 +14,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; use Astroid\Helper\Style; +use Astroid\Helper; extract($displayData); $testimonials = $params->get('testimonials', ''); @@ -28,14 +29,14 @@ $enable_slider = $params->get('enable_slider', 0); $slider_autoplay = $params->get('slider_autoplay', 0); $slider_nav = $params->get('slider_nav', 1); +$nav_position = $params->get('nav_position', ''); +$nav_position = $nav_position !== '' ? ' ' . $nav_position : $nav_position; $slider_dotnav = $params->get('slider_dotnav', 0); +$dot_alignment = $params->get('dot_alignment', ''); $interval = $params->get('interval', 3); $slide_settings = array(); $slide_responsive = array(); -$style = new Style('#'. $element->id); -$style_dark = new Style('#'. $element->id, 'dark'); - $row_column_cls = 'row'; $xxl_column = $params->get('xxl_column', ''); @@ -206,12 +207,17 @@ $overlay_text_color = $params->get('overlay_text_color', ''); $overlay_text_color = $overlay_text_color !== '' ? ' ' . $overlay_text_color : ''; -echo '
'; +echo '
'; foreach ($testimonials as $key => $testimonial) { - $testimonial_params = Style::getSubFormParams($testimonial->params); - $media = '
'; - $media .= ''.$testimonial_params['title'].''; - $media .= '
'; + $testimonial_params = Helper::loadParams($testimonial->params); + $avatar = $testimonial_params->get('avatar', ''); + $media = ''; + if ($avatar) { + $media = '
'; + $media .= ''.$testimonial_params->get('title', '').''; + $media .= '
'; + } + echo '
'; if ($avatar_position == 'left' || $avatar_position == 'right') { @@ -231,23 +237,23 @@ if ($avatar_position == 'top') { echo $media; } - if (!empty($testimonial_params['message'])) { - echo '
' . $testimonial_params['message'] . '
'; + if (!empty($testimonial_params->get('message', ''))) { + echo '
' . $testimonial_params->get('message', '') . '
'; } if ($avatar_position == 'bottom') { echo $media; } - if (!empty($testimonial_params['designation']) && $designation_position == 'before') { - echo '
' . $testimonial_params['designation'] . '
'; + if (!empty($testimonial_params->get('designation', '')) && $designation_position == 'before') { + echo '
' . $testimonial_params->get('designation', '') . '
'; } - if (!empty($testimonial_params['title'])) { - echo '<'.$title_html_element.' class="as-author-name">'. $testimonial_params['title'] . ''; + if (!empty($testimonial_params->get('title', ''))) { + echo '<'.$title_html_element.' class="as-author-name">'. $testimonial_params->get('title', '') . ''; } - if (!empty($testimonial_params['designation']) && $designation_position == 'after') { - echo '
' . $testimonial_params['designation'] . '
'; + if (!empty($testimonial_params->get('designation', '')) && $designation_position == 'after') { + echo '
' . $testimonial_params->get('designation', '') . '
'; } - if (!empty($testimonial_params['link']) && !empty($testimonial_params['link_title'])) { - echo '' . $testimonial_params['link_title'] . ''; + if (!empty($testimonial_params->get('link', '')) && !empty($testimonial_params->get('link_title', ''))) { + echo '' . $testimonial_params->get('link_title', '') . ''; } echo '
'; // End Card-Body @@ -274,33 +280,34 @@ if (!empty($card_padding)) { $padding = \json_decode($card_padding, false); foreach ($padding as $device => $props) { - $style->child('.card-size-custom')->addStyle(Style::spacingValue($props, "padding"), $device); + $element->style->child('.card-size-custom')->addStyle(Style::spacingValue($props, "padding"), $device); } } } if (!empty($image_max_width)) { - $style->child('.as-author-avatar > img')->addCss('max-width', $image_max_width . 'px'); + $element->style->child('.as-author-avatar > img')->addCss('max-width', $image_max_width . 'px'); } if (!empty($title_heading_margin)) { $margin = \json_decode($title_heading_margin, false); foreach ($margin as $device => $props) { - $style->child('.as-author-name')->addStyle(Style::spacingValue($props, "margin"), $device); + $element->style->child('.as-author-name')->addStyle(Style::spacingValue($props, "margin"), $device); } } if (!empty($designation_heading_margin)) { $margin = \json_decode($designation_heading_margin, false); foreach ($margin as $device => $props) { - $style->child('.as-author-designation')->addStyle(Style::spacingValue($props, "margin"), $device); + $element->style->child('.as-author-designation')->addStyle(Style::spacingValue($props, "margin"), $device); } } if (!empty($content_margin)) { $margin = \json_decode($content_margin, false); foreach ($margin as $device => $props) { - $style->child('.as-author-message')->addStyle(Style::spacingValue($props, "margin"), $device); + $element->style->child('.as-author-message')->addStyle(Style::spacingValue($props, "margin"), $device); } } if (!empty($image_border)) { Style::addBorderStyle('#'. $element->id . ' .as-author-avatar', $image_border); } -$style->render(); -$style_dark->render(); \ No newline at end of file +if (!empty($dot_alignment)) { + $element->style->child('.astroid-slick .slick-dots')->addCss('text-align', $dot_alignment); +} \ No newline at end of file diff --git a/framework/elements/testimonials/testimonials.xml b/framework/elements/testimonials/testimonials.xml index 990a42c2..f02d1ca6 100644 --- a/framework/elements/testimonials/testimonials.xml +++ b/framework/elements/testimonials/testimonials.xml @@ -365,7 +365,17 @@ + + + + + + + + + + diff --git a/language/en-GB/en-GB.astroid.ini b/language/en-GB/en-GB.astroid.ini index b5726b9e..ddaa7db8 100644 --- a/language/en-GB/en-GB.astroid.ini +++ b/language/en-GB/en-GB.astroid.ini @@ -30,6 +30,7 @@ ASTROID_HOURS="Hours" ASTROID_MINUTES="Minutes" ASTROID_SECONDS="Seconds" ASTROID_BACK="Back" +ASTROID_POSITION="Position" TPL_ASTROID_CONTAINER="Container" TPL_ASTROID_MODULE_POSITION_LABEL="Module Position" TPL_ASTROID_SITE_MODULE_POSITION_LABEL="Site Module Position" @@ -891,6 +892,9 @@ ASTROID_ARTICLE_LEAD_HEADING_FONTSIZE_LABEL="Lead Heading Fontsize" ASTROID_ARTICLE_LEAD_HEADING_FONTSIZE_DESC="Fontsize of Lead items in Category Blog Layout" ASTROID_ARTICLE_INTRO_HEADING_FONTSIZE_LABEL="Intro Heading Fontsize" ASTROID_ARTICLE_INTRO_HEADING_FONTSIZE_DESC="Fontsize of Intro items in Category Blog Layout" +ASTROID_ARTICLE_POSTION_ABOVE_TITLE="Above Title" +ASTROID_ARTICLE_POSTION_BEFORE_CONTENT="Before Content" +ASTROID_ARTICLE_POSTION_AFTER_CONTENT="After Content" ; Author ASTROID_AUTHOR_PROFILE_TAB_LABEL=" Author Profile" @@ -1493,6 +1497,10 @@ ASTROID_WIDGET_XS_COLUMN_AVATAR_WIDTH="Avatar Width X-Small Screen" ASTROID_WIDGET_NAME_LABEL="Name" ASTROID_WIDGET_AVATAR_LABEL="Avatar" ASTROID_WIDGET_MESSAGE_LABEL="Message" +ASTROID_WIDGET_DOT_ALIGNMENT="Dots Alignment" +ASTROID_WIDGET_NAV_POSITION="Navigation Position" +ASTROID_WIDGET_NAV_POSITION_INSIDE="Inside" +ASTROID_WIDGET_NAV_POSITION_OUTSIDE="Outside" ; Map ASTROID_WIDGET_MAP_LABEL="Map"