Commit 4ac89c31 authored by Liam Sharpe's avatar Liam Sharpe Committed by Robert Lyon

Bug 1484781: Added aria-hidden=true to all icons

behatnotneeded

Change-Id: I39faf88ac8932891a704868f5282a5794ae1387d
parent 5a7040ae
...@@ -102,7 +102,7 @@ foreach ($iframesources as $url => $name) { ...@@ -102,7 +102,7 @@ foreach ($iframesources as $url => $name) {
'type' => 'button', 'type' => 'button',
'class' => 'btn-default btn-sm', 'class' => 'btn-default btn-sm',
'usebuttontag' => true, 'usebuttontag' => true,
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></span><span class="sr-only">'. get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('delete') . '</span>',
'confirm' => get_string('confirmdeletemenuitem', 'admin'), 'confirm' => get_string('confirmdeletemenuitem', 'admin'),
), ),
......
...@@ -149,12 +149,12 @@ $failurestring = json_encode(get_string('upgradefailure', 'admin')); ...@@ -149,12 +149,12 @@ $failurestring = json_encode(get_string('upgradefailure', 'admin'));
$javascript = <<<JAVASCRIPT $javascript = <<<JAVASCRIPT
function installplugin(name) { function installplugin(name) {
$(name + '.message').innerHTML = '<span class="{$loadingicon}" title=' + {$loadingstring} + '" role="presentation"></span>'; $(name + '.message').innerHTML = '<span class="{$loadingicon}" title=' + {$loadingstring} + '" role="presentation" aria-hidden="true"></span>';
sendjsonrequest('../upgrade.json.php', { 'name': name }, 'GET', function (data) { sendjsonrequest('../upgrade.json.php', { 'name': name }, 'GET', function (data) {
if (!data.error) { if (!data.error) {
var message = {$successstring} + data.newversion; var message = {$successstring} + data.newversion;
$(name + '.message').innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></span>' + message; $(name + '.message').innerHTML = '<span class="{$successicon}" title=":)" role="presentation" aria-hidden="true"></span>' + message;
$(name + '.install').innerHTML = ''; $(name + '.install').innerHTML = '';
jQuery($(name)).removeClass('list-group-item-danger').addClass('list-group-item-success'); jQuery($(name)).removeClass('list-group-item-danger').addClass('list-group-item-success');
// move the whole thing into the list of installed plugins // move the whole thing into the list of installed plugins
...@@ -174,7 +174,7 @@ function installplugin(name) { ...@@ -174,7 +174,7 @@ function installplugin(name) {
else { else {
message = {$failurestring}; message = {$failurestring};
} }
$(name).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + message; $(name).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation" aria-hidden="true"></span>' + message;
} }
}, },
function () { function () {
......
...@@ -105,7 +105,7 @@ $networkingform = pieform( ...@@ -105,7 +105,7 @@ $networkingform = pieform(
'name' => 'submit', // must be called submit so we can access it's value 'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'content' => '<span class="icon icon-refresh icon-lg left text-danger" role="presentation"></span> '. get_string('deletekey', 'admin'), 'content' => '<span class="icon icon-refresh icon-lg left text-danger" role="presentation" aria-hidden="true"></span> '. get_string('deletekey', 'admin'),
'value' => 'deletekey' 'value' => 'deletekey'
) )
) )
......
...@@ -145,18 +145,18 @@ $js = <<< EOJS ...@@ -145,18 +145,18 @@ $js = <<< EOJS
return; // done return; // done
} }
$(element).innerHTML = '<span class="{$loadingicon}" title="' + {$loadingstring} + '" role="presentation"></span>'; $(element).innerHTML = '<span class="{$loadingicon}" title="' + {$loadingstring} + '" role="presentation" aria-hidden="true"></span>';
sendjsonrequest('upgrade.json.php', { 'name': element, 'last': todo.length == 0 }, 'GET', function (data) { sendjsonrequest('upgrade.json.php', { 'name': element, 'last': todo.length == 0 }, 'GET', function (data) {
if ( !data.error ) { if ( !data.error ) {
var message; var message;
if (data.coredata) { if (data.coredata) {
message = {$coresuccess}; message = {$coresuccess};
$(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></span>' + message; $(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation" aria-hidden="true"></span>' + message;
} }
else if (data.localdata) { else if (data.localdata) {
message = {$localsuccess}; message = {$localsuccess};
$(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></span>' + message; $(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation" aria-hidden="true"></span>' + message;
} }
else if (data.install || data.upgrade) { else if (data.install || data.upgrade) {
if (data.install) { if (data.install) {
...@@ -171,15 +171,15 @@ $js = <<< EOJS ...@@ -171,15 +171,15 @@ $js = <<< EOJS
} }
} }
message += data.newversion ? data.newversion : ''; message += data.newversion ? data.newversion : '';
$(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></span>' + message; $(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation" aria-hidden="true"></span>' + message;
} }
else if (data.done) { else if (data.done) {
message = data.message; message = data.message;
$(data.key).innerHTML = '<span class="{$warningicon}" title=":|" role="presentation"></span> ' + message; $(data.key).innerHTML = '<span class="{$warningicon}" title=":|" role="presentation" aria-hidden="true"></span> ' + message;
} }
else { else {
message = data.message; message = data.message;
$(data.key).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + message; $(data.key).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation" aria-hidden="true"></span>' + message;
} }
if (data.feedback) { if (data.feedback) {
var feedback_element = DIV(); var feedback_element = DIV();
...@@ -196,11 +196,11 @@ $js = <<< EOJS ...@@ -196,11 +196,11 @@ $js = <<< EOJS
else { else {
message = {$failurestring}; message = {$failurestring};
} }
$(data.key).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + message; $(data.key).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation" aria-hidden="true"></span>' + message;
} }
}, },
function () { function () {
$(element).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + {$failurestring}; $(element).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation" aria-hidden="true"></span>' + {$failurestring};
}, },
true); true);
} }
......
...@@ -177,7 +177,7 @@ $deleteform = pieform(array( ...@@ -177,7 +177,7 @@ $deleteform = pieform(array(
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'confirm' => get_string('confirmdeleteusers', 'admin'), 'confirm' => get_string('confirmdeleteusers', 'admin'),
'value' => '<span class="icon icon-lg icon-user-times left text-danger" role="presentation"></span>' . get_string('deleteusers', 'admin'), 'value' => '<span class="icon icon-lg icon-user-times left text-danger" role="presentation" aria-hidden="true"></span>' . get_string('deleteusers', 'admin'),
), ),
), ),
)); ));
......
...@@ -679,7 +679,7 @@ $deleteform = pieform(array( ...@@ -679,7 +679,7 @@ $deleteform = pieform(array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation"></span><span>'. get_string('deleteuser', 'admin') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span><span>'. get_string('deleteuser', 'admin') . '</span>',
'confirm' => get_string('confirmdeleteuser', 'admin'), 'confirm' => get_string('confirmdeleteuser', 'admin'),
), ),
), ),
......
...@@ -1073,7 +1073,7 @@ if ($institution && $institution != 'mahara') { ...@@ -1073,7 +1073,7 @@ if ($institution && $institution != 'mahara') {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-lg text-danger icon-ban left" role="presentation"></span>' . get_string('suspendinstitution','admin'), 'value' => '<span class="icon icon-lg text-danger icon-ban left" role="presentation" aria-hidden="true"></span>' . get_string('suspendinstitution','admin'),
), ),
) )
); );
...@@ -1095,7 +1095,7 @@ if ($institution && $institution != 'mahara') { ...@@ -1095,7 +1095,7 @@ if ($institution && $institution != 'mahara') {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-lg text-success icon-check left" role="presentation"></span>' . get_string('unsuspendinstitution','admin'), 'value' => '<span class="icon icon-lg text-success icon-check left" role="presentation" aria-hidden="true"></span>' . get_string('unsuspendinstitution','admin'),
'description' => get_string('unsuspendinstitutiondescription','admin'), 'description' => get_string('unsuspendinstitutiondescription','admin'),
), ),
) )
......
...@@ -1168,7 +1168,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType { ...@@ -1168,7 +1168,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-link btn-xs quiet', 'class' => 'btn-link btn-xs quiet',
'name' => 'make_annotation_feedback_public_submit', 'name' => 'make_annotation_feedback_public_submit',
'value' => '<span class="icon icon-lock text-default left" role="presentation"></span>' . get_string('makepublic', 'artefact.annotation'), 'value' => '<span class="icon icon-lock text-default left" role="presentation" aria-hidden="true"></span>' . get_string('makepublic', 'artefact.annotation'),
), ),
), ),
); );
...@@ -1196,7 +1196,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType { ...@@ -1196,7 +1196,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-trash text-danger" role="presentation"></span><span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
'elementtitle' => get_string('delete'), 'elementtitle' => get_string('delete'),
'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'), 'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
'name' => 'delete_annotation_feedback_submit', 'name' => 'delete_annotation_feedback_submit',
......
...@@ -552,7 +552,7 @@ class ArtefactTypeBlog extends ArtefactType { ...@@ -552,7 +552,7 @@ class ArtefactTypeBlog extends ArtefactType {
'alt' => get_string('deletespecific', 'mahara', $title), 'alt' => get_string('deletespecific', 'mahara', $title),
'elementtitle' => get_string('delete'), 'elementtitle' => get_string('delete'),
'confirm' => $confirm, 'confirm' => $confirm,
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></span><span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
), ),
'delete' => array( 'delete' => array(
'type' => 'hidden', 'type' => 'hidden',
...@@ -1124,10 +1124,10 @@ class ArtefactTypeBlogPost extends ArtefactType { ...@@ -1124,10 +1124,10 @@ class ArtefactTypeBlogPost extends ArtefactType {
$published = $post->published; $published = $post->published;
} }
if ($published) { if ($published) {
$strchangepoststatus = '<span class="icon icon-times icon-lg left text-danger" role="presentation"></span> ' .get_string('unpublish', 'artefact.blog'); $strchangepoststatus = '<span class="icon icon-times icon-lg left text-danger" role="presentation" aria-hidden="true"></span> ' .get_string('unpublish', 'artefact.blog');
} }
else { else {
$strchangepoststatus = '<span class="icon icon-check icon-lg left text-success" role="presentation"></span> ' . get_string('publish', 'artefact.blog'); $strchangepoststatus = '<span class="icon icon-check icon-lg left text-success" role="presentation" aria-hidden="true"></span> ' . get_string('publish', 'artefact.blog');
} }
return pieform(array( return pieform(array(
'name' => 'changepoststatus_' . $id, 'name' => 'changepoststatus_' . $id,
...@@ -1174,7 +1174,7 @@ class ArtefactTypeBlogPost extends ArtefactType { ...@@ -1174,7 +1174,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
'class' => 'btn-default btn-sm', 'class' => 'btn-default btn-sm',
'elementtitle' => get_string('delete'), 'elementtitle' => get_string('delete'),
'confirm' => get_string('deleteblogpost?', 'artefact.blog'), 'confirm' => get_string('deleteblogpost?', 'artefact.blog'),
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></span><span class="sr-only">' .get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' .get_string('delete') . '</span>',
), ),
), ),
)); ));
......
...@@ -161,13 +161,13 @@ function changepoststatus_success(form, data) { ...@@ -161,13 +161,13 @@ function changepoststatus_success(form, data) {
removeElementClass($('posttitle_' + data.id), 'draft'); removeElementClass($('posttitle_' + data.id), 'draft');
addElementClass($('posttitle_' + data.id), 'published'); addElementClass($('posttitle_' + data.id), 'published');
$('poststatus' + data.id).innerHTML = {$strpublished}; $('poststatus' + data.id).innerHTML = {$strpublished};
$('changepoststatus_' + data.id + '_submit').innerHTML = '<span class="icon icon-times icon-lg left text-danger" role="presentation"></span> ' + {$strchangepoststatusunpublish}; $('changepoststatus_' + data.id + '_submit').innerHTML = '<span class="icon icon-times icon-lg left text-danger" role="presentation" aria-hidden="true"></span> ' + {$strchangepoststatusunpublish};
} }
else { else {
removeElementClass($('posttitle_' + data.id), 'published'); removeElementClass($('posttitle_' + data.id), 'published');
addElementClass($('posttitle_' + data.id), 'draft'); addElementClass($('posttitle_' + data.id), 'draft');
$('poststatus' + data.id).innerHTML = {$strdraft}; $('poststatus' + data.id).innerHTML = {$strdraft};
$('changepoststatus_' + data.id + '_submit').innerHTML = '<span class="icon icon-check icon-lg left text-success" role="presentation"></span>' + {$strchangepoststatuspublish}; $('changepoststatus_' + data.id + '_submit').innerHTML = '<span class="icon icon-check icon-lg left text-success" role="presentation" aria-hidden="true"></span>' + {$strchangepoststatuspublish};
} }
} }
function delete_success(form, data) { function delete_success(form, data) {
......
...@@ -988,7 +988,7 @@ class ArtefactTypeComment extends ArtefactType { ...@@ -988,7 +988,7 @@ class ArtefactTypeComment extends ArtefactType {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-link btn-xs', 'class' => 'btn-link btn-xs',
'name' => 'make_public_submit', 'name' => 'make_public_submit',
'value' => '<span class="icon icon-lock text-default left" role="presentation"></span>' . get_string('makepublic', 'artefact.comment'), 'value' => '<span class="icon icon-lock text-default left" role="presentation" aria-hidden="true"></span>' . get_string('makepublic', 'artefact.comment'),
), ),
), ),
); );
...@@ -1006,7 +1006,7 @@ class ArtefactTypeComment extends ArtefactType { ...@@ -1006,7 +1006,7 @@ class ArtefactTypeComment extends ArtefactType {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default btn-sm', 'class' => 'btn-default btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></span> <span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>',
'confirm' => get_string('reallydeletethiscomment', 'artefact.comment'), 'confirm' => get_string('reallydeletethiscomment', 'artefact.comment'),
'name' => 'delete_comment_submit', 'name' => 'delete_comment_submit',
), ),
......
...@@ -336,7 +336,7 @@ class PluginBlocktypeInternalmedia extends MaharaCoreBlocktype { ...@@ -336,7 +336,7 @@ class PluginBlocktypeInternalmedia extends MaharaCoreBlocktype {
$html = '<span class="blocktype_internalmedia_mp3" id="' . $id . '" style="display:block;width:'.$width.'px;height:'.$height.'px;"></span>'; $html = '<span class="blocktype_internalmedia_mp3" id="' . $id . '" style="display:block;width:'.$width.'px;height:'.$height.'px;"></span>';
$html .= '<span id="' . $id . '_h">' . get_string('flashanimation', 'blocktype.file/internalmedia') . '</span>'; $html .= '<span id="' . $id . '_h">' . get_string('flashanimation', 'blocktype.file/internalmedia') . '</span>';
$html .= '<div class="media-download content-text"><span class="icon icon-download left" role="presentation"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>'; $html .= '<div class="media-download content-text"><span class="icon icon-download left" role="presentation" aria-hidden="true"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
$html .= '<span class="text-midtone text-small"> ['.$filesize.'] </span></div>'; $html .= '<span class="text-midtone text-small"> ['.$filesize.'] </span></div>';
$html .= '<script type="application/javascript"> $html .= '<script type="application/javascript">
flowplayer("'.$id.'", "'.$playerurl.'", { flowplayer("'.$id.'", "'.$playerurl.'", {
......
...@@ -219,7 +219,7 @@ function deletenote_form($id, $notedata) { ...@@ -219,7 +219,7 @@ function deletenote_form($id, $notedata) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default btn-xs last', 'class' => 'btn-default btn-xs last',
'elementtitle' => get_string('delete'), 'elementtitle' => get_string('delete'),
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation"></span> ', 'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
), ),
), ),
); );
......
...@@ -115,7 +115,7 @@ class PluginBlocktypeMyfriends extends MaharaCoreBlocktype { ...@@ -115,7 +115,7 @@ class PluginBlocktypeMyfriends extends MaharaCoreBlocktype {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-user-plus icon-lg left" role="presentation"></span>' .get_string('addtomyfriends', 'group') 'value' => '<span class="icon icon-user-plus icon-lg left" role="presentation" aria-hidden="true"></span>' .get_string('addtomyfriends', 'group')
), ),
'id' => array( 'id' => array(
'type' => 'hidden', 'type' => 'hidden',
......
...@@ -140,7 +140,7 @@ if ($views) { ...@@ -140,7 +140,7 @@ if ($views) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-link btn-sm', 'class' => 'btn-link btn-sm',
'confirm' => get_string('viewconfirmremove', 'collection'), 'confirm' => get_string('viewconfirmremove', 'collection'),
'value' => '<span class="icon icon-times icon-lg text-danger" role="presentation"><span class="sr-only">' . get_string('remove') . '</span></span>' ), 'value' => '<span class="icon icon-times icon-lg text-danger" role="presentation" aria-hidden="true"><span class="sr-only">' . get_string('remove') . '</span></span>' ),
), ),
)); ));
} }
......
...@@ -110,7 +110,7 @@ if ($views) { ...@@ -110,7 +110,7 @@ if ($views) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-link btn-sm', 'class' => 'btn-link btn-sm',
'confirm' => get_string('viewconfirmremove', 'collection'), 'confirm' => get_string('viewconfirmremove', 'collection'),
'value' => '<span class="icon icon-times icon-lg text-danger" role="presentation"><span class="sr-only">' . get_string('remove') . '</span></span>', 'value' => '<span class="icon icon-times icon-lg text-danger" role="presentation" aria-hidden="true"><span class="sr-only">' . get_string('remove') . '</span></span>',
), ),
), ),
)); ));
...@@ -141,7 +141,7 @@ if ($available = Collection::available_views($owner, $groupid, $institutionname) ...@@ -141,7 +141,7 @@ if ($available = Collection::available_views($owner, $groupid, $institutionname)
'class' => 'btn-primary pull-right add-pages', 'class' => 'btn-primary pull-right add-pages',
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'value' => '<span class="icon icon-arrow-right left" role="presentation"></span>' . get_string('addviews','collection'), 'value' => '<span class="icon icon-arrow-right left" role="presentation" aria-hidden="true"></span>' . get_string('addviews','collection'),
'goto' => get_config('wwwroot') . 'collection/views.php?id='.$id, 'goto' => get_config('wwwroot') . 'collection/views.php?id='.$id,
); );
......
...@@ -54,7 +54,7 @@ $elements['submit'] = array( ...@@ -54,7 +54,7 @@ $elements['submit'] = array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-primary input-group-btn', 'class' => 'btn-primary input-group-btn',
'value' => '<span class="icon icon-filter left" role="presentation"></span> ' . get_string('filter'), 'value' => '<span class="icon icon-filter left" role="presentation" aria-hidden="true"></span> ' . get_string('filter'),
); );
$form = pieform(array( $form = pieform(array(
'name' => 'filter', 'name' => 'filter',
......
...@@ -72,7 +72,7 @@ if ($forums) { ...@@ -72,7 +72,7 @@ if ($forums) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default btn-sm', 'class' => 'btn-default btn-sm',
'renderelementsonly' => true, 'renderelementsonly' => true,
'value' => $forum->subscribed ? '<span class="icon icon-lg icon-times left text-danger" role="presentation"></span> ' . get_string('Unsubscribe', 'interaction.forum') : '<span class="icon icon-lg icon-star left" role="presentation"></span> ' . get_string('Subscribe', 'interaction.forum'), 'value' => $forum->subscribed ? '<span class="icon icon-lg icon-times left text-danger" role="presentation" aria-hidden="true"></span> ' . get_string('Unsubscribe', 'interaction.forum') : '<span class="icon icon-lg icon-star left" role="presentation" aria-hidden="true"></span> ' . get_string('Subscribe', 'interaction.forum'),
'help' => false 'help' => false
), ),
'forum' => array( 'forum' => array(
......
...@@ -80,7 +80,7 @@ if ($membership && !$topic->forumsubscribed) { ...@@ -80,7 +80,7 @@ if ($membership && !$topic->forumsubscribed) {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => $topic->topicsubscribed ? '<span class="icon icon-times icon-lg text-danger left" role="presentation"></span>'. get_string('unsubscribefromtopic', 'interaction.forum') : '<span class="icon icon-star icon-lg left" role="presentation"></span>' . get_string('subscribetotopic', 'interaction.forum'), 'value' => $topic->topicsubscribed ? '<span class="icon icon-times icon-lg text-danger left" role="presentation" aria-hidden="true"></span>'. get_string('unsubscribefromtopic', 'interaction.forum') : '<span class="icon icon-star icon-lg left" role="presentation" aria-hidden="true"></span>' . get_string('subscribetotopic', 'interaction.forum'),
'help' => false 'help' => false
), ),
'topic' => array( 'topic' => array(
......
...@@ -182,7 +182,7 @@ if ($membership) { ...@@ -182,7 +182,7 @@ if ($membership) {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => $forum->subscribed ? '<span class="icon icon-lg icon-times left text-danger" role="presentation"></span> ' . get_string('unsubscribefromforum', 'interaction.forum') : '<span class="icon icon-lg icon-star left" role="presentation"></span> ' . get_string('subscribetoforum', 'interaction.forum'), 'value' => $forum->subscribed ? '<span class="icon icon-lg icon-times left text-danger" role="presentation" aria-hidden="true"></span> ' . get_string('unsubscribefromforum', 'interaction.forum') : '<span class="icon icon-lg icon-star left" role="presentation" aria-hidden="true"></span> ' . get_string('subscribetoforum', 'interaction.forum'),
'help' => false 'help' => false
), ),
'forum' => array( 'forum' => array(
......
...@@ -22,3 +22,4 @@ Changes: ...@@ -22,3 +22,4 @@ Changes:
* Keep focus position when loading more elements with infinite scrolling * Keep focus position when loading more elements with infinite scrolling
* Add label to "Remove tag" button * Add label to "Remove tag" button
* Make "Remove tag" button work with the keyboard * Make "Remove tag" button work with the keyboard
* Adding the 'aria-hidden="true"' to presentation icons
\ No newline at end of file
...@@ -1445,8 +1445,8 @@ S2.define('select2/selection/single',[ ...@@ -1445,8 +1445,8 @@ S2.define('select2/selection/single',[
$selection.html( $selection.html(
'<span class="select2-selection__rendered"></span>' + '<span class="select2-selection__rendered"></span>' +
'<span class="select2-selection__arrow" role="presentation">' + '<span class="select2-selection__arrow" role="presentation" aria-hidden="true">' +
'<b role="presentation"></b>' + '<b role="presentation" aria-hidden="true"></b>' +
'</span>' '</span>'
); );
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1429,8 +1429,8 @@ S2.define('select2/selection/single',[ ...@@ -1429,8 +1429,8 @@ S2.define('select2/selection/single',[
$selection.html( $selection.html(
'<span class="select2-selection__rendered"></span>' + '<span class="select2-selection__rendered"></span>' +
'<span class="select2-selection__arrow" role="presentation">' + '<span class="select2-selection__arrow" role="presentation" aria-hidden="true">' +
'<b role="presentation"></b>' + '<b role="presentation" aria-hidden="true"></b>' +
'</span>' '</span>'
); );
...@@ -1566,7 +1566,7 @@ S2.define('select2/selection/multiple',[ ...@@ -1566,7 +1566,7 @@ S2.define('select2/selection/multiple',[
MultipleSelection.prototype.selectionContainer = function () { MultipleSelection.prototype.selectionContainer = function () {
var $container = $( var $container = $(
'<li class="select2-selection__choice">' + '<li class="select2-selection__choice">' +
'<span class="select2-selection__choice__remove" role="presentation">' + '<span class="select2-selection__choice__remove" role="presentation" aria-hidden="true">' +
'&times;' + '&times;' +
'</span>' + '</span>' +
'</li>' '</li>'
......
This diff is collapsed.
...@@ -14,3 +14,4 @@ Changes: ...@@ -14,3 +14,4 @@ Changes:
* Removed all .less files from skin * Removed all .less files from skin
* Added code to spellchecker/spellchecker.rpc to use $CFG->spellcheckerengine * Added code to spellchecker/spellchecker.rpc to use $CFG->spellcheckerengine
* Adjusted the charmap plugin to contain Māori macrons * Adjusted the charmap plugin to contain Māori macrons
* Adding the 'aria-hidden="true"' to presentation icons
\ No newline at end of file
...@@ -295,7 +295,7 @@ tinymce.PluginManager.add('charmap', function(editor) { ...@@ -295,7 +295,7 @@ tinymce.PluginManager.add('charmap', function(editor) {
} }
} }
gridHtml = '<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>'; gridHtml = '<table role="presentation" aria-hidden="true" cellspacing="0" class="mce-charmap"><tbody>';
var width = 25; var width = 25;
var height = Math.ceil(charmap.length / width); var height = Math.ceil(charmap.length / width);
......
...@@ -31,7 +31,7 @@ tinymce.PluginManager.add('emoticons', function(editor, url) { ...@@ -31,7 +31,7 @@ tinymce.PluginManager.add('emoticons', function(editor, url) {
emoticonsHtml += '<td><a href="#" data-mce-url="' + emoticonUrl + '" data-mce-alt="' + icon + '" tabindex="-1" ' + emoticonsHtml += '<td><a href="#" data-mce-url="' + emoticonUrl + '" data-mce-alt="' + icon + '" tabindex="-1" ' +
'role="option" aria-label="' + icon + '"><img src="' + 'role="option" aria-label="' + icon + '"><img src="' +
emoticonUrl + '" style="width: 18px; height: 18px" role="presentation" /></a></td>'; emoticonUrl + '" style="width: 18px; height: 18px" role="presentation" aria-hidden="true" /></a></td>';
}); });
emoticonsHtml += '</tr>'; emoticonsHtml += '</tr>';
......
...@@ -6,5 +6,5 @@ Version: 1.1 ...@@ -6,5 +6,5 @@ Version: 1.1
Changes: Changes:
* Adjusting the config.json options for uppercase Greek letters * Adjusting the config.json options for uppercase Greek letters
* Adding the 'aria-hidden="true"' to presentation icons
...@@ -59,19 +59,19 @@ NS.MathJaxEditor = function(id) { ...@@ -59,19 +59,19 @@ NS.MathJaxEditor = function(id) {
//Place buttons for internal editor functions //Place buttons for internal editor functions
/* /*
var undo = Y.Node.create('<button type="button" class="' var undo = Y.Node.create('<button type="button" class="'
+ CSS.UNDO + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" width="16" height="16" src="' + CSS.UNDO + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" aria-hidden="true" width="16" height="16" src="'
+ M.util.image_url('undo', 'editor_tinymce') + M.util.image_url('undo', 'editor_tinymce')
+ '" title="' + M.util.get_string('undo', 'tinymce_mathslate') + '"/></button>'); + '" title="' + M.util.get_string('undo', 'tinymce_mathslate') + '"/></button>');
var redo = Y.Node.create('<button type="button" class="' var redo = Y.Node.create('<button type="button" class="'
+ CSS.REDO + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" width="16" height="16" src="' + CSS.REDO + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" aria-hidden="true" width="16" height="16" src="'
+ M.util.image_url('redo', 'editor_tinymce') + '" title="' + M.util.image_url('redo', 'editor_tinymce') + '" title="'
+ M.util.get_string('redo', 'tinymce_mathslate') + '"/></button>'); + M.util.get_string('redo', 'tinymce_mathslate') + '"/></button>');
var clear = Y.Node.create('<button type="button" class="' var clear = Y.Node.create('<button type="button" class="'
+ CSS.CLEAR + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" width="16" height="16" src="' + CSS.CLEAR + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" aria-hidden="true" width="16" height="16" src="'
+ M.util.image_url('delete', 'editor_tinymce') + '" title="' + M.util.image_url('delete', 'editor_tinymce') + '" title="'
+ M.util.get_string('clear', 'tinymce_mathslate') + '"/></button>'); + M.util.get_string('clear', 'tinymce_mathslate') + '"/></button>');
var help = Y.Node.create('<button type="button" class="' var help = Y.Node.create('<button type="button" class="'
+ CSS.HELP + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" width="16" height="16" src="' + CSS.HELP + '">' + '<img class="iiicon" aria-hidden="true" role="presentation" aria-hidden="true" width="16" height="16" src="'
+ M.util.image_url('help', 'core') + '" title="' + M.util.image_url('help', 'core') + '" title="'
+ M.util.get_string('help', 'tinymce_mathslate') + '"/></button>'); + M.util.get_string('help', 'tinymce_mathslate') + '"/></button>');
*/ */
......