Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

Author: bembelimen

administrator/components/com_banners/tmpl/download/default.php

@@ -11,7 +11,7 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Router\Route;
-use \Joomla\CMS\Session\Session;
+use Joomla\CMS\Session\Session;
 
 /** @var \Joomla\Component\Banners\Administrator\View\Download\HtmlView $this */
 

administrator/components/com_cache/src/View/Cache/HtmlView.php

@@ -11,7 +11,6 @@
 
 \defined('_JEXEC') or die;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;

administrator/components/com_installer/tmpl/update/default.php

@@ -124,7 +124,7 @@
 									</td>
 									<td class="d-none d-md-table-cell text-center">
 										<?php if (!empty($item->changelogurl)) : ?>
-										<a href="#changelogModal<?php echo $item->extension_id; ?>" class="btn btn-info btn-xs changelogModal" data-js-extensionid="<?php echo $item->extension_id; ?>" data-js-view="update" data-bs-toggle="modal">
+										<a href="#changelogModal<?php echo $item->extension_id; ?>" class="btn btn-info btn-sm changelogModal" data-js-extensionid="<?php echo $item->extension_id; ?>" data-js-view="update" data-bs-toggle="modal">
 											<?php echo Text::_('COM_INSTALLER_CHANGELOG'); ?>
 										</a>
 										<?php

administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php

@@ -13,7 +13,6 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Session\Session;
 
 /** @var HtmlView $this */
 

administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php

@@ -8,8 +8,6 @@
  */
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [

administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php

@@ -13,7 +13,6 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Session\Session;
 
 /** @var HtmlView $this */
 

administrator/language/en-GB/com_categories.ini

@@ -56,7 +56,7 @@ COM_CATEGORIES_N_ITEMS_UNPUBLISHED_1="Category unpublished."
 COM_CATEGORIES_N_QUICKICON="Article Categories"
 COM_CATEGORIES_N_QUICKICON_0="Article Categories"
 COM_CATEGORIES_N_QUICKICON_1="Article Category"
-COM_CATEGORIES_N_QUICKICON_SRONLY="Categories: %s article categories are published."
+COM_CATEGORIES_N_QUICKICON_SRONLY="Categories: %d article categories are published."
 COM_CATEGORIES_N_QUICKICON_SRONLY_0="Categories: No article category is published."
 COM_CATEGORIES_N_QUICKICON_SRONLY_1="Categories: One article category is published."
 COM_CATEGORIES_NEW_CATEGORY="New Category"

administrator/modules/mod_menu/src/Menu/CssMenu.php

@@ -310,6 +310,19 @@ protected function preprocess($parent)
 				}
 			}
 
+			$uri   = new Uri($item->link);
+			$query = $uri->getQuery(true);
+
+			/**
+			 * If component is passed in the link via option variable, we set $item->element to this value for further
+			 * processing. It is needed for links from menu items of third party extensions link to Joomla! core
+			 * components like com_categories, com_fields...
+			 */
+			if ($option = $uri->getVar('option'))
+			{
+				$item->element = $option;
+			}
+
 			// Exclude item if is not enabled
 			if ($item->element && !ComponentHelper::isEnabled($item->element))
 			{
@@ -340,13 +353,10 @@ protected function preprocess($parent)
 
 			if ($item->element === 'com_categories')
 			{
-				parse_str($item->link, $query);
 				$assetName = $query['extension'] ?? 'com_content';
 			}
 			elseif ($item->element === 'com_fields')
 			{
-				parse_str($item->link, $query);
-
 				// Only display Fields menus when enabled in the component
 				$createFields = null;
 
@@ -381,8 +391,6 @@ protected function preprocess($parent)
 			}
 			elseif ($item->element === 'com_workflow')
 			{
-				parse_str($item->link, $query);
-
 				// Only display Workflow menus when enabled in the component
 				$workflow = null;
 
@@ -419,8 +427,6 @@ protected function preprocess($parent)
 			}
 			elseif ($item->element === 'com_admin')
 			{
-				parse_str($item->link, $query);
-
 				if (isset($query['view']) && $query['view'] === 'sysinfo' && !$user->authorise('core.admin'))
 				{
 					$parent->removeChild($item);

administrator/templates/atum/index.php

@@ -115,10 +115,9 @@
 					<img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
 					</div>
 				<?php else : ?>
-					<a class="logo <?php echo $sidebarState === 'closed' ? 'small' : ''; ?>" href="<?php echo Route::_('index.php'); ?>"
-						aria-label="<?php echo Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'); ?>">
-						<img src="<?php echo $logoBrandLarge; ?>" <?php echo $logoBrandLargeAlt; ?>>
-						<img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
+					<a class="logo <?php echo $sidebarState === 'closed' ? 'small' : ''; ?>" href="<?php echo Route::_('index.php'); ?>">
+						<img src="<?php echo $logoBrandLarge; ?>" alt="<?php echo Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'); ?>">
+						<img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" alt="<?php echo Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'); ?>">
 					</a>
 				<?php endif; ?>
 			</div>

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

@@ -133,21 +133,6 @@ td .form-control {
   bottom: auto;
 }
 
-.input-group-append {
-  overflow: hidden;
-  transform: translate3d(0, 0, 0);
-
-  [dir=ltr] & {
-    border-top-right-radius: $border-radius;
-    border-bottom-right-radius: $border-radius;
-  }
-
-  [dir=rtl] & {
-    border-top-left-radius: $border-radius;
-    border-bottom-left-radius: $border-radius;
-  }
-}
-
 .input-group > .form-control[readonly] {
   margin-right: 1px;
 }