Merge branch '4.0-dev' into 4.0_menu_accessibility

joomla · Nov 19, 2019 · daccdf6 · daccdf6
2 parents 388fe3f + cb00087
commit daccdf6
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 41 deletions.
diff --git a/administrator/components/com_config/tmpl/application/default.php b/administrator/components/com_config/tmpl/application/default.php
@@ -31,9 +31,9 @@
 	<div class="row">
 		<!-- Begin Sidebar -->
 		<div id="sidebar" class="col-md-3">
-			<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>">
+			<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>">
 				<span class="fas fa-align-justify" aria-hidden="true"></span>
-				<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>
+				<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>
 			</button>
 			<div class="sidebar-nav bg-light p-2 my-2">
 				<?php echo $this->loadTemplate('navigation'); ?>

diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php
@@ -44,9 +44,9 @@
 
 		<?php // Begin Sidebar ?>
 		<div class="col-md-3" id="sidebar">
-			<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>">
+			<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>">
 				 <span class="fas fa-align-justify" aria-hidden="true"></span>
-				 <?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>
+				 <?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>
 			</button>
 			<div class="sidebar-nav bg-light p-2 my-2">
 				<?php echo $this->loadTemplate('navigation'); ?>

diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
@@ -924,9 +924,10 @@ JSEARCH_FILTER="Search"
 JSEARCH_TITLE="Search %s"
 JSEARCH_RESET="Reset"
 
-JTOGGLE_SIDEBAR_LABEL="Sidebar"
 JTOGGLE_HIDE_SIDEBAR="Hide the sidebar"
 JTOGGLE_SHOW_SIDEBAR="Show the sidebar"
+JTOGGLE_SIDEBAR_LABEL="Sidebar"
+JTOGGLE_SIDEBAR_MENU="Toggle Menu"
 
 JTOOLBAR_APPLY="Save"
 JTOOLBAR_ARCHIVE="Archive"

diff --git a/administrator/language/en-GB/en-GB.tpl_atum.ini b/administrator/language/en-GB/en-GB.tpl_atum.ini
@@ -26,6 +26,5 @@ TPL_ATUM_LOGIN_SITE_TITLE="%s - Administrator Login"
 TPL_ATUM_SITENAME_LABEL="Site Name"
 TPL_ATUM_SITE_LOGO_LABEL="Site Logo"
 TPL_ATUM_SITE_LOGO_SMALL_LABEL="Small Site Logo"
-TPL_ATUM_TOGGLE_SIDEBAR="Toggle Menu"
 TPL_ATUM_TOOLBAR="Toolbar"
 TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the name of the Joomla 4 administrator template."
diff --git a/administrator/modules/mod_messages/mod_messages.php b/administrator/modules/mod_messages/mod_messages.php
@@ -11,4 +11,21 @@
 
 use Joomla\CMS\Helper\ModuleHelper;
 
+// Try to get the items from the messages model
+try
+{
+	$messagesModel = new \Joomla\Component\Messages\Administrator\Model\MessagesModel(['ignore_request' => true]);
+	$messagesModel->setState('filter.state', 0);
+	$messages      = $messagesModel->getItems();
+}
+catch (RuntimeException $e)
+{
+	$messages = [];
+
+	// Still render the error message from the Exception object
+	$app->enqueueMessage($e->getMessage(), 'error');
+}
+
+$countUnread = count($messages);
+
 require ModuleHelper::getLayoutPath('mod_messages', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_messages/tmpl/default.php b/administrator/modules/mod_messages/tmpl/default.php
@@ -26,7 +26,6 @@
 		<div class="tiny">
 			<?php echo Text::_('MOD_MESSAGES_PRIVATE_MESSAGES'); ?>
 		</div>
-		<?php $countUnread = $app->getSession()->get('messages.unread'); ?>
 		<?php if ($countUnread > 0) : ?>
 			<span class="badge badge-pill badge-danger"><?php echo $countUnread; ?></span>
 		<?php endif; ?>

diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -142,7 +142,7 @@
 				<div class="sidebar-toggle">
 					<a id="menu-collapse" href="#">
 						<span id="menu-collapse-icon" class="fa fa-toggle-off fa-fw" aria-hidden="true"></span>
-						<span class="sidebar-item-title"><?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?></span>
+						<span class="sidebar-item-title"><?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?></span>
 					</a>
 				</div>
 				<jdoc:include type="modules" name="menu" style="none" />

diff --git a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
@@ -107,6 +107,15 @@ window.customElements.define('joomla-field-fancy-select', class extends HTMLElem
 
     this.isDisconnected = false;
 
+    // Add placeholder option for multiple mode,
+    // Because it not supported as parameter by Choices for <select> https://github.com/jshjohnson/Choices#placeholder
+    if (this.select.multiple && this.placeholder) {
+      const option = document.createElement('option');
+      option.setAttribute('placeholder', '');
+      option.textContent = this.placeholder;
+      this.select.appendChild(option);
+    }
+
     // Init Choices
     this.choicesInstance = new Choices(this.select, {
       placeholderValue: this.placeholder,

diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
@@ -18,9 +18,9 @@
 <?php if ($displayData->displayMenu || $displayData->displayFilters) : ?>
 <div id="j-toggle-sidebar-wrapper">
 	<div id="sidebar" class="sidebar">
-		<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>">
+		<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>">
 			<span class="fas fa-align-justify" aria-hidden="true"></span>
-			<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>
+			<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>
 		</button>
 		<div class="sidebar-nav bg-light p-2 my-2">
 			<?php if ($displayData->displayMenu) : ?>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "@webcomponents/webcomponentsjs": "2.1.2",
     "awesomplete": "1.1.4",
     "bootstrap": "~4.3",
-    "choices.js": "^7.0.0",
+    "choices.js": "^9.0.0",
     "chosen-js": "1.6.2",
     "codemirror": "5.40.0",
     "cropperjs": "1.2.2",