From 620370754bff4960d77ef5e810198affee1c31d8 Mon Sep 17 00:00:00 2001 From: Magnus Singer Date: Tue, 19 Apr 2022 13:54:40 +0200 Subject: [PATCH 1/6] Show loading view in installer component properly (#37570) --- build/media_source/com_installer/js/installer.es6.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/com_installer/js/installer.es6.js b/build/media_source/com_installer/js/installer.es6.js index caa8ca66df49f..2af938ff76f76 100644 --- a/build/media_source/com_installer/js/installer.es6.js +++ b/build/media_source/com_installer/js/installer.es6.js @@ -11,12 +11,12 @@ const installer = document.getElementById('installer-install'); if (loading && installer) { - loading.style.top = parseInt(installer.offsetTop - window.pageYOffset, 10); + loading.style.position = 'absolute'; + loading.style.top = 0; loading.style.left = 0; loading.style.width = '100%'; loading.style.height = '100%'; loading.classList.add('hidden'); - loading.style.marginTop = '-10px'; } }); })(); From 6d8048ed67c0d4ea0af3c5da57ede8501cc26f1b Mon Sep 17 00:00:00 2001 From: heelc29 <66922325+heelc29@users.noreply.github.com> Date: Tue, 19 Apr 2022 19:33:16 +0200 Subject: [PATCH 2/6] cs (#37580) --- .../components/com_templates/src/Model/TemplateModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php index 3c7791f6e1102..1d8db2af41dca 100644 --- a/administrator/components/com_templates/src/Model/TemplateModel.php +++ b/administrator/components/com_templates/src/Model/TemplateModel.php @@ -1451,7 +1451,7 @@ public function uploadFile($file, $location) if ($this->getTemplate()) { $app = Factory::getApplication(); - $path = $this->getBasePath();; + $path = $this->getBasePath(); $fileName = File::makeSafe($file['name']); $err = null; From f761e6216c869422c0d11b941363a71e16130b50 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Wed, 20 Apr 2022 11:28:08 +0200 Subject: [PATCH 3/6] [4.1] Remove php version to speed up the test (#37587) --- .appveyor.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d0f2184d4f95c..40911f2de72a9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,15 +8,8 @@ clone_folder: C:\projects\joomla-cms environment: PHPBuild: "x64" matrix: - - php_ver_target: 7.2 - - php_ver_target: 7.3 - - php_ver_target: 7.4 - php_ver_target: 8.0 - - php_ver_target: 8.1 -matrix: - allow_failures: - - php_ver_target: 8.1 init: - SET PATH=C:\Tools\php;%PATH% From ad73297152733264a7b8ada9a31a6f275f6b3a5d Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Wed, 20 Apr 2022 17:22:48 +0700 Subject: [PATCH 4/6] Fix Deprecated for Calendar Form Field (#37373) --- libraries/src/Form/Field/CalendarField.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php index 428ca5a236f63..099c66b1d33a2 100644 --- a/libraries/src/Form/Field/CalendarField.php +++ b/libraries/src/Form/Field/CalendarField.php @@ -274,7 +274,17 @@ protected function getInput() { $tz = date_default_timezone_get(); date_default_timezone_set('UTC'); - $this->value = strftime($this->format, strtotime($this->value)); + + if ($this->filterFormat) + { + $date = \DateTimeImmutable::createFromFormat('U', strtotime($this->value)); + $this->value = $date->format($this->filterFormat); + } + else + { + $this->value = strftime($this->format, strtotime($this->value)); + } + date_default_timezone_set($tz); } else From bea30e67670c6a4f72a6c4d9b45184cab801853f Mon Sep 17 00:00:00 2001 From: heelc29 <66922325+heelc29@users.noreply.github.com> Date: Wed, 20 Apr 2022 12:36:01 +0200 Subject: [PATCH 5/6] XML Code style (#37581) --- administrator/components/com_cache/config.xml | 3 +- .../com_config/forms/application.xml | 5 +-- .../components/com_contact/config.xml | 30 ++++++++--------- .../components/com_contact/forms/contact.xml | 4 +-- .../com_content/forms/filter_featured.xml | 2 +- .../components/com_finder/forms/filter.xml | 2 +- administrator/components/com_media/config.xml | 2 +- .../com_menus/forms/item_component.xml | 3 +- .../components/com_redirect/forms/link.xml | 2 +- .../components/com_templates/forms/source.xml | 2 +- administrator/components/com_users/config.xml | 14 ++++---- .../modules/mod_custom/mod_custom.xml | 2 +- administrator/modules/mod_feed/mod_feed.xml | 4 +-- .../modules/mod_frontend/mod_frontend.xml | 2 +- .../modules/mod_latest/mod_latest.xml | 2 +- .../modules/mod_logged/mod_logged.xml | 2 +- administrator/modules/mod_login/mod_login.xml | 2 +- .../modules/mod_messages/mod_messages.xml | 2 +- .../modules/mod_popular/mod_popular.xml | 2 +- .../mod_post_installation_messages.xml | 2 +- administrator/modules/mod_title/mod_title.xml | 2 +- administrator/modules/mod_user/mod_user.xml | 2 +- .../modules/mod_version/mod_version.xml | 2 +- .../com_contact/tmpl/category/default.xml | 32 +++++++++---------- components/com_content/forms/article.xml | 4 +-- .../com_content/tmpl/categories/default.xml | 2 +- components/com_content/tmpl/category/blog.xml | 5 +-- .../com_content/tmpl/category/default.xml | 4 +-- .../com_newsfeeds/tmpl/newsfeed/default.xml | 2 +- .../mod_articles_popular.xml | 2 +- plugins/editors/tinymce/forms/setoptions.xml | 2 +- plugins/editors/tinymce/tinymce.xml | 2 +- 32 files changed, 77 insertions(+), 73 deletions(-) diff --git a/administrator/components/com_cache/config.xml b/administrator/components/com_cache/config.xml index 746566a455e80..0d1bea3cac3d0 100644 --- a/administrator/components/com_cache/config.xml +++ b/administrator/components/com_cache/config.xml @@ -13,6 +13,7 @@ filter="rules" validate="rules" component="com_cache" - section="component" /> + section="component" + /> diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index e6cb17bc4b168..8b3121127b842 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -49,7 +49,7 @@ filter="integer" validate="number" showon="caching:1,2" - /> + /> + filter="string" + /> - - - - - - - - - - + > + + + + + + + + + + + /> + /> + > diff --git a/administrator/components/com_finder/forms/filter.xml b/administrator/components/com_finder/forms/filter.xml index 129c39f6baf2f..a016bb62341f4 100644 --- a/administrator/components/com_finder/forms/filter.xml +++ b/administrator/components/com_finder/forms/filter.xml @@ -66,7 +66,7 @@ readonly="true" filter="unset" validate="UserId" - /> + /> + /> diff --git a/administrator/components/com_menus/forms/item_component.xml b/administrator/components/com_menus/forms/item_component.xml index 96a176dbffa20..99ab1cc9880e6 100644 --- a/administrator/components/com_menus/forms/item_component.xml +++ b/administrator/components/com_menus/forms/item_component.xml @@ -42,7 +42,8 @@ type="radio" label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL" layout="joomla.form.field.radio.switcher" - default="1" filter="integer" + default="1" + filter="integer" > diff --git a/administrator/components/com_redirect/forms/link.xml b/administrator/components/com_redirect/forms/link.xml index 28eda985d6b10..12b8f37dd99cc 100644 --- a/administrator/components/com_redirect/forms/link.xml +++ b/administrator/components/com_redirect/forms/link.xml @@ -8,7 +8,7 @@ default="0" readonly="true" class="readonly" - /> + /> + /> -
-
diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml index 8da47896dc3fc..1eb2bd8c21539 100644 --- a/administrator/modules/mod_custom/mod_custom.xml +++ b/administrator/modules/mod_custom/mod_custom.xml @@ -44,7 +44,7 @@ type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL" class="form-select" - /> + /> + /> + /> + /> + /> diff --git a/administrator/modules/mod_messages/mod_messages.xml b/administrator/modules/mod_messages/mod_messages.xml index 0fb80aa50af3e..3c2347deb981f 100644 --- a/administrator/modules/mod_messages/mod_messages.xml +++ b/administrator/modules/mod_messages/mod_messages.xml @@ -26,7 +26,7 @@ type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL" class="form-select" - /> + /> + /> + /> + /> + /> + /> - - - - - - - - - - + name="contacts_display_num" + type="list" + label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL" + useglobal="true" + validate="options" + > + + + + + + + + + + - diff --git a/components/com_content/tmpl/categories/default.xml b/components/com_content/tmpl/categories/default.xml index e11f0c42b7527..1435e7d84372e 100644 --- a/components/com_content/tmpl/categories/default.xml +++ b/components/com_content/tmpl/categories/default.xml @@ -12,7 +12,7 @@
+ > JGLOBAL_TITLE - - + +
+ > + /> + >
From 1ee64271a331317331a86ced18d012342b7b3a86 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Wed, 20 Apr 2022 13:35:42 +0100 Subject: [PATCH 6/6] [4.1] Multilingual Status [a11y] (#37559) Adds the missing table caption for the two tables in the multlilangstatus _module_ There is no visual change as the captions are seet to be visually-hidden --- .../components/com_languages/tmpl/multilangstatus/default.php | 2 ++ administrator/language/en-GB/com_languages.ini | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_languages/tmpl/multilangstatus/default.php b/administrator/components/com_languages/tmpl/multilangstatus/default.php index 5aceac69ad89d..270845822397c 100644 --- a/administrator/components/com_languages/tmpl/multilangstatus/default.php +++ b/administrator/components/com_languages/tmpl/multilangstatus/default.php @@ -146,6 +146,7 @@ +
@@ -201,6 +202,7 @@
+
diff --git a/administrator/language/en-GB/com_languages.ini b/administrator/language/en-GB/com_languages.ini index b3a3ad372aa82..c6c66ef2880ed 100644 --- a/administrator/language/en-GB/com_languages.ini +++ b/administrator/language/en-GB/com_languages.ini @@ -69,20 +69,22 @@ COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_MISSING="The %s COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages" COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_SEF_MISSING="The \"URL Language Code\" is missing for the %s Content Language. The multilingual feature may not function properly or the site may not be reachable!" COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED="The %s Content Language is trashed. The language will not display on the site." +COM_LANGUAGES_MULTILANGSTATUS_CONTENT_TABLE_CAPTION="Table of the status for each content language." COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED="The menu module displaying the Home menu item set to language "All" should not be published." COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the %s Content Language although a Site Language for this Content Language is not installed or enabled AND/OR the Content Language is not published. The language will not display on the site." COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE="The Content Language for the %s default Site Language is unpublished or does not exist. The multilingual feature may not function properly or the site may not be reachable!" COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG="The Content Language tag %s does not have a matching Site Language tag. Check that the Site Language is installed and enabled AND the correct language tag is used for the Content Language. Example: for English (en-GB) both tags should be 'en-GB'. The language will not display on the site." -COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the %s Content Language is unpublished. The language will not display on the site." COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED="Published Default Home pages" COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_ALL="1 assigned to language 'All'." COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_INCLUDING_ALL="Published Default Home pages (including 1 assigned to language "All")." +COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the %s Content Language is unpublished. The language will not display on the site." COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_PUBLISHED="Published Language Switcher Modules." COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_UNPUBLISHED="At least one Language Switcher module set to language "All" has to be published. Otherwise, it will be impossible to switch languages on the site. Disregard this message if you do not use a language switcher module but direct links." COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER="Language Filter Plugin" COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER_DISABLED="The Language Filter plugin is not enabled although one or more Language Switcher modules AND/OR one or more specific Content language Default Home pages are published." COM_LANGUAGES_MULTILANGSTATUS_NONE="This site is not set as a multilingual site." COM_LANGUAGES_MULTILANGSTATUS_SITE_LANG_PUBLISHED="Enabled Site Languages" +COM_LANGUAGES_MULTILANGSTATUS_TABLE_CAPTION="Table of the multilingual status." COM_LANGUAGES_MULTILANGSTATUS_USELESS_HOMES="This site is not set as a multilingual site.
Note: at least one Default Home page is assigned to a Content Language. This will not break a monolingual site but is useless." COM_LANGUAGES_N_ITEMS_DELETED="%d Content Languages deleted." COM_LANGUAGES_N_ITEMS_DELETED_1="Content Language deleted."