Merge pull request joomla-projects#135 from kawshar/issue-129

Fixed issue joomla-projects#129, accessibility issue for add module to dashboard modal.
kawshar · Dec 9, 2019 · f7da1dc · f7da1dc
2 parents 9335e8f + 01075db
commit f7da1dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php
@@ -97,8 +97,8 @@
 		'class'		  => 'j-modal-gray',
 		'bodyHeight'  => 75,
 		'modalWidth'  => 85,
-		'footer'      => '<button type="button" class="button-cancel btn btn-sm btn-danger" data-dismiss aria-hidden="true"><span class="icon-cancel" aria-hidden="true"></span>'. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') .'</button>
-						<button type="button" class="button-save btn btn-sm btn-success hidden" data-target="#saveBtn" aria-hidden="true"><span class="icon-save" aria-hidden="true"></span>'. Text::_('JSAVE') .' </button>',
+		'footer'      => '<button type="button" class="button-cancel btn btn-sm btn-danger" aria-label="' . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '" data-dismiss><span class="icon-cancel" aria-hidden="true"></span>'. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') .'</button>
+						<button type="button" class="button-save btn btn-sm btn-success hidden" aria-label="' . Text::_('JSAVE') . '" data-target="#saveBtn"><span class="icon-save" aria-hidden="true"></span>'. Text::_('JSAVE') .' </button>',
 	)
 );
 ?>
diff --git a/administrator/components/com_modules/tmpl/select/default.php b/administrator/components/com_modules/tmpl/select/default.php
@@ -33,10 +33,10 @@
 ?>
 
 <div class="j-search-module-container mb-4">
-	<h2 class="mb-3"><?php echo Text::_('COM_MODULES_TYPE_CHOOSE'); ?></h2>
+	<h2 class="mb-3" id="j-search-module-label"><?php echo Text::_('COM_MODULES_TYPE_CHOOSE'); ?></h2>
 	<div class="input-group">
 		<span class="icon-search" aria-hidden="true" aria-label="Search"></span>
-		<input type="text" class="form-control" id="j-search-cpanel-module" autocomplete="off" placeholder="<?php echo Text::_('JSEARCH_MODULES'); ?>">
+		<input type="text" class="form-control" id="j-search-cpanel-module" autocomplete="off" aria-labelledby="j-search-module-label" placeholder="<?php echo Text::_('JSEARCH_MODULES'); ?>">
 	</div>
 </div>
 
@@ -62,7 +62,7 @@
 
 					<div class="j-card-footer">
 						<div class="j-card-footer-item">
-							<a href="<?php echo Route::_($link); ?>" class="<?php echo $function ? ' select-link" data-function="' . $this->escape($function) : ''; ?>">
+							<a href="<?php echo Route::_($link); ?>" <?php echo $function ? 'class=" select-link" data-function="' . $this->escape($function) . '"' : ''; ?> aria-label="<?php echo Text::sprintf('COM_MODULES_SELECT_MODULE', $item->name); ?>">
 								<?php echo Text::_('COM_MODULES_SELECT'); ?>
 							</a>
 						</div>

diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -179,6 +179,7 @@ COM_MODULES_CUSTOM_POSITION="Active Positions"
 COM_MODULES_TYPE_OR_SELECT_POSITION="Type or Select a Position"
 COM_MODULES_DESELECT="Deselect"
 COM_MODULES_SELECT="Select"
+COM_MODULES_SELECT_MODULE="Select module, %s"
 COM_MODULES_EXPAND="Expand"
 COM_MODULES_COLLAPSE="Collapse"
 COM_MODULES_SUBITEMS="Sub-items:"

diff --git a/build/media_source/system/js/joomla-modal.es6.js b/build/media_source/system/js/joomla-modal.es6.js
@@ -132,6 +132,7 @@
           }
           const newIframe = document.createElement('iframe');
           newIframe.width = '100%';
+          newIframe.title = this.getAttribute('title');
           newIframe.src = this.iframe;
           newIframe.setAttribute('frameborder', 0);
           newIframe.style.height = this.height;