[6.0] Upmerges - 2025-06-11

Merge pull request #45593 from Bodge-IT/upmerges/2025-06-11

Author: Bodge-IT

README.md

@@ -70,6 +70,7 @@ Do you want to improve Joomla?
 --------------------
 * Where to [request a feature](https://issues.joomla.org)?
 * How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org)?
+* How to [submit code](https://manual.joomla.org/docs/get-started/git/) to the Joomla CMS using a Pull Request?
 * Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org).
 * Documentation for [Developers](https://manual.joomla.org/).
 * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).

README.txt

@@ -69,6 +69,7 @@ The Joomla! 6.0 branch is under heavy development and not all links in this docu
 12- Do you want to improve Joomla?
 	* Where to request a feature? https://issues.joomla.org
 	* How do you report a bug? https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues
+	* How to submit code to the Joomla CMS using a Pull Request? https://manual.joomla.org/docs/get-started/git/
 	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org
 	* Documentation for Developers: https://manual.joomla.org/
 	* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers

administrator/language/en-GB/com_joomlaupdate.ini

@@ -198,6 +198,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND="A Joomla update was found."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM="You are on the "%s" update channel. This is not an official Joomla update channel."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT="You are on the "%s" update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (5.x)"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="You are on the "%s" update channel. Through this channel you will be notified when the future major release (6.x) will be available. Before upgrading to 6.x you'll need to assess its compatibility with your environment. You will not be notified about updates of the current Joomla release (5.x)."
+; Deprecated, will be removed with 6.0
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING="You are on the &quot;%s&quot; update channel. This channel is designed for testing new releases and fixes in Joomla.<br>It is only intended for JBS (Joomla Bug Squad&trade;) members and others within the Joomla community who are testing. Do not use this setting on a production site."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE="Before you update Joomla, ensure that the installed extensions are available for the new Joomla version. <br>You are strongly advised to make a <strong>backup</strong> of your site's files and database before you start updating."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="You can use this feature to update Joomla if your server is behind a firewall or otherwise unable to contact the update servers. First download the Joomla <em><strong>Update Package</strong></em> in ZIP format from <a class='alert-link' href='%s' target='_blank' rel='noopener noreferrer'>the official Joomla download page</a>. Then use the fields below to upload and install it."

administrator/language/en-GB/com_tags.ini

@@ -37,7 +37,7 @@ COM_TAGS_COUNT_UNPUBLISHED_ITEMS="Unpublished items"
 COM_TAGS_EMPTYSTATE_BUTTON_ADD="Add your first tag"
 COM_TAGS_EMPTYSTATE_CONTENT="Tags in Joomla! provide a flexible way of organizing content. The same tag can be applied to many different content items across content types."
 COM_TAGS_EMPTYSTATE_TITLE="No Tags have been created yet."
-COM_TAGS_ERROR_UNIQUE_ALIAS="Another Tag has the same alias (remember it may be a trashed item)."
+COM_TAGS_ERROR_UNIQUE_ALIAS="Another Tag has the same alias."
 COM_TAGS_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Tag with the same parent tag has the same alias."
 COM_TAGS_EXCLUDE="Exclude"
 COM_TAGS_FIELD_CONTENT_TYPE_LABEL="Content types"

build/media_source/templates/administrator/atum/scss/blocks/_form.scss

@@ -161,6 +161,9 @@ label.valid {
 :hover + [role="tooltip"] {
   position: absolute;
   display: block;
+  max-width: 100%;
+  overflow-wrap: break-word;
+  white-space: normal;
 }
 
 .filter-search-bar__description {

installation/template/error.php

@@ -38,7 +38,7 @@
         <jdoc:include type="metas" />
         <jdoc:include type="styles" />
     </head>
-    <body>
+    <body class="j-installation-error">
         <div class="j-install">
             <!-- Header -->
             <header class="j-header" role="banner">

installation/template/scss/template.scss

@@ -518,3 +518,70 @@ progress {
   border: 0 none;
   border-radius: 4px;
 }
+
+/* error page */
+.j-header {
+  display: flex;
+  flex-direction: row;
+  color: #fff;
+  background-color: #0b3257;
+}
+
+.j-header-logo {
+  width: 100%;
+  max-width: 240px;
+  margin: 20px;
+}
+
+.j-header-help {
+  margin: 20px 20px 20px auto;
+  a {
+    padding: 1rem;
+    font-size: 2rem;
+    color: #fff;
+  }
+}
+
+.j-footer {
+  padding: 10px 20px;
+  margin-top: auto;
+  font-size: .8rem;
+  color: #fff;
+  text-align: right;
+  background-color: #0b3257;
+}
+
+.alert {
+  position: relative;
+  display: flex;
+  margin: 0 0 20px;
+  background: #fafafa;
+  border: 1px solid rgba(0,0,0,.1);
+  box-shadow: 0 0 10px rgba(0,0,0,.05);
+  p {
+    margin-bottom: 0;
+  }
+}
+
+.alert-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 25%;
+  margin-bottom: 0;
+  font-size: 3rem;
+  opacity: .6;
+  .fa {
+    width: 100%;
+    text-align: center;
+  }
+}
+
+.alert-text {
+  padding: 10px 20px;
+}
+
+.j-installation-error {
+  background-color: #1c3d5c;
+  background-image: linear-gradient(90deg, #1c3d5c 0%, #2a5c8b 100%);
+}

plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini

@@ -504,7 +504,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_37_TITLE="Articles Category"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_38_TITLE="Search (Atomic Template)"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_39_TITLE="Top Menu (Atomic Template)"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_TITLE="Top Quote (Atomic Template)"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_CONTENT="<hr /><h2 class='alt'>Powerful Content Management and a Simple Extensible Framework.</h2><hr />"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_CONTENT="<hr><h2 class='alt'>Powerful Content Management and a Simple Extensible Framework.</h2><hr>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_TITLE="Bottom Left Column (Atomic Template)"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_CONTENT="<h6>This is a nested column</h6><p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_TITLE="Bottom Middle Column (Atomic Template)"