From bfb8ec1d5bd3a823b50048520c544e9f522afb41 Mon Sep 17 00:00:00 2001 From: Mohamed Abdelaziz Date: Fri, 3 May 2024 20:22:46 +0400 Subject: [PATCH 1/4] Fixed: Consistency of "unpublished" -icon colours #43375 Fixed the icon colour of the unpublished articles in the associated articles list. --- administrator/components/com_content/tmpl/articles/modal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php index 56597675fe5a0..373e85216442e 100644 --- a/administrator/components/com_content/tmpl/articles/modal.php +++ b/administrator/components/com_content/tmpl/articles/modal.php @@ -90,7 +90,7 @@ 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-archive', ]; From 3cb5ef14dbccf9f9c6bfb5ad9172ae49ee0b1961 Mon Sep 17 00:00:00 2001 From: Mohamed Abdelaziz Date: Sat, 4 May 2024 00:22:27 +0400 Subject: [PATCH 2/4] Replaced other instances of icon-times with icon-unpublish --- .../components/com_associations/tmpl/associations/default.php | 2 +- .../components/com_associations/tmpl/associations/modal.php | 2 +- .../components/com_categories/tmpl/categories/modal.php | 2 +- administrator/components/com_contact/tmpl/contacts/modal.php | 2 +- administrator/components/com_fields/tmpl/fields/modal.php | 2 +- administrator/components/com_modules/tmpl/modules/modal.php | 2 +- administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php index 43ffc9f124e7e..6a332f408e4ac 100644 --- a/administrator/components/com_associations/tmpl/associations/default.php +++ b/administrator/components/com_associations/tmpl/associations/default.php @@ -29,7 +29,7 @@ $iconStates = [ -2 => 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-folder', ]; diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php index 35597a263b8b6..1a3a046d79bcd 100644 --- a/administrator/components/com_associations/tmpl/associations/modal.php +++ b/administrator/components/com_associations/tmpl/associations/modal.php @@ -36,7 +36,7 @@ $iconStates = [ -2 => 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-folder', ]; diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php index 7554482925ad0..b0d84bdd9fc2f 100644 --- a/administrator/components/com_categories/tmpl/categories/modal.php +++ b/administrator/components/com_categories/tmpl/categories/modal.php @@ -75,7 +75,7 @@ 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-folder', ]; diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php index 19aed7e570f62..c3063096795c8 100644 --- a/administrator/components/com_contact/tmpl/contacts/modal.php +++ b/administrator/components/com_contact/tmpl/contacts/modal.php @@ -88,7 +88,7 @@ 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-folder', ]; diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php index 97f2fdae0c11a..95f3f4ef3923d 100644 --- a/administrator/components/com_fields/tmpl/fields/modal.php +++ b/administrator/components/com_fields/tmpl/fields/modal.php @@ -75,7 +75,7 @@ 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-folder', ]; diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php index cde52ca966cec..a97995271ffce 100644 --- a/administrator/components/com_modules/tmpl/modules/modal.php +++ b/administrator/components/com_modules/tmpl/modules/modal.php @@ -79,7 +79,7 @@ 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-folder', ]; diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php index 11a3c506eccd5..4d37f7da46396 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php @@ -72,7 +72,7 @@ 'icon-trash', - 0 => 'icon-times', + 0 => 'icon-unpublish', 1 => 'icon-check', 2 => 'icon-folder', ]; From b203daae853ae2690bd2c9e6e23792f647ab8856 Mon Sep 17 00:00:00 2001 From: Mohamed Abdelaziz Date: Sat, 4 May 2024 14:56:10 +0400 Subject: [PATCH 3/4] Changed icon-folder to icon-archive --- .../components/com_associations/tmpl/associations/default.php | 2 +- .../components/com_associations/tmpl/associations/modal.php | 2 +- .../components/com_categories/tmpl/categories/modal.php | 2 +- administrator/components/com_contact/tmpl/contacts/modal.php | 2 +- administrator/components/com_fields/tmpl/fields/modal.php | 2 +- administrator/components/com_modules/tmpl/modules/modal.php | 2 +- administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php index 6a332f408e4ac..410afc5fe51c2 100644 --- a/administrator/components/com_associations/tmpl/associations/default.php +++ b/administrator/components/com_associations/tmpl/associations/default.php @@ -31,7 +31,7 @@ -2 => 'icon-trash', 0 => 'icon-unpublish', 1 => 'icon-check', - 2 => 'icon-folder', + 2 => 'icon-archive', ]; Text::script('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT', true); diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php index 1a3a046d79bcd..4b5792fad27d5 100644 --- a/administrator/components/com_associations/tmpl/associations/modal.php +++ b/administrator/components/com_associations/tmpl/associations/modal.php @@ -38,7 +38,7 @@ -2 => 'icon-trash', 0 => 'icon-unpublish', 1 => 'icon-check', - 2 => 'icon-folder', + 2 => 'icon-archive', ]; $this->document->addScriptOptions('associations-modal', ['func' => $function]); diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php index b0d84bdd9fc2f..18cb20247d6cf 100644 --- a/administrator/components/com_categories/tmpl/categories/modal.php +++ b/administrator/components/com_categories/tmpl/categories/modal.php @@ -77,7 +77,7 @@ -2 => 'icon-trash', 0 => 'icon-unpublish', 1 => 'icon-check', - 2 => 'icon-folder', + 2 => 'icon-archive', ]; ?> items as $i => $item) : ?> diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php index c3063096795c8..4ff9f6d5d92ac 100644 --- a/administrator/components/com_contact/tmpl/contacts/modal.php +++ b/administrator/components/com_contact/tmpl/contacts/modal.php @@ -90,7 +90,7 @@ -2 => 'icon-trash', 0 => 'icon-unpublish', 1 => 'icon-check', - 2 => 'icon-folder', + 2 => 'icon-archive', ]; ?> items as $i => $item) : ?> diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php index 95f3f4ef3923d..44b0f3bd6fab2 100644 --- a/administrator/components/com_fields/tmpl/fields/modal.php +++ b/administrator/components/com_fields/tmpl/fields/modal.php @@ -77,7 +77,7 @@ -2 => 'icon-trash', 0 => 'icon-unpublish', 1 => 'icon-check', - 2 => 'icon-folder', + 2 => 'icon-archive', ]; foreach ($this->items as $i => $item) : ?> diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php index a97995271ffce..367174120817a 100644 --- a/administrator/components/com_modules/tmpl/modules/modal.php +++ b/administrator/components/com_modules/tmpl/modules/modal.php @@ -81,7 +81,7 @@ -2 => 'icon-trash', 0 => 'icon-unpublish', 1 => 'icon-check', - 2 => 'icon-folder', + 2 => 'icon-archive', ]; foreach ($this->items as $i => $item) : ?> diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php index 4d37f7da46396..d77fc15e4a026 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php @@ -74,7 +74,7 @@ -2 => 'icon-trash', 0 => 'icon-unpublish', 1 => 'icon-check', - 2 => 'icon-folder', + 2 => 'icon-archive', ]; ?> items as $i => $item) : ?> From 73643025a84c179a346df5becb596087b8a3eccb Mon Sep 17 00:00:00 2001 From: Mohamed Abdelaziz Date: Sat, 4 May 2024 15:00:05 +0400 Subject: [PATCH 4/4] Changed icon-check to icon-publish --- .../components/com_associations/tmpl/associations/default.php | 2 +- .../components/com_associations/tmpl/associations/modal.php | 2 +- .../components/com_categories/tmpl/categories/modal.php | 2 +- administrator/components/com_contact/tmpl/contacts/modal.php | 2 +- administrator/components/com_content/tmpl/articles/modal.php | 2 +- administrator/components/com_fields/tmpl/fields/modal.php | 2 +- administrator/components/com_modules/tmpl/modules/modal.php | 2 +- administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php index 410afc5fe51c2..8123d76be1d6f 100644 --- a/administrator/components/com_associations/tmpl/associations/default.php +++ b/administrator/components/com_associations/tmpl/associations/default.php @@ -30,7 +30,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php index 4b5792fad27d5..6e14c66db79cc 100644 --- a/administrator/components/com_associations/tmpl/associations/modal.php +++ b/administrator/components/com_associations/tmpl/associations/modal.php @@ -37,7 +37,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php index 18cb20247d6cf..7fe99390d0a9c 100644 --- a/administrator/components/com_categories/tmpl/categories/modal.php +++ b/administrator/components/com_categories/tmpl/categories/modal.php @@ -76,7 +76,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; ?> diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php index 4ff9f6d5d92ac..916be9fd5ed69 100644 --- a/administrator/components/com_contact/tmpl/contacts/modal.php +++ b/administrator/components/com_contact/tmpl/contacts/modal.php @@ -89,7 +89,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; ?> diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php index 373e85216442e..940510211fe1b 100644 --- a/administrator/components/com_content/tmpl/articles/modal.php +++ b/administrator/components/com_content/tmpl/articles/modal.php @@ -91,7 +91,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; ?> diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php index 44b0f3bd6fab2..8c4ae80a71db9 100644 --- a/administrator/components/com_fields/tmpl/fields/modal.php +++ b/administrator/components/com_fields/tmpl/fields/modal.php @@ -76,7 +76,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; foreach ($this->items as $i => $item) : diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php index 367174120817a..bfe9c35015934 100644 --- a/administrator/components/com_modules/tmpl/modules/modal.php +++ b/administrator/components/com_modules/tmpl/modules/modal.php @@ -80,7 +80,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; foreach ($this->items as $i => $item) : diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php index d77fc15e4a026..7a9bd8d29ded4 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php @@ -73,7 +73,7 @@ $iconStates = [ -2 => 'icon-trash', 0 => 'icon-unpublish', - 1 => 'icon-check', + 1 => 'icon-publish', 2 => 'icon-archive', ]; ?>