diff --git a/language/en-GB/en-GB.tpl_shaper_helixultimate.ini b/language/en-GB/en-GB.tpl_shaper_helixultimate.ini index b3861de0..1595a383 100644 --- a/language/en-GB/en-GB.tpl_shaper_helixultimate.ini +++ b/language/en-GB/en-GB.tpl_shaper_helixultimate.ini @@ -96,7 +96,7 @@ HELIX_ULTIMATE_CONTACT_OPENING_HOURS="Opening Hours" HELIX_ULTIMATE_OPTION_GROUP_GENERAL=" General" HELIX_ULTIMATE_OPTION_GROUP_STYLE=" Style" HELIX_ULTIMATE_OPTION_GROUP_RESPONSIVE=" Responsive" -HELIX_ULTIMATE_OPTION_GROUP_GRID=" Grid" +HELIX_ULTIMATE_OPTION_GROUP_GRID=" Grid (BreakPoints)" HELIX_ULTIMATE_SECTION_TITLE="Section Title" HELIX_ULTIMATE_SECTION_TITLE_DESC="Section ID will replace section title in the frontend. e.g. If you set section title as \"Main Body\" then you will get output as <section id=\"main-body\"></section> in the frontend." HELIX_ULTIMATE_SECTION_BACKGROUND_COLOR="Background Color" @@ -119,17 +119,20 @@ HELIX_ULTIMATE_COMPONENT="Component Area" HELIX_ULTIMATE_COMPONENT_DESC="Enable this option to make this column as a Component area. If you already selected component area for another column then unselect that one first then select this one.
Note: Joomla message section will also be loaded inside this column." HELIX_ULTIMATE_MODULE_POSITION="Module Position" HELIX_ULTIMATE_MODULE_POSITION_DESC="Select any suitable module position from the list. Do not set one module position to multiple position." -HELIX_ULTIMATE_LARGER_DESKTOP_GRID="Larger Desktop" -HELIX_ULTIMATE_SMALLER_DESKTOP_GRID="Smaller Desktop" -HELIX_ULTIMATE_TABLET_GRID="Tablet" -HELIX_ULTIMATE_LARGER_PHONE_GRID="Larger Phone" -HELIX_ULTIMATE_PHONE_GRID="Phone" + +HELIX_ULTIMATE_EXTRA_LARGER_DESKTOP_GRID="Extra Large Desktop ≥ 1400px" +HELIX_ULTIMATE_LARGER_DESKTOP_GRID="Large Desktop ≥ 1200px" +HELIX_ULTIMATE_SMALLER_DESKTOP_GRID="Smaller Desktop ≥ 992px" +HELIX_ULTIMATE_TABLET_GRID="Tablet ≥ 768px" +HELIX_ULTIMATE_LARGER_PHONE_GRID="Large Phone ≥ 576px" +HELIX_ULTIMATE_PHONE_GRID="Phone < 576px" HELIX_ULTIMATE_HIDDEN_PHONE="Hidden on Phone" -HELIX_ULTIMATE_HIDDEN_LARGER_PHONE="Hidden on Larger Phone" +HELIX_ULTIMATE_HIDDEN_LARGER_PHONE="Hidden on Large Phone" HELIX_ULTIMATE_HIDDEN_TABLET="Hidden on Tablet" HELIX_ULTIMATE_HIDDEN_SMALL_DESKTOP="Hidden on Smaller Desktop" -HELIX_ULTIMATE_HIDDEN_DESKTOP="Hidden on Desktop" +HELIX_ULTIMATE_HIDDEN_DESKTOP="Hidden on Large Desktop" +HELIX_ULTIMATE_HIDDEN_EXTRA_LARGE_DESKTOP="Hidden on Extra Large Desktop" ;Typography HELIX_ULTIMATE_TYPOGRAPHY="Typography" @@ -179,7 +182,7 @@ HELIX_ULTIMATE_AFTER_BODY_DESC="Any code you place here will be appeared just af HELIX_ULTIMATE_BEFORE_BODY="Before </body>" HELIX_ULTIMATE_BEFORE_BODY_DESC="Any code you place here will appear at the bottom of the body section of all pages of your site. This feature is useful if you need to input a tracking code for a state counter such as Google Analytics or Clicky." HELIX_ULTIMATE_CUSTOM_CSS="Custom CSS" -HELIX_ULTIMATE_CUSTOM_CSS_DESC="You can use custom CSS to add your styles or overwrite default CSS to a template or extension. This option is useful for small changes in the stylesheets. For more extensive changes (more than 10 lines of code) we suggest to use the custom.css file." +HELIX_ULTIMATE_CUSTOM_CSS_DESC="Add your own CSS to customize the appearance of your site (template or extensions). For more extensive changes (more than 15 lines of code), we recommend that you use the custom.css file. This field does not have a CSS validator." HELIX_ULTIMATE_CUSTOM_JS="Custom Javascript" HELIX_ULTIMATE_CUSTOM_JS_DESC="You can add custom JavaScript code. It loads your custom Javascript file after all other JavaScript files (except special hardcoded occasions), allowing you to be the last one who will affect your website." diff --git a/plugins/system/helixultimate/helixultimate.php b/plugins/system/helixultimate/helixultimate.php index a73edb27..06d24007 100644 --- a/plugins/system/helixultimate/helixultimate.php +++ b/plugins/system/helixultimate/helixultimate.php @@ -16,7 +16,6 @@ */ require_once __DIR__ . '/bootstrap.php'; - use HelixUltimate\Framework\Core\HelixUltimate; use HelixUltimate\Framework\Platform\Blog; use HelixUltimate\Framework\Platform\Helper; @@ -45,7 +44,7 @@ * * @since 1.0.0 */ -class PlgSystemHelixultimate extends CMSPlugin +class PlgSystemHelixultimate extends CMSPlugin { /** * Is autoload language. diff --git a/plugins/system/helixultimate/layout/settings/settings.php b/plugins/system/helixultimate/layout/settings/settings.php index 3b582db9..bb2c0d18 100644 --- a/plugins/system/helixultimate/layout/settings/settings.php +++ b/plugins/system/helixultimate/layout/settings/settings.php @@ -180,6 +180,12 @@ function column_grid_system($device = 'lg') 'type' => 'checkbox', 'group' => 'responsive', 'title' => Text::_('HELIX_ULTIMATE_HIDDEN_DESKTOP') + ), + + 'hide_on_ex_large_desktop' => array( + 'type' => 'checkbox', + 'group' => 'responsive', + 'title' => Text::_('HELIX_ULTIMATE_HIDDEN_EXTRA_LARGE_DESKTOP') ) ) ); @@ -213,6 +219,14 @@ function column_grid_system($device = 'lg') 'std' => '' ), + 'xxl_col' => array( + 'type' => 'select', + 'group' => 'grid', + 'title' => Text::_('HELIX_ULTIMATE_EXTRA_LARGER_DESKTOP_GRID'), + 'values' => column_grid_system('xxl'), + 'std' => 0, + ), + 'xl_col' => array( 'type' => 'select', 'group' => 'grid', @@ -282,6 +296,12 @@ function column_grid_system($device = 'lg') 'group' => 'responsive', 'title' => Text::_('HELIX_ULTIMATE_HIDDEN_DESKTOP') ), + + 'hide_on_ex_large_desktop' => array( + 'type' => 'checkbox', + 'group' => 'responsive', + 'title' => Text::_('HELIX_ULTIMATE_HIDDEN_EXTRA_LARGE_DESKTOP') + ) ) ); diff --git a/plugins/system/helixultimate/src/Core/HelixUltimate.php b/plugins/system/helixultimate/src/Core/HelixUltimate.php index 6549b0a5..72185ed1 100644 --- a/plugins/system/helixultimate/src/Core/HelixUltimate.php +++ b/plugins/system/helixultimate/src/Core/HelixUltimate.php @@ -771,6 +771,11 @@ private function get_current_row($row) $className = 'col-lg-' . $col_grid_size; } + if (isset($options->xxl_col) && $options->xxl_col) + { + $className = $className . ' col-xxl-' . $options->xxl_col; + } + if (isset($options->xl_col) && $options->xl_col) { $className = $className . ' col-xl-' . $options->xl_col; @@ -945,6 +950,12 @@ private function get_device_class($options) $device_class .= ' d-xl-none'; } + if (isset($options->hide_on_ex_large_desktop) && $options->hide_on_ex_large_desktop) + { + $device_class = $this->reshape_device_class('xxl', $device_class); + $device_class .= ' d-xxl-none'; + } + return $device_class; } diff --git a/templates/shaper_helixultimate/options.json b/templates/shaper_helixultimate/options.json index 84ab2b77..3468e1f0 100644 --- a/templates/shaper_helixultimate/options.json +++ b/templates/shaper_helixultimate/options.json @@ -89,7 +89,7 @@ "offcanvas_menu_active_menu_item_color": "#252525", "predefined_header": "1", "header_style": "style-1", - "layout": "[{\"type\":\"row\",\"layout\":12,\"settings\":{\"hide_desktop\":0,\"hide_small_desktop\":0,\"hide_tablet\":0,\"hide_large_mobile\":1,\"hide_mobile\":1,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"name\":\"\",\"fluidrow\":1,\"custom_class\":\"\",\"padding\":\"\",\"margin\":\"\",\"color\":\"\",\"link_color\":\"\",\"link_hover_color\":\"\",\"background_color\":\"\",\"background_image\":\"\",\"hide_on_phone\":0,\"hide_on_large_phone\":0,\"hide_on_tablet\":0,\"hide_on_small_desktop\":0,\"hide_on_desktop\":0},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"column_type\":0,\"name\":\"title\",\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"grid_size\":12,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0}}]},{\"type\":\"row\",\"layout\":\"4+4+4\",\"settings\":{\"custom_class\":\"\",\"fluidrow\":0,\"margin\":\"\",\"padding\":\"\",\"hidden_md\":0,\"hidden_sm\":0,\"hidden_xs\":0,\"link_hover_color\":\"\",\"link_color\":\"\",\"color\":\"\",\"background_color\":\"\",\"name\":\"Main Body\"},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"column_type\":0,\"name\":\"left\",\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"grid_size\":4,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0}},{\"type\":\"sp_col\",\"settings\":{\"column_type\":1,\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"sortableitem\":\"[object Object]\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"grid_size\":4}},{\"type\":\"sp_col\",\"settings\":{\"column_type\":0,\"name\":\"right\",\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"grid_size\":4,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0}}]},{\"type\":\"row\",\"layout\":\"3+3+3+3\",\"settings\":{\"name\":\"Bottom\",\"fluidrow\":0,\"custom_class\":\"\",\"padding\":\"\",\"margin\":\"\",\"color\":\"\",\"link_color\":\"\",\"link_hover_color\":\"\",\"background_color\":\"\",\"background_image\":\"\",\"background_repeat\":\"\",\"background_size\":\"\",\"background_attachment\":\"\",\"background_position\":\"\",\"hide_on_phone\":0,\"hide_on_large_phone\":0,\"hide_on_tablet\":0,\"hide_on_small_desktop\":0,\"hide_on_desktop\":0,\"hidden_md\":0,\"hidden_sm\":0,\"hidden_xs\":0},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"sortableitem\":\"[object Object]\",\"column_type\":0,\"name\":\"bottom1\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"sm_col\":\"col-sm-6\",\"xs_col\":\"\",\"custom_class\":\"\",\"grid_size\":3}},{\"type\":\"sp_col\",\"settings\":{\"sortableitem\":\"[object Object]\",\"custom_class\":\"\",\"xs_col\":\"\",\"sm_col\":\"col-sm-6\",\"hidden_md\":0,\"hidden_sm\":0,\"hidden_xs\":0,\"name\":\"bottom2\",\"column_type\":0,\"grid_size\":3}},{\"type\":\"sp_col\",\"settings\":{\"grid_size\":3,\"hide_on_desktop\":0,\"hide_on_small_desktop\":0,\"hide_on_tablet\":0,\"hide_on_large_phone\":0,\"hide_on_phone\":0,\"xs_col\":\"\",\"sm_col\":\"\",\"md_col\":\"\",\"xl_col\":\"\",\"custom_class\":\"\",\"name\":\"bottom3\",\"column_type\":0}},{\"type\":\"sp_col\",\"settings\":{\"grid_size\":3,\"hide_on_desktop\":0,\"hide_on_small_desktop\":0,\"hide_on_tablet\":0,\"hide_on_large_phone\":0,\"hide_on_phone\":0,\"xs_col\":\"\",\"sm_col\":\"\",\"md_col\":\"\",\"xl_col\":\"\",\"custom_class\":\"\",\"name\":\"bottom4\",\"column_type\":0}}]},{\"type\":\"row\",\"layout\":\"6+6\",\"settings\":{\"name\":\"Footer\",\"background_color\":\"\",\"color\":\"\",\"link_color\":\"\",\"link_hover_color\":\"\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"padding\":\"\",\"margin\":\"\",\"fluidrow\":0,\"custom_class\":\"\"},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"sortableitem\":\"[object Object]\",\"grid_size\":6,\"column_type\":0,\"name\":\"footer1\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"sm_col\":\"\",\"xs_col\":\"\",\"custom_class\":\"\"}},{\"type\":\"sp_col\",\"settings\":{\"grid_size\":6,\"column_type\":0,\"name\":\"footer2\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"sm_col\":\"\",\"xs_col\":\"\",\"custom_class\":\"\"}}]}]", + "layout": "[{\"type\":\"row\",\"layout\":12,\"settings\":{\"hide_desktop\":0,\"hide_small_desktop\":0,\"hide_tablet\":0,\"hide_large_mobile\":1,\"hide_mobile\":1,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"name\":\"\",\"fluidrow\":1,\"custom_class\":\"\",\"padding\":\"\",\"margin\":\"\",\"color\":\"\",\"link_color\":\"\",\"link_hover_color\":\"\",\"background_color\":\"\",\"background_image\":\"\",\"hide_on_phone\":0,\"hide_on_large_phone\":0,\"hide_on_tablet\":0,\"hide_on_small_desktop\":0,\"hide_on_desktop\":0,\"hide_on_ex_large_desktop\":0},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"column_type\":0,\"name\":\"title\",\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"grid_size\":12,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0}}]},{\"type\":\"row\",\"layout\":\"4+4+4\",\"settings\":{\"custom_class\":\"\",\"fluidrow\":0,\"margin\":\"\",\"padding\":\"\",\"hidden_md\":0,\"hidden_sm\":0,\"hidden_xs\":0,\"link_hover_color\":\"\",\"link_color\":\"\",\"color\":\"\",\"background_color\":\"\",\"name\":\"Main Body\"},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"column_type\":0,\"name\":\"left\",\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"grid_size\":4,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0}},{\"type\":\"sp_col\",\"settings\":{\"column_type\":1,\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"sortableitem\":\"[object Object]\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"grid_size\":4}},{\"type\":\"sp_col\",\"settings\":{\"column_type\":0,\"name\":\"right\",\"custom_class\":\"\",\"sm_col\":\"\",\"xs_col\":\"\",\"grid_size\":4,\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0}}]},{\"type\":\"row\",\"layout\":\"3+3+3+3\",\"settings\":{\"name\":\"Bottom\",\"fluidrow\":0,\"custom_class\":\"\",\"padding\":\"\",\"margin\":\"\",\"color\":\"\",\"link_color\":\"\",\"link_hover_color\":\"\",\"background_color\":\"\",\"background_image\":\"\",\"background_repeat\":\"\",\"background_size\":\"\",\"background_attachment\":\"\",\"background_position\":\"\",\"hide_on_phone\":0,\"hide_on_large_phone\":0,\"hide_on_tablet\":0,\"hide_on_small_desktop\":0,\"hide_on_desktop\":0,\"hide_on_ex_large_desktop\":0,\"hidden_md\":0,\"hidden_sm\":0,\"hidden_xs\":0},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"sortableitem\":\"[object Object]\",\"column_type\":0,\"name\":\"bottom1\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"sm_col\":\"col-sm-6\",\"xs_col\":\"\",\"custom_class\":\"\",\"grid_size\":3}},{\"type\":\"sp_col\",\"settings\":{\"sortableitem\":\"[object Object]\",\"custom_class\":\"\",\"xs_col\":\"\",\"sm_col\":\"col-sm-6\",\"hidden_md\":0,\"hidden_sm\":0,\"hidden_xs\":0,\"name\":\"bottom2\",\"column_type\":0,\"grid_size\":3}},{\"type\":\"sp_col\",\"settings\":{\"grid_size\":3,\"hide_on_ex_large_desktop\":0,\"hide_on_desktop\":0,\"hide_on_small_desktop\":0,\"hide_on_tablet\":0,\"hide_on_large_phone\":0,\"hide_on_phone\":0,\"xs_col\":\"\",\"sm_col\":\"\",\"md_col\":\"\",\"xl_col\":\"\",\"xxl_col\":\"\",\"custom_class\":\"\",\"name\":\"bottom3\",\"column_type\":0}},{\"type\":\"sp_col\",\"settings\":{\"grid_size\":3,\"hide_on_ex_large_desktop\":0,\"hide_on_desktop\":0,\"hide_on_small_desktop\":0,\"hide_on_tablet\":0,\"hide_on_large_phone\":0,\"hide_on_phone\":0,\"xs_col\":\"\",\"sm_col\":\"\",\"md_col\":\"\",\"xl_col\":\"\",\"xxl_col\":\"\",\"custom_class\":\"\",\"name\":\"bottom4\",\"column_type\":0}}]},{\"type\":\"row\",\"layout\":\"6+6\",\"settings\":{\"name\":\"Footer\",\"background_color\":\"\",\"color\":\"\",\"link_color\":\"\",\"link_hover_color\":\"\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"padding\":\"\",\"margin\":\"\",\"fluidrow\":0,\"custom_class\":\"\"},\"attr\":[{\"type\":\"sp_col\",\"settings\":{\"sortableitem\":\"[object Object]\",\"grid_size\":6,\"column_type\":0,\"name\":\"footer1\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"sm_col\":\"\",\"xs_col\":\"\",\"custom_class\":\"\"}},{\"type\":\"sp_col\",\"settings\":{\"grid_size\":6,\"column_type\":0,\"name\":\"footer2\",\"hidden_xs\":0,\"hidden_sm\":0,\"hidden_md\":0,\"sm_col\":\"\",\"xs_col\":\"\",\"custom_class\":\"\"}}]}]", "menu": "mainmenu", "menu_type": "mega_offcanvas", "dropdown_width": "",