diff --git a/administrator/components/com_config/src/View/Application/HtmlView.php b/administrator/components/com_config/src/View/Application/HtmlView.php index c9630113cb50f..094fd0738885c 100644 --- a/administrator/components/com_config/src/View/Application/HtmlView.php +++ b/administrator/components/com_config/src/View/Application/HtmlView.php @@ -113,7 +113,7 @@ public function display($tpl = null) */ protected function addToolbar() { - ToolbarHelper::title(Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'sliders-h config'); + ToolbarHelper::title(Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'cog config'); ToolbarHelper::apply('application.apply'); ToolbarHelper::divider(); ToolbarHelper::save('application.save'); diff --git a/administrator/components/com_config/src/View/Component/HtmlView.php b/administrator/components/com_config/src/View/Component/HtmlView.php index 554c7b9b3ccb6..468a3bb31ec1f 100644 --- a/administrator/components/com_config/src/View/Component/HtmlView.php +++ b/administrator/components/com_config/src/View/Component/HtmlView.php @@ -114,7 +114,7 @@ public function display($tpl = null) */ protected function addToolbar() { - ToolbarHelper::title(Text::_($this->component->option . '_configuration'), 'sliders-h config'); + ToolbarHelper::title(Text::_($this->component->option . '_configuration'), 'cog config'); ToolbarHelper::apply('component.apply'); ToolbarHelper::divider(); ToolbarHelper::save('component.save'); diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php index 8d447835792ca..0e82db195d6a7 100644 --- a/administrator/components/com_content/tmpl/featured/default.php +++ b/administrator/components/com_content/tmpl/featured/default.php @@ -220,7 +220,8 @@ $options = [ 'transitions' => $transitions, 'title' => Text::_($item->stage_title), - 'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)) + 'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)), + 'id' => 'workflow-' . $item->id ]; echo (new TransitionButton($options)) @@ -233,7 +234,8 @@ 'articles.', - 'disabled' => $workflow_featured || !$canChange + 'disabled' => $workflow_featured || !$canChange, + 'id' => 'featured-' . $item->id ]; echo (new FeaturedButton) @@ -244,7 +246,8 @@ 'articles.', - 'disabled' => $workflow_state || !$canChange + 'disabled' => $workflow_state || !$canChange, + 'id' => 'state-' . $item->id ]; echo (new PublishedButton)->render((int) $item->state, $i, $options, $item->publish_up, $item->publish_down); diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php index b7d1c585f2c2a..b4d04396086a8 100644 --- a/administrator/components/com_fields/tmpl/field/edit.php +++ b/administrator/components/com_fields/tmpl/field/edit.php @@ -73,18 +73,12 @@ set('ignore_fieldsets', array('fieldparams')); ?> -
-
-
- -
- -
-
-
-
+
+ +
+
-
+ canDo->get('core.admin')) : ?> diff --git a/administrator/components/com_fields/tmpl/group/edit.php b/administrator/components/com_fields/tmpl/group/edit.php index e801ddd4bc227..fc848937b4534 100644 --- a/administrator/components/com_fields/tmpl/group/edit.php +++ b/administrator/components/com_fields/tmpl/group/edit.php @@ -53,18 +53,12 @@
-
-
-
- -
- -
-
-
-
-
-
+
+ +
+ +
+
set('ignore_fieldsets', array('fieldparams')); ?> diff --git a/administrator/components/com_finder/src/Model/MapsModel.php b/administrator/components/com_finder/src/Model/MapsModel.php index 3a2231dc54f78..d10feeb9e354b 100644 --- a/administrator/components/com_finder/src/Model/MapsModel.php +++ b/administrator/components/com_finder/src/Model/MapsModel.php @@ -97,6 +97,18 @@ public function delete(&$pks) // Include the content plugins for the on delete events. PluginHelper::importPlugin('content'); + // Iterate the items to check if all of them exist. + foreach ($pks as $i => $pk) + { + if (!$table->load($pk)) + { + // Item is not in the table. + $this->setError($table->getError()); + + return false; + } + } + // Iterate the items to delete each one. foreach ($pks as $i => $pk) { @@ -142,12 +154,6 @@ public function delete(&$pks) } } } - else - { - $this->setError($table->getError()); - - return false; - } } // Clear the component's cache diff --git a/administrator/components/com_installer/src/View/Updatesites/HtmlView.php b/administrator/components/com_installer/src/View/Updatesites/HtmlView.php index 0848de5ec0cc5..35eed84e891f5 100644 --- a/administrator/components/com_installer/src/View/Updatesites/HtmlView.php +++ b/administrator/components/com_installer/src/View/Updatesites/HtmlView.php @@ -103,11 +103,6 @@ protected function addToolbar(): void // Get the toolbar object instance $toolbar = Toolbar::getInstance('toolbar'); - if ($canDo->get('core.edit')) - { - ToolbarHelper::editList('updatesite.edit'); - } - if ($canDo->get('core.edit.state')) { $dropdown = $toolbar->dropdownButton('status-group') diff --git a/administrator/language/en-GB/plg_editors-xtd_article.ini b/administrator/language/en-GB/plg_editors-xtd_article.ini index 431f5b637d56f..2bb1525dc1eee 100644 --- a/administrator/language/en-GB/plg_editors-xtd_article.ini +++ b/administrator/language/en-GB/plg_editors-xtd_article.ini @@ -4,5 +4,5 @@ ; Note : All ini files need to be saved as UTF-8 PLG_ARTICLE_BUTTON_ARTICLE="Article" -PLG_ARTICLE_XML_DESCRIPTION="Displays a button to insert links to articles into an Article. Displays a popup allowing you to choose the article." +PLG_ARTICLE_XML_DESCRIPTION="Displays a button to insert links to articles into an editor area. Displays a popup allowing you to choose the article." PLG_EDITORS-XTD_ARTICLE="Button - Article" diff --git a/administrator/language/en-GB/plg_editors-xtd_article.sys.ini b/administrator/language/en-GB/plg_editors-xtd_article.sys.ini index 9c703e6b65d90..3fd87bdb75737 100644 --- a/administrator/language/en-GB/plg_editors-xtd_article.sys.ini +++ b/administrator/language/en-GB/plg_editors-xtd_article.sys.ini @@ -3,5 +3,5 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 -PLG_ARTICLE_XML_DESCRIPTION="Displays a button to insert links to articles into an Article. Displays a popup allowing you to choose the article." +PLG_ARTICLE_XML_DESCRIPTION="Displays a button to insert links to articles into an editor area. Displays a popup allowing you to choose the article." PLG_EDITORS-XTD_ARTICLE="Button - Article" diff --git a/administrator/language/en-GB/plg_editors-xtd_contact.ini b/administrator/language/en-GB/plg_editors-xtd_contact.ini index 8fb3d2a53bf80..515fb49ae5eb8 100644 --- a/administrator/language/en-GB/plg_editors-xtd_contact.ini +++ b/administrator/language/en-GB/plg_editors-xtd_contact.ini @@ -5,4 +5,4 @@ PLG_EDITORS-XTD_CONTACT="Button - Contact" PLG_EDITORS-XTD_CONTACT_BUTTON_CONTACT="Contact" -PLG_EDITORS-XTD_CONTACT_XML_DESCRIPTION="Displays a button to insert links to Contacts in an article. Displays a popup allowing you to choose the contact." +PLG_EDITORS-XTD_CONTACT_XML_DESCRIPTION="Displays a button to insert links to Contacts into an editor area. Displays a popup allowing you to choose the contact." diff --git a/administrator/language/en-GB/plg_editors-xtd_contact.sys.ini b/administrator/language/en-GB/plg_editors-xtd_contact.sys.ini index 87be795f5d65f..f08484549fdb2 100644 --- a/administrator/language/en-GB/plg_editors-xtd_contact.sys.ini +++ b/administrator/language/en-GB/plg_editors-xtd_contact.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_EDITORS-XTD_CONTACT="Button - Contact" -PLG_EDITORS-XTD_CONTACT_XML_DESCRIPTION="Displays a button to insert links to Contacts in an article. Displays a popup allowing you to choose the contact." +PLG_EDITORS-XTD_CONTACT_XML_DESCRIPTION="Displays a button to insert links to Contacts into an editor area. Displays a popup allowing you to choose the contact." diff --git a/administrator/language/en-GB/plg_editors-xtd_image.ini b/administrator/language/en-GB/plg_editors-xtd_image.ini index 406859f0d1363..d1135af5f7d5c 100644 --- a/administrator/language/en-GB/plg_editors-xtd_image.ini +++ b/administrator/language/en-GB/plg_editors-xtd_image.ini @@ -6,4 +6,4 @@ PLG_EDITORS-XTD_IMAGE="Button - Image" PLG_IMAGE_BUTTON_IMAGE="Image" PLG_IMAGE_BUTTON_INSERT="Insert Image" -PLG_IMAGE_XML_DESCRIPTION="Displays a button to insert images into an Article. Displays a popup allowing you to configure an image's properties and upload new image files." +PLG_IMAGE_XML_DESCRIPTION="Displays a button to insert images into an editor area. Displays a popup allowing you to configure an image's properties and upload new image files." diff --git a/administrator/language/en-GB/plg_editors-xtd_image.sys.ini b/administrator/language/en-GB/plg_editors-xtd_image.sys.ini index 329f391e204a8..8235582e6255b 100644 --- a/administrator/language/en-GB/plg_editors-xtd_image.sys.ini +++ b/administrator/language/en-GB/plg_editors-xtd_image.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_EDITORS-XTD_IMAGE="Button - Image" -PLG_IMAGE_XML_DESCRIPTION="Displays a button to insert images into an Article. Displays a popup allowing you to configure an image's properties and upload new image files." +PLG_IMAGE_XML_DESCRIPTION="Displays a button to insert images into an editor area. Displays a popup allowing you to configure an image's properties and upload new image files." diff --git a/administrator/language/en-GB/plg_editors-xtd_menu.ini b/administrator/language/en-GB/plg_editors-xtd_menu.ini index 4f83864d28ed7..9f178a39c8c43 100644 --- a/administrator/language/en-GB/plg_editors-xtd_menu.ini +++ b/administrator/language/en-GB/plg_editors-xtd_menu.ini @@ -5,4 +5,4 @@ PLG_EDITORS-XTD_MENU="Button - Menu" PLG_EDITORS-XTD_MENU_BUTTON_MENU="Menu" -PLG_EDITORS-XTD_MENU_XML_DESCRIPTION="Displays a button to insert menu item links into an Article. Displays a popup allowing you to choose the menu item." +PLG_EDITORS-XTD_MENU_XML_DESCRIPTION="Displays a button to insert menu item links into an editor area. Displays a popup allowing you to choose the menu item." diff --git a/administrator/language/en-GB/plg_editors-xtd_menu.sys.ini b/administrator/language/en-GB/plg_editors-xtd_menu.sys.ini index 3428c801e75d6..9652c5bff031b 100644 --- a/administrator/language/en-GB/plg_editors-xtd_menu.sys.ini +++ b/administrator/language/en-GB/plg_editors-xtd_menu.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_EDITORS-XTD_MENU="Button - Menu" -PLG_EDITORS-XTD_MENU_XML_DESCRIPTION="Displays a button to insert menu item links into an Article. Displays a popup allowing you to choose the menu item." +PLG_EDITORS-XTD_MENU_XML_DESCRIPTION="Displays a button to insert menu item links into an editor area. Displays a popup allowing you to choose the menu item." diff --git a/administrator/language/en-GB/plg_editors-xtd_module.ini b/administrator/language/en-GB/plg_editors-xtd_module.ini index 72ae5e09396f3..77cabd39526e5 100644 --- a/administrator/language/en-GB/plg_editors-xtd_module.ini +++ b/administrator/language/en-GB/plg_editors-xtd_module.ini @@ -5,4 +5,4 @@ PLG_EDITORS-XTD_MODULE="Button - Module" PLG_MODULE_BUTTON_MODULE="Module" -PLG_MODULE_XML_DESCRIPTION="Displays a button to insert a module into an Article. Displays a popup allowing you to choose the module." +PLG_MODULE_XML_DESCRIPTION="Displays a button to insert a module into an editor area. Displays a popup allowing you to choose the module." diff --git a/administrator/language/en-GB/plg_editors-xtd_module.sys.ini b/administrator/language/en-GB/plg_editors-xtd_module.sys.ini index 254a6ccd72ee4..360b64806c7c8 100644 --- a/administrator/language/en-GB/plg_editors-xtd_module.sys.ini +++ b/administrator/language/en-GB/plg_editors-xtd_module.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_EDITORS-XTD_MODULE="Button - Module" -PLG_MODULE_XML_DESCRIPTION="Displays a button to insert a module into an Article. Displays a popup allowing you to choose the module." +PLG_MODULE_XML_DESCRIPTION="Displays a button to insert a module into an editor area. Displays a popup allowing you to choose the module." diff --git a/administrator/language/en-GB/plg_installer_folderinstaller.ini b/administrator/language/en-GB/plg_installer_folderinstaller.ini index 98b1c453c6d6c..b3b3a27539aa1 100644 --- a/administrator/language/en-GB/plg_installer_folderinstaller.ini +++ b/administrator/language/en-GB/plg_installer_folderinstaller.ini @@ -6,4 +6,4 @@ PLG_INSTALLER_FOLDERINSTALLER_TEXT="Install from Folder" PLG_INSTALLER_FOLDERINSTALLER_BUTTON="Check and Install" PLG_INSTALLER_FOLDERINSTALLER_NO_INSTALL_PATH="Please enter a Folder." -PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a folder." +PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a folder on the web server." diff --git a/administrator/language/en-GB/plg_installer_folderinstaller.sys.ini b/administrator/language/en-GB/plg_installer_folderinstaller.sys.ini index 363c71a21cb2a..342487a4e323a 100644 --- a/administrator/language/en-GB/plg_installer_folderinstaller.sys.ini +++ b/administrator/language/en-GB/plg_installer_folderinstaller.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_INSTALLER_FOLDERINSTALLER="Installer - Install from Folder" -PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a folder." +PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from a folder on the web server." diff --git a/administrator/language/en-GB/plg_system_updatenotification.ini b/administrator/language/en-GB/plg_system_updatenotification.ini index b580f8c4f11a9..4e6259712c86a 100644 --- a/administrator/language/en-GB/plg_system_updatenotification.ini +++ b/administrator/language/en-GB/plg_system_updatenotification.ini @@ -16,4 +16,4 @@ PLG_SYSTEM_UPDATENOTIFICATION_MAIL_MAIL_TITLE="Joomla: Update Notification" PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME="The Joomla! Update Notification will not run in this configuration" PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION="Set it back to the default setting (6 Hours)" PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY="

In your Installer Configuration you have set the Option Update Cache (in Hours) to 0 this means that Joomla is not caching the Update. This means an email should be sent on every page visit but this is not possible. Please increase the value (6 is default) or confirm that the Joomla! Update Notification will never send you mails.

" -PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY." +PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates." diff --git a/administrator/language/en-GB/plg_system_updatenotification.sys.ini b/administrator/language/en-GB/plg_system_updatenotification.sys.ini index be3880123b252..700a0c1d4cfa9 100644 --- a/administrator/language/en-GB/plg_system_updatenotification.sys.ini +++ b/administrator/language/en-GB/plg_system_updatenotification.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification" -PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY." \ No newline at end of file +PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates." diff --git a/administrator/language/en-GB/plg_webservices_banners.ini b/administrator/language/en-GB/plg_webservices_banners.ini index 7f0e109783988..f066c3b84a72f 100644 --- a/administrator/language/en-GB/plg_webservices_banners.ini +++ b/administrator/language/en-GB/plg_webservices_banners.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_BANNERS="Web Services - Banners" -PLG_WEBSERVICES_BANNERS_XML_DESCRIPTION="Add banners routes to the API for your website." +PLG_WEBSERVICES_BANNERS_XML_DESCRIPTION="Add banner routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_banners.sys.ini b/administrator/language/en-GB/plg_webservices_banners.sys.ini index 7f0e109783988..f066c3b84a72f 100644 --- a/administrator/language/en-GB/plg_webservices_banners.sys.ini +++ b/administrator/language/en-GB/plg_webservices_banners.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_BANNERS="Web Services - Banners" -PLG_WEBSERVICES_BANNERS_XML_DESCRIPTION="Add banners routes to the API for your website." +PLG_WEBSERVICES_BANNERS_XML_DESCRIPTION="Add banner routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_config.ini b/administrator/language/en-GB/plg_webservices_config.ini index 90266c54da1b3..ce93ec147b221 100644 --- a/administrator/language/en-GB/plg_webservices_config.ini +++ b/administrator/language/en-GB/plg_webservices_config.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_CONFIG="Web Services - Config" -PLG_WEBSERVICES_CONFIG_XML_DESCRIPTION="Add configs routes to the API for your website." +PLG_WEBSERVICES_CONFIG_XML_DESCRIPTION="Add config routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_config.sys.ini b/administrator/language/en-GB/plg_webservices_config.sys.ini index 90266c54da1b3..ce93ec147b221 100644 --- a/administrator/language/en-GB/plg_webservices_config.sys.ini +++ b/administrator/language/en-GB/plg_webservices_config.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_CONFIG="Web Services - Config" -PLG_WEBSERVICES_CONFIG_XML_DESCRIPTION="Add configs routes to the API for your website." +PLG_WEBSERVICES_CONFIG_XML_DESCRIPTION="Add config routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_contact.ini b/administrator/language/en-GB/plg_webservices_contact.ini index 5716e392115bf..75231a4aae0d7 100644 --- a/administrator/language/en-GB/plg_webservices_contact.ini +++ b/administrator/language/en-GB/plg_webservices_contact.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_CONTACT="Web Services - Contact" -PLG_WEBSERVICES_CONTACT_XML_DESCRIPTION="Add contacts routes to the API for your website." +PLG_WEBSERVICES_CONTACT_XML_DESCRIPTION="Add contact routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_contact.sys.ini b/administrator/language/en-GB/plg_webservices_contact.sys.ini index 5716e392115bf..75231a4aae0d7 100644 --- a/administrator/language/en-GB/plg_webservices_contact.sys.ini +++ b/administrator/language/en-GB/plg_webservices_contact.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_CONTACT="Web Services - Contact" -PLG_WEBSERVICES_CONTACT_XML_DESCRIPTION="Add contacts routes to the API for your website." +PLG_WEBSERVICES_CONTACT_XML_DESCRIPTION="Add contact routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_content.ini b/administrator/language/en-GB/plg_webservices_content.ini index b8c613767e545..6202874af339f 100644 --- a/administrator/language/en-GB/plg_webservices_content.ini +++ b/administrator/language/en-GB/plg_webservices_content.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_CONTENT="Web Services - Content" -PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION="Add articles routes to the API for your website." +PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION="Add article routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_content.sys.ini b/administrator/language/en-GB/plg_webservices_content.sys.ini index b8c613767e545..6202874af339f 100644 --- a/administrator/language/en-GB/plg_webservices_content.sys.ini +++ b/administrator/language/en-GB/plg_webservices_content.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_CONTENT="Web Services - Content" -PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION="Add articles routes to the API for your website." +PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION="Add article routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_languages.ini b/administrator/language/en-GB/plg_webservices_languages.ini index 62d1809d371ed..4daa9d5bd9403 100644 --- a/administrator/language/en-GB/plg_webservices_languages.ini +++ b/administrator/language/en-GB/plg_webservices_languages.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_LANGUAGES="Web Services - Languages" -PLG_WEBSERVICES_LANGUAGES_XML_DESCRIPTION="Add languages routes to the API for your website." +PLG_WEBSERVICES_LANGUAGES_XML_DESCRIPTION="Add language routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_languages.sys.ini b/administrator/language/en-GB/plg_webservices_languages.sys.ini index 62d1809d371ed..4daa9d5bd9403 100644 --- a/administrator/language/en-GB/plg_webservices_languages.sys.ini +++ b/administrator/language/en-GB/plg_webservices_languages.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_LANGUAGES="Web Services - Languages" -PLG_WEBSERVICES_LANGUAGES_XML_DESCRIPTION="Add languages routes to the API for your website." +PLG_WEBSERVICES_LANGUAGES_XML_DESCRIPTION="Add language routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_menus.ini b/administrator/language/en-GB/plg_webservices_menus.ini index 9545e28f3df0f..e792f3b4af2a7 100644 --- a/administrator/language/en-GB/plg_webservices_menus.ini +++ b/administrator/language/en-GB/plg_webservices_menus.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_MENUS="Web Services - Menus" -PLG_WEBSERVICES_MENUS_XML_DESCRIPTION="Add menus routes to the API for your website." +PLG_WEBSERVICES_MENUS_XML_DESCRIPTION="Add menu routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_menus.sys.ini b/administrator/language/en-GB/plg_webservices_menus.sys.ini index 9545e28f3df0f..e792f3b4af2a7 100644 --- a/administrator/language/en-GB/plg_webservices_menus.sys.ini +++ b/administrator/language/en-GB/plg_webservices_menus.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_MENUS="Web Services - Menus" -PLG_WEBSERVICES_MENUS_XML_DESCRIPTION="Add menus routes to the API for your website." +PLG_WEBSERVICES_MENUS_XML_DESCRIPTION="Add menu routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_messages.ini b/administrator/language/en-GB/plg_webservices_messages.ini index 2c5dafc73eb99..7387b86468268 100644 --- a/administrator/language/en-GB/plg_webservices_messages.ini +++ b/administrator/language/en-GB/plg_webservices_messages.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_MESSAGES="Web Services - Messages" -PLG_WEBSERVICES_MESSAGES_XML_DESCRIPTION="Add messages routes to the API for your website." +PLG_WEBSERVICES_MESSAGES_XML_DESCRIPTION="Add message routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_messages.sys.ini b/administrator/language/en-GB/plg_webservices_messages.sys.ini index 2c5dafc73eb99..7387b86468268 100644 --- a/administrator/language/en-GB/plg_webservices_messages.sys.ini +++ b/administrator/language/en-GB/plg_webservices_messages.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_MESSAGES="Web Services - Messages" -PLG_WEBSERVICES_MESSAGES_XML_DESCRIPTION="Add messages routes to the API for your website." +PLG_WEBSERVICES_MESSAGES_XML_DESCRIPTION="Add message routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_modules.ini b/administrator/language/en-GB/plg_webservices_modules.ini index 92370917b42a6..23091fa53e06e 100644 --- a/administrator/language/en-GB/plg_webservices_modules.ini +++ b/administrator/language/en-GB/plg_webservices_modules.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_MODULES="Web Services - Modules" -PLG_WEBSERVICES_MODULES_XML_DESCRIPTION="Add modules routes to the API for your website." +PLG_WEBSERVICES_MODULES_XML_DESCRIPTION="Add module routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_modules.sys.ini b/administrator/language/en-GB/plg_webservices_modules.sys.ini index 92370917b42a6..23091fa53e06e 100644 --- a/administrator/language/en-GB/plg_webservices_modules.sys.ini +++ b/administrator/language/en-GB/plg_webservices_modules.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_MODULES="Web Services - Modules" -PLG_WEBSERVICES_MODULES_XML_DESCRIPTION="Add modules routes to the API for your website." +PLG_WEBSERVICES_MODULES_XML_DESCRIPTION="Add module routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_newsfeeds.ini b/administrator/language/en-GB/plg_webservices_newsfeeds.ini index 13b4e24935351..2f7f401f22367 100644 --- a/administrator/language/en-GB/plg_webservices_newsfeeds.ini +++ b/administrator/language/en-GB/plg_webservices_newsfeeds.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_NEWSFEEDS="Web Services - Newsfeeds" -PLG_WEBSERVICES_NEWSFEEDS_XML_DESCRIPTION="Add newsfeeds routes to the API for your website." +PLG_WEBSERVICES_NEWSFEEDS_XML_DESCRIPTION="Add newsfeed routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_newsfeeds.sys.ini b/administrator/language/en-GB/plg_webservices_newsfeeds.sys.ini index 13b4e24935351..2f7f401f22367 100644 --- a/administrator/language/en-GB/plg_webservices_newsfeeds.sys.ini +++ b/administrator/language/en-GB/plg_webservices_newsfeeds.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_NEWSFEEDS="Web Services - Newsfeeds" -PLG_WEBSERVICES_NEWSFEEDS_XML_DESCRIPTION="Add newsfeeds routes to the API for your website." +PLG_WEBSERVICES_NEWSFEEDS_XML_DESCRIPTION="Add newsfeed routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_plugins.ini b/administrator/language/en-GB/plg_webservices_plugins.ini index 315e38754e15a..3ed26b30355ff 100644 --- a/administrator/language/en-GB/plg_webservices_plugins.ini +++ b/administrator/language/en-GB/plg_webservices_plugins.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_PLUGINS="Web Services - Plugins" -PLG_WEBSERVICES_PLUGINS_XML_DESCRIPTION="Add plugins routes to the API for your website." +PLG_WEBSERVICES_PLUGINS_XML_DESCRIPTION="Add plugin routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_plugins.sys.ini b/administrator/language/en-GB/plg_webservices_plugins.sys.ini index 315e38754e15a..3ed26b30355ff 100644 --- a/administrator/language/en-GB/plg_webservices_plugins.sys.ini +++ b/administrator/language/en-GB/plg_webservices_plugins.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_PLUGINS="Web Services - Plugins" -PLG_WEBSERVICES_PLUGINS_XML_DESCRIPTION="Add plugins routes to the API for your website." +PLG_WEBSERVICES_PLUGINS_XML_DESCRIPTION="Add plugin routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_tags.ini b/administrator/language/en-GB/plg_webservices_tags.ini index 21e57bb7b4dbf..84a3a568b2c88 100644 --- a/administrator/language/en-GB/plg_webservices_tags.ini +++ b/administrator/language/en-GB/plg_webservices_tags.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_TAGS="Web Services - Tags" -PLG_WEBSERVICES_TAGS_XML_DESCRIPTION="Add tags routes to the API for your website." +PLG_WEBSERVICES_TAGS_XML_DESCRIPTION="Add tag routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_tags.sys.ini b/administrator/language/en-GB/plg_webservices_tags.sys.ini index 21e57bb7b4dbf..84a3a568b2c88 100644 --- a/administrator/language/en-GB/plg_webservices_tags.sys.ini +++ b/administrator/language/en-GB/plg_webservices_tags.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_TAGS="Web Services - Tags" -PLG_WEBSERVICES_TAGS_XML_DESCRIPTION="Add tags routes to the API for your website." +PLG_WEBSERVICES_TAGS_XML_DESCRIPTION="Add tag routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_templates.ini b/administrator/language/en-GB/plg_webservices_templates.ini index bd0f3ffcbd041..7111fccbdc0bf 100644 --- a/administrator/language/en-GB/plg_webservices_templates.ini +++ b/administrator/language/en-GB/plg_webservices_templates.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_TEMPLATES="Web Services - Templates" -PLG_WEBSERVICES_TEMPLATES_XML_DESCRIPTION="Add templates routes to the API for your website." +PLG_WEBSERVICES_TEMPLATES_XML_DESCRIPTION="Add template routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_templates.sys.ini b/administrator/language/en-GB/plg_webservices_templates.sys.ini index bd0f3ffcbd041..7111fccbdc0bf 100644 --- a/administrator/language/en-GB/plg_webservices_templates.sys.ini +++ b/administrator/language/en-GB/plg_webservices_templates.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_TEMPLATES="Web Services - Templates" -PLG_WEBSERVICES_TEMPLATES_XML_DESCRIPTION="Add templates routes to the API for your website." +PLG_WEBSERVICES_TEMPLATES_XML_DESCRIPTION="Add template routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_users.ini b/administrator/language/en-GB/plg_webservices_users.ini index 0fd6009c6b3d1..0b952989580f4 100644 --- a/administrator/language/en-GB/plg_webservices_users.ini +++ b/administrator/language/en-GB/plg_webservices_users.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_USERS="Web Services - Users" -PLG_WEBSERVICES_USERS_XML_DESCRIPTION="Add users routes to the API for your website." +PLG_WEBSERVICES_USERS_XML_DESCRIPTION="Add user routes to the API for your website." diff --git a/administrator/language/en-GB/plg_webservices_users.sys.ini b/administrator/language/en-GB/plg_webservices_users.sys.ini index 0fd6009c6b3d1..0b952989580f4 100644 --- a/administrator/language/en-GB/plg_webservices_users.sys.ini +++ b/administrator/language/en-GB/plg_webservices_users.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_WEBSERVICES_USERS="Web Services - Users" -PLG_WEBSERVICES_USERS_XML_DESCRIPTION="Add users routes to the API for your website." +PLG_WEBSERVICES_USERS_XML_DESCRIPTION="Add user routes to the API for your website." diff --git a/administrator/modules/mod_menu/src/Menu/CssMenu.php b/administrator/modules/mod_menu/src/Menu/CssMenu.php index 74a8e1bb1fa8d..6efd282a0d909 100644 --- a/administrator/modules/mod_menu/src/Menu/CssMenu.php +++ b/administrator/modules/mod_menu/src/Menu/CssMenu.php @@ -13,6 +13,7 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Language\Associations; use Joomla\CMS\Language\Text; use Joomla\CMS\Menu\AdministratorMenuItem; use Joomla\CMS\Table\Table; @@ -316,6 +317,17 @@ protected function preprocess($parent) continue; } + /* + * Multilingual Associations if the site is not set as multilingual and/or Associations is not enabled in + * the Language Filter plugin + */ + + if (!Associations::isEnabled() && $item->element === 'com_associations') + { + $parent->removeChild($item); + continue; + } + // Exclude Mass Mail if disabled in global configuration if ($item->scope === 'massmail' && ($this->application->get('mailonline', 1) == 0 || $this->application->get('massmailoff', 0) == 1)) { diff --git a/administrator/modules/mod_user/tmpl/default.php b/administrator/modules/mod_user/tmpl/default.php index 9f0b4d61d6e59..d2aa88ee3c72f 100644 --- a/administrator/modules/mod_user/tmpl/default.php +++ b/administrator/modules/mod_user/tmpl/default.php @@ -26,7 +26,7 @@ HTMLHelper::_('bootstrap.dropdown', '.dropdown-toggle'); ?>
- - - -
- + diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index 8dcc16c598b54..bf9ffbdb5d86c 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -95,6 +95,7 @@ +