Merge branch '4.1-dev' into title_with_read_more

.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%

administrator/components/com_cache/config.xml

@@ -13,6 +13,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_cache"
-			section="component" />
+			section="component"
+		/>
 	</fieldset>
 </config>

administrator/components/com_config/forms/application.xml

@@ -49,7 +49,7 @@
 			filter="integer"
 			validate="number"
 			showon="caching:1,2"
-		 />
+		/>
 
 		<field
 			name="cache_path"
@@ -173,7 +173,8 @@
 			label="COM_CONFIG_FIELD_DATABASE_TYPE_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_TYPE_DESC"
 			supported="mysql,mysqli,pgsql,postgresql"
-			filter="string" />
+			filter="string"
+		/>
 
 		<field
 			name="host"

administrator/components/com_contact/config.xml

@@ -838,22 +838,22 @@
 		</field>
 
 		<field
- 			name="contacts_display_num"
- 			type="list"
- 			label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
- 			default="10"
+			name="contacts_display_num"
+			type="list"
+			label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
+			default="10"
 			validate="options"
- 			>
- 			<option value="5">J5</option>
- 			<option value="10">J10</option>
- 			<option value="15">J15</option>
- 			<option value="20">J20</option>
- 			<option value="25">J25</option>
- 			<option value="30">J30</option>
- 			<option value="50">J50</option>
- 			<option value="100">J100</option>
- 			<option value="0">JALL</option>
- 		</field>
+			>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="15">J15</option>
+			<option value="20">J20</option>
+			<option value="25">J25</option>
+			<option value="30">J30</option>
+			<option value="50">J50</option>
+			<option value="100">J100</option>
+			<option value="0">JALL</option>
+		</field>
 
 		<field
 			name="initial_sort"

administrator/components/com_contact/forms/contact.xml

@@ -15,7 +15,7 @@
 			type="text"
 			label="COM_CONTACT_FIELD_NAME_LABEL"
 			required="true"
-		 />
+		/>
 
 		<field
 			name="alias"
@@ -167,7 +167,7 @@
 			label="JFIELD_META_KEYWORDS_LABEL"
 			rows="3"
 			cols="30"
-		 />
+		/>
 
 		<field
 			name="metadesc"

administrator/components/com_content/forms/filter_featured.xml

@@ -94,7 +94,7 @@
 			step="1"
 			languages="*"
 			onchange="this.form.submit();"
- 			>
+			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>

administrator/components/com_finder/forms/filter.xml

@@ -66,7 +66,7 @@
 			readonly="true"
 			filter="unset"
 			validate="UserId"
-		 />
+		/>
 
 		<field
 			name="checked_out"

administrator/components/com_languages/tmpl/multilangstatus/default.php

@@ -146,6 +146,7 @@
 			<?php endif; ?>
 		<?php endforeach; ?>
 		<table class="table table-sm">
+			<caption class="visually-hidden"><?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_TABLE_CAPTION'); ?></caption>
 			<thead>
 				<tr>
 					<th scope="col">
@@ -201,6 +202,7 @@
 			</tbody>
 		</table>
 		<table class="table table-sm">
+			<caption class="visually-hidden"><?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_TABLE_CAPTION'); ?></caption>
 			<thead>
 				<tr>
 					<th scope="col">

administrator/components/com_media/config.xml

@@ -142,6 +142,6 @@
 			validate="rules"
 			component="com_media"
 			section="component"
-		 />
+		/>
 	</fieldset>
 </config>

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"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>

administrator/components/com_redirect/forms/link.xml

@@ -8,7 +8,7 @@
 			default="0"
 			readonly="true"
 			class="readonly"
-		 />
+		/>
 
 		<field
 			name="old_url"

administrator/components/com_templates/forms/source.xml

@@ -9,7 +9,7 @@
 		<field
 			name="filename"
 			type="hidden"
-		 />
+		/>
 
 		<field
 			name="source"

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;

administrator/components/com_users/config.xml

@@ -264,23 +264,23 @@
 
 	</fieldset>
 
- 	<fieldset
+	<fieldset
 		name="massmail"
 		label="COM_USERS_MASS_MAIL"
 		description="COM_USERS_MASS_MAIL_DESC">
 
 		<field
- 			name="mailSubjectPrefix"
- 			type="text"
+			name="mailSubjectPrefix"
+			type="text"
 			label="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL"
 		/>
 
- 		<field
- 			name="mailBodySuffix"
+		<field
+			name="mailBodySuffix"
 			type="textarea"
 			label="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL"
- 			rows="5"
- 			cols="30"
+			rows="5"
+			cols="30"
 		/>
 
 	</fieldset>

administrator/language/en-GB/com_languages.ini

@@ -69,20 +69,22 @@ COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_MISSING="The <strong>%s</strong>
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_SEF_MISSING="The \"URL Language Code\" is missing for the <strong>%s</strong> Content Language. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED="The <strong>%s</strong> Content Language is trashed. <strong>The language will not display on the site.</strong>"
+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 &quot;All&quot; should not be published."
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the <strong>%s</strong> Content Language although a Site Language for this Content Language is not installed or enabled AND/OR the Content Language is not published. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE="The Content Language for the <strong>%s</strong> default Site Language is unpublished or does not exist. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG="The Content Language tag <strong>%s</strong> 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'. <strong>The language will not display on the site.</strong>"
-COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the <strong>%s</strong> Content Language is unpublished. <strong>The language will not display on the site.</strong>"
 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 &quot;All&quot;)."
+COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the <strong>%s</strong> Content Language is unpublished. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_PUBLISHED="Published Language Switcher Modules."
 COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_UNPUBLISHED="At least one Language Switcher module set to language &quot;All&quot; 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.<br><strong>Note</strong>: 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."

administrator/modules/mod_custom/mod_custom.xml

@@ -44,7 +44,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_feed/mod_feed.xml

@@ -120,7 +120,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"
@@ -146,7 +146,7 @@
 					name="cache_time"
 					type="number"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
- 					default="900"
+					default="900"
 					filter="integer"
 					min="1"
 					validate="number"

administrator/modules/mod_frontend/mod_frontend.xml

@@ -26,7 +26,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_latest/mod_latest.xml

@@ -74,7 +74,7 @@
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
 					validate="moduleLayout"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_logged/mod_logged.xml

@@ -52,7 +52,7 @@
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
 					validate="moduleLayout"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_login/mod_login.xml

@@ -35,7 +35,7 @@
 					name="moduleclass_sfx"
 					type="textarea"
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-				 	rows="3"
+					rows="3"
 					validate="CssIdentifier"
 				/>
 			</fieldset>

administrator/modules/mod_messages/mod_messages.xml

@@ -26,7 +26,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_popular/mod_popular.xml

@@ -64,7 +64,7 @@
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
 					validate="moduleLayout"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml

@@ -26,7 +26,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_title/mod_title.xml

@@ -27,7 +27,7 @@
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
 					validate="moduleLayout"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_user/mod_user.xml

@@ -26,7 +26,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

administrator/modules/mod_version/mod_version.xml

@@ -29,7 +29,7 @@
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					class="form-select"
 					validate="moduleLayout"
- 				/>
+				/>
 
 				<field
 					name="moduleclass_sfx"

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';
     }
   });
 })();