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

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

behatnotneeded

Change-Id: I39faf88ac8932891a704868f5282a5794ae1387d
parent 5a7040ae
......@@ -102,7 +102,7 @@ foreach ($iframesources as $url => $name) {
'type' => 'button',
'class' => 'btn-default btn-sm',
'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'),
),
......
......@@ -149,12 +149,12 @@ $failurestring = json_encode(get_string('upgradefailure', 'admin'));
$javascript = <<<JAVASCRIPT
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) {
if (!data.error) {
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 = '';
jQuery($(name)).removeClass('list-group-item-danger').addClass('list-group-item-success');
// move the whole thing into the list of installed plugins
......@@ -174,7 +174,7 @@ function installplugin(name) {
else {
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 () {
......
......@@ -105,7 +105,7 @@ $networkingform = pieform(
'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button',
'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'
)
)
......
......@@ -145,18 +145,18 @@ $js = <<< EOJS
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) {
if ( !data.error ) {
var message;
if (data.coredata) {
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) {
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) {
if (data.install) {
......@@ -171,15 +171,15 @@ $js = <<< EOJS
}
}
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) {
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 {
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) {
var feedback_element = DIV();
......@@ -196,11 +196,11 @@ $js = <<< EOJS
else {
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 () {
$(element).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + {$failurestring};
$(element).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation" aria-hidden="true"></span>' + {$failurestring};
},
true);
}
......
......@@ -177,7 +177,7 @@ $deleteform = pieform(array(
'usebuttontag' => true,
'class' => 'btn-default',
'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(
'type' => 'button',
'usebuttontag' => true,
'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'),
),
),
......
......@@ -1073,7 +1073,7 @@ if ($institution && $institution != 'mahara') {
'type' => 'button',
'usebuttontag' => true,
'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') {
'type' => 'button',
'usebuttontag' => true,
'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'),
),
)
......
......@@ -1168,7 +1168,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'usebuttontag' => true,
'class' => 'btn-link btn-xs quiet',
'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 {
'type' => 'button',
'usebuttontag' => true,
'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'),
'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
'name' => 'delete_annotation_feedback_submit',
......
......@@ -552,7 +552,7 @@ class ArtefactTypeBlog extends ArtefactType {
'alt' => get_string('deletespecific', 'mahara', $title),
'elementtitle' => get_string('delete'),
'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(
'type' => 'hidden',
......@@ -1124,10 +1124,10 @@ class ArtefactTypeBlogPost extends ArtefactType {
$published = $post->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 {
$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(
'name' => 'changepoststatus_' . $id,
......@@ -1174,7 +1174,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
'class' => 'btn-default btn-sm',
'elementtitle' => get_string('delete'),
'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) {
removeElementClass($('posttitle_' + data.id), 'draft');
addElementClass($('posttitle_' + data.id), 'published');
$('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 {
removeElementClass($('posttitle_' + data.id), 'published');
addElementClass($('posttitle_' + data.id), 'draft');
$('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) {
......
......@@ -988,7 +988,7 @@ class ArtefactTypeComment extends ArtefactType {
'usebuttontag' => true,
'class' => 'btn-link btn-xs',
'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 {
'type' => 'button',
'usebuttontag' => true,
'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'),
'name' => 'delete_comment_submit',
),
......
......@@ -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 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 .= '<script type="application/javascript">
flowplayer("'.$id.'", "'.$playerurl.'", {
......
......@@ -219,7 +219,7 @@ function deletenote_form($id, $notedata) {
'usebuttontag' => true,
'class' => 'btn-default btn-xs last',
'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 {
'type' => 'button',
'usebuttontag' => true,
'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(
'type' => 'hidden',
......
......@@ -140,7 +140,7 @@ if ($views) {
'usebuttontag' => true,
'class' => 'btn-link btn-sm',
'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) {
'usebuttontag' => true,
'class' => 'btn-link btn-sm',
'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)
'class' => 'btn-primary pull-right add-pages',
'type' => 'button',
'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,
);
......
......@@ -54,7 +54,7 @@ $elements['submit'] = array(
'type' => 'button',
'usebuttontag' => true,
'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(
'name' => 'filter',
......
......@@ -72,7 +72,7 @@ if ($forums) {
'usebuttontag' => true,
'class' => 'btn-default btn-sm',
'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
),
'forum' => array(
......
......@@ -80,7 +80,7 @@ if ($membership && !$topic->forumsubscribed) {
'type' => 'button',
'usebuttontag' => true,
'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
),
'topic' => array(
......
......@@ -182,7 +182,7 @@ if ($membership) {
'type' => 'button',
'usebuttontag' => true,
'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
),
'forum' => array(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment