From 7c9c3bf371ed69a098aa3f0ccd99cc47834f99e2 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 10 May 2020 00:09:26 +0200 Subject: [PATCH 1/5] Change Featured Icon to Home Icon in com_menu --- .../com_menus/tmpl/items/default.php | 2 +- libraries/src/HTML/Helpers/JGrid.php | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php index 911df9d16ee42..9800f1fcb87a2 100644 --- a/administrator/components/com_menus/tmpl/items/default.php +++ b/administrator/components/com_menus/tmpl/items/default.php @@ -209,7 +209,7 @@ type == 'component') : ?> language == '*' || $item->home == '0') : ?> - home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected); ?> + home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected, "cb", null, "home", "circle"); ?> language_image) : ?> diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php index b58600d2a4ad6..f03403fd1dc6e 100644 --- a/libraries/src/HTML/Helpers/JGrid.php +++ b/libraries/src/HTML/Helpers/JGrid.php @@ -258,19 +258,21 @@ public static function published($value, $i, $prefix = '', $enabled = true, $che /** * Returns an isDefault state on a grid * - * @param integer $value The state value. - * @param integer $i The row index - * @param string|array $prefix An optional task prefix or an array of options - * @param boolean $enabled An optional setting for access control on the action. - * @param string $checkbox An optional prefix for checkboxes. - * @param string $formId An optional form selector. + * @param integer $value The state value. + * @param integer $i The row index + * @param string|array $prefix An optional task prefix or an array of options + * @param boolean $enabled An optional setting for access control on the action. + * @param string $checkbox An optional prefix for checkboxes. + * @param string $formId An optional form selector. + * @param string $active_class The class for active items. + * @param string $inactive_class The class for inactive items. * * @return string The HTML markup * * @see JHtmlJGrid::state() * @since 1.6 */ - public static function isdefault($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb', $formId = null) + public static function isdefault($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb', $formId = null, $active_class = 'featured', $inactive_class = 'unfeatured') { if (is_array($prefix)) { @@ -281,8 +283,8 @@ public static function isdefault($value, $i, $prefix = '', $enabled = true, $che } $states = array( - 0 => array('setDefault', '', 'JLIB_HTML_SETDEFAULT_ITEM', '', 1, 'unfeatured', 'unfeatured'), - 1 => array('unsetDefault', 'JDEFAULT', 'JLIB_HTML_UNSETDEFAULT_ITEM', 'JDEFAULT', 1, 'featured', 'featured'), + 0 => array('setDefault', '', 'JLIB_HTML_SETDEFAULT_ITEM', '', 1, $inactive_class, $inactive_class), + 1 => array('unsetDefault', 'JDEFAULT', 'JLIB_HTML_UNSETDEFAULT_ITEM', 'JDEFAULT', 1, $active_class, $active_class), ); return static::state($states, $value, $i, $prefix, $enabled, true, $checkbox, $formId); From 0b04774b1a38a3152656f89f31bde52185e55dd7 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 10 May 2020 00:33:24 +0200 Subject: [PATCH 2/5] Change Icon class --- administrator/templates/atum/scss/blocks/_icons.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/administrator/templates/atum/scss/blocks/_icons.scss b/administrator/templates/atum/scss/blocks/_icons.scss index 6d4d279168f0b..142414b7c41e3 100644 --- a/administrator/templates/atum/scss/blocks/_icons.scss +++ b/administrator/templates/atum/scss/blocks/_icons.scss @@ -68,6 +68,11 @@ color: var(--atum-text-dark); border: 0; } + + &.disabled .icon-home { + color: $state-warning-bg; + border-color: $state-warning-bg; + } } .icon-joomla::before { From 109a7b20433d7d1820777540d36def151723d8fd Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 10 May 2020 00:36:00 +0200 Subject: [PATCH 3/5] Change Default icon in sidebar menu too --- administrator/modules/mod_menu/tmpl/default_submenu.php | 2 +- administrator/modules/mod_submenu/src/Menu/Menu.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php index e7fab0f4f56c3..09a4d034bbfcd 100644 --- a/administrator/modules/mod_menu/tmpl/default_submenu.php +++ b/administrator/modules/mod_menu/tmpl/default_submenu.php @@ -110,7 +110,7 @@ { if (substr($iconImage, 0, 6) == 'class:' && substr($iconImage, 6) == 'icon-home') { - $iconImage = ''; + $iconImage = ''; $iconImage .= '' . Text::_('JDEFAULT') . ''; } elseif (substr($iconImage, 0, 6) == 'image:') diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php index 69dc637f0a7b6..cb6cf462fffd9 100644 --- a/administrator/modules/mod_submenu/src/Menu/Menu.php +++ b/administrator/modules/mod_submenu/src/Menu/Menu.php @@ -175,7 +175,7 @@ public static function preprocess($parent) { if (substr($iconImage, 0, 6) === 'class:' && substr($iconImage, 6) === 'icon-home') { - $iconImage = ''; + $iconImage = ''; $iconImage .= '' . Text::_('JDEFAULT') . ''; } elseif (substr($iconImage, 0, 6) === 'image:') From 38bc0209e37cdbfab870021933580e686de449bd Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 10 May 2020 12:48:33 +0200 Subject: [PATCH 4/5] Different class for disabled Home item --- administrator/templates/atum/scss/blocks/_icons.scss | 5 +++++ libraries/src/HTML/Helpers/JGrid.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/blocks/_icons.scss b/administrator/templates/atum/scss/blocks/_icons.scss index 142414b7c41e3..55eba53ff7e6d 100644 --- a/administrator/templates/atum/scss/blocks/_icons.scss +++ b/administrator/templates/atum/scss/blocks/_icons.scss @@ -69,6 +69,11 @@ border: 0; } + &.home-disabled { + opacity: 1; + cursor: not-allowed; + } + &.disabled .icon-home { color: $state-warning-bg; border-color: $state-warning-bg; diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php index f03403fd1dc6e..4b856368bd88d 100644 --- a/libraries/src/HTML/Helpers/JGrid.php +++ b/libraries/src/HTML/Helpers/JGrid.php @@ -89,7 +89,7 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac } else { - $html[] = ' Date: Tue, 12 May 2020 14:20:23 +0200 Subject: [PATCH 5/5] Update administrator/components/com_menus/tmpl/items/default.php Co-authored-by: Quy --- administrator/components/com_menus/tmpl/items/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php index 9800f1fcb87a2..886b93086f159 100644 --- a/administrator/components/com_menus/tmpl/items/default.php +++ b/administrator/components/com_menus/tmpl/items/default.php @@ -209,7 +209,7 @@ type == 'component') : ?> language == '*' || $item->home == '0') : ?> - home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected, "cb", null, "home", "circle"); ?> + home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected, 'cb', null, 'home', 'circle'); ?> language_image) : ?>