Merge branch '4.0-dev' into 4.0_sidebyside_display

administrator/components/com_menus/presets/help.xml

@@ -5,7 +5,7 @@
 	xsi:schemaLocation="urn:joomla.org menu.xsd"
 	>
 	<menuitem
-		title="COM_CPANEL_DASHBOARD_HELP_FIND_HELP"
+		title="MOD_MENU_HELP_PARENT_FIND_HELP"
 		type="heading"
 		icon="question-circle"
 		permission="core.admin"
@@ -40,7 +40,7 @@
 	</menuitem>
 
 	<menuitem
-		title="COM_CPANEL_DASHBOARD_HELP_MEET_JOOMLERS"
+		title="MOD_MENU_HELP_PARENT_MEET_JOOMLERS"
 		type="heading"
 		icon="users"
 		>
@@ -67,7 +67,7 @@
 	</menuitem>
 
 	<menuitem
-		title="COM_CPANEL_DASHBOARD_HELP_NEWS"
+		title="MOD_MENU_HELP_PARENT_NEWS"
 		type="heading"
 		icon="bullhorn"
 		>
@@ -94,7 +94,7 @@
 	</menuitem>
 
 	<menuitem
-		title="COM_CPANEL_DASHBOARD_HELP_RESOURCES"
+		title="MOD_MENU_HELP_PARENT_RESOURCES"
 		type="heading"
 		icon="cloud-download-alt"
 		permission="core.manage;com_installer"
@@ -136,7 +136,7 @@
 	</menuitem>
 
 	<menuitem
-		title="COM_CPANEL_DASHBOARD_HELP_GET_INVOLVED"
+		title="MOD_MENU_HELP_PARENT_GET_INVOLVED"
 		type="heading"
 		icon="handshake"
 		>

administrator/components/com_menus/presets/system.xml

@@ -5,7 +5,7 @@
 	xsi:schemaLocation="urn:joomla.org menu.xsd"
 	>
 	<menuitem
-		title="COM_CPANEL_SYSTEM_SETUP"
+		title="MOD_MENU_SYSTEM_PARENT_SETUP"
 		type="heading"
 		icon="cog"
 		permission="core.admin"

administrator/language/en-GB/com_cpanel.ini

@@ -11,11 +11,6 @@ COM_CPANEL_DASHBOARD_COMPONENTS_TITLE="Components Dashboard"
 COM_CPANEL_DASHBOARD_CONTENT_TITLE="Content Dashboard"
 COM_CPANEL_DASHBOARD_CONTENT_WORKFLOW_TITLE="Content Workflow Dashboard"
 COM_CPANEL_DASHBOARD_HELP_TITLE="Help"
-COM_CPANEL_DASHBOARD_HELP_FIND_HELP="Find Help"
-COM_CPANEL_DASHBOARD_HELP_MEET_JOOMLERS="Meet Joomlers"
-COM_CPANEL_DASHBOARD_HELP_NEWS="News"
-COM_CPANEL_DASHBOARD_HELP_RESOURCES="Resources"
-COM_CPANEL_DASHBOARD_HELP_GET_INVOLVED="Get Involved"
 COM_CPANEL_DASHBOARD_MENUS_TITLE="Menu Dashboard"
 COM_CPANEL_DASHBOARD_PRIVACY_TITLE="Privacy Dashboard"
 COM_CPANEL_DASHBOARD_SYSTEM_TITLE="System Dashboard"
@@ -37,7 +32,6 @@ COM_CPANEL_MSG_STATS_COLLECTION_BODY="<p>Since Joomla! 3.5 a statistics plugin w
 COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
 COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY="<p>As part of our security team's review, we have made some changes to the default settings in a new Joomla installation. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site.</p><p>The changed settings are:</p><ul><li>Global Configuration > Text Filters: The default \"Administrator\" user group has changed from \"No Filtering\" to \"Default Blacklist\"</li><li>Users > Send Password: The option to send a user their password in plain text when an account is created is now disabled by default</li><li>Media Manager: Flash files (\"swf\" file extension and \"application/x-shockwave-flash\" MIME Type) are not allowed to be uploaded</li><li>Articles > Show Email: The option to show an email icon with articles is disabled by default</li></ul><p>We have created a <a href=\"https://docs.joomla.org/Special:MyLanguage/J3.x:Joomla_3.8.8_notes_about_the_changed_default_settings\">dedicated documentation page</a> explaining these changes.</p>"
 COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE="Updated site security recommendations"
-COM_CPANEL_SYSTEM_SETUP="Setup"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
 COM_CPANEL_UNPUBLISH_MODULE_SUCCESS="Module unpublished"

administrator/language/en-GB/mod_menu.ini

@@ -19,9 +19,9 @@ MOD_MENU_COM_CONTENT_CATEGORY_MANAGER="Categories"
 MOD_MENU_COM_CONTENT_FEATURED="Featured Articles"
 MOD_MENU_COM_CONTENT_MANAGE="Content Settings"
 MOD_MENU_COM_CONTENT_MISC="Modules & Media"
+MOD_MENU_COM_CONTENT_NEW_ADMIN_MODULE="Add Administrator Module"
 MOD_MENU_COM_CONTENT_NEW_ARTICLE="Add Article"
 MOD_MENU_COM_CONTENT_NEW_CATEGORY="Add Category"
-MOD_MENU_COM_CONTENT_NEW_ADMIN_MODULE="Add Administrator Module"
 MOD_MENU_COM_CONTENT_NEW_SITE_MODULE="Add Site Module"
 MOD_MENU_COM_CONTENT_WORKFLOW="Workflows"
 MOD_MENU_COM_CONTENT_WORKFLOW_MANAGER="Workflows"
@@ -87,17 +87,22 @@ MOD_MENU_HELP_GITHUB="Joomla on GitHub"
 MOD_MENU_HELP_GLIP="Glip"
 MOD_MENU_HELP_ISSUES_TRACKER="Issue Tracker"
 MOD_MENU_HELP_JOOMLA="Joomla! Help"
+MOD_MENU_HELP_PARENT_FIND_HELP="Find Help"
+MOD_MENU_HELP_PARENT_GET_INVOLVED="Get Involved"
+MOD_MENU_HELP_PARENT_MEET_JOOMLERS="Meet Joomlers"
+MOD_MENU_HELP_PARENT_NEWS="News"
+MOD_MENU_HELP_PARENT_RESOURCES="Resources"
 MOD_MENU_HELP_RESOURCES="Joomla! Resources"
 MOD_MENU_HELP_SECURITY="Security Centre"
 MOD_MENU_HELP_SHOP="Joomla! Shop"
 ; The string below will be used if the localised sample data has a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module has a URL
 MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum"
 MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum"
-; Enter in the string below the # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). Default is '511' which is the section for all languages forums.
-MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511"
 ; If you have chosen to display in the string above the section for all languages, translate the string below.
-; If you have displayed the specific language forum, use something like "Official French Forum" in your language
+; If you have displayed the specific language forum, use something like "Official French Forum" in your language.
 MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums"
+; Enter in the string below the # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). Default is '511' which is the section for all languages forums.
+MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511"
 MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations"
 MOD_MENU_HELP_USER_GROUPS="Joomla User Groups"
 MOD_MENU_HELP_XCHANGE="Stack Exchange"
@@ -148,6 +153,7 @@ MOD_MENU_SYSTEM="System"
 MOD_MENU_SYSTEM_INFORMATION="System Information"
 MOD_MENU_SYSTEM_INFORMATION_DATABASE="Database"
 MOD_MENU_SYSTEM_INFORMATION_SYSINFO="System Information"
+MOD_MENU_SYSTEM_PARENT_SETUP="Setup"
 MOD_MENU_TEMPLATE_ADMIN_STYLES="Administrator Template Styles"
 MOD_MENU_TEMPLATE_ADMIN_TEMPLATES="Administrator Templates"
 MOD_MENU_TEMPLATE_SITE_STYLES="Site Template Styles"

administrator/templates/atum/scss/blocks/_global.scss

@@ -18,7 +18,7 @@ body {
     filter: grayscale(1);
   }
   &.a11y_contrast {
-    filter: invert(100%);
+    filter: contrast(115%);
   }
   &.a11y_highlight {
     a {