Commit 5a7040ae authored by Liam Sharpe's avatar Liam Sharpe Committed by Robert Lyon

Added role=presentation to all icons - Bug #1484781

behatnotneeded

Change-Id: I536f7d4ab8bd96d653e0ae3bba635437f0d2c17c
parent 264e72e0
...@@ -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"></span><span class="sr-only">'. get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></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} + '"></span>'; $(name + '.message').innerHTML = '<span class="{$loadingicon}" title=' + {$loadingstring} + '" role="presentation"></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=":)"></span>' + message; $(name + '.message').innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></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=":("></span>' + message; $(name).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + message;
} }
}, },
function () { function () {
......
...@@ -91,7 +91,7 @@ function formatrow (item) { ...@@ -91,7 +91,7 @@ function formatrow (item) {
'type':'button', 'type':'button',
'title':{$getstring['edit']}, 'title':{$getstring['edit']},
'alt':{$getstring['editspecific']}.replace('%s', item.name)}, 'alt':{$getstring['editspecific']}.replace('%s', item.name)},
SPAN({'class':'icon icon-cog icon-lg'}), SPAN({'class':'icon icon-cog icon-lg', 'role':'presentation'}),
SPAN({'class':'sr-only'}, {$getstring['editspecific']}.replace('%s', item.name)) SPAN({'class':'sr-only'}, {$getstring['editspecific']}.replace('%s', item.name))
); );
...@@ -104,7 +104,7 @@ function formatrow (item) { ...@@ -104,7 +104,7 @@ function formatrow (item) {
'type':'button', 'type':'button',
'title':{$getstring['delete']}, 'title':{$getstring['delete']},
'alt':{$getstring['deletespecific']}.replace('%s', item.name)}, 'alt':{$getstring['deletespecific']}.replace('%s', item.name)},
SPAN({'class':'icon icon-trash text-danger icon-lg'}), SPAN({'class':'icon icon-trash text-danger icon-lg','role':'presentation'}),
SPAN({'class':'sr-only'}, {$getstring['deletespecific']}.replace('%s', item.name)) SPAN({'class':'sr-only'}, {$getstring['deletespecific']}.replace('%s', item.name))
); );
......
...@@ -73,9 +73,9 @@ function formatrow (item) { ...@@ -73,9 +73,9 @@ function formatrow (item) {
// item has id, type, name, link, linkedto // item has id, type, name, link, linkedto
var type = eval(item.type); var type = eval(item.type);
var linkedto = A({'href':item.linkedto},item.linktext); var linkedto = A({'href':item.linkedto},item.linktext);
var edit = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-pencil left'}), {$getstring['edit']}); var edit = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-pencil left', 'role':'presentation'}), {$getstring['edit']});
connect(edit, 'onclick', function () { edititem(item); }); connect(edit, 'onclick', function () { edititem(item); });
var del = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-times text-danger left'}), {$getstring['delete']}); var del = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-times text-danger left', 'role':'presentation'}), {$getstring['delete']});
connect(del, 'onclick', function () { delitem(item.id); }); connect(del, 'onclick', function () { delitem(item.id); });
var buttonGroup = SPAN({'class':'btn-group'}, edit, del); var buttonGroup = SPAN({'class':'btn-group'}, edit, del);
var cells = map( var cells = map(
...@@ -107,7 +107,7 @@ function editform(item) { ...@@ -107,7 +107,7 @@ function editform(item) {
// Either a save, a cancel button, or both. // Either a save, a cancel button, or both.
var savecancel = []; var savecancel = [];
var save = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-plus-circle icon-lg'})); var save = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-plus-circle icon-lg', 'role':'presentation'}));
connect(save, 'onclick', function () { saveitem(item.id); }); connect(save, 'onclick', function () { saveitem(item.id); });
// The link field will be a text box or a select in the case of an admin file. // The link field will be a text box or a select in the case of an admin file.
......
...@@ -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"></span> '. get_string('deletekey', 'admin'), 'content' => '<span class="icon icon-refresh icon-lg left text-danger" role="presentation"></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} + '"></span>'; $(element).innerHTML = '<span class="{$loadingicon}" title="' + {$loadingstring} + '" role="presentation"></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=":)"></span>' + message; $(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></span>' + message;
} }
else if (data.localdata) { else if (data.localdata) {
message = {$localsuccess}; message = {$localsuccess};
$(data.key).innerHTML = '<span class="{$successicon}" title=":)"></span>' + message; $(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></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=":)"></span>' + message; $(data.key).innerHTML = '<span class="{$successicon}" title=":)" role="presentation"></span>' + message;
} }
else if (data.done) { else if (data.done) {
message = data.message; message = data.message;
$(data.key).innerHTML = '<span class="{$warningicon}" title=":|"></span> ' + message; $(data.key).innerHTML = '<span class="{$warningicon}" title=":|" role="presentation"></span> ' + message;
} }
else { else {
message = data.message; message = data.message;
$(data.key).innerHTML = '<span class="{$failureicon}" title=":("></span>' + message; $(data.key).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></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=":("></span>' + message; $(data.key).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + message;
} }
}, },
function () { function () {
$(element).innerHTML = '<span class="{$failureicon}" title=":(" ></span>' + {$failurestring}; $(element).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></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"></span>' . get_string('deleteusers', 'admin'), 'value' => '<span class="icon icon-lg icon-user-times left text-danger" role="presentation"></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"></span><span>'. get_string('deleteuser', 'admin') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation"></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"></span>' . get_string('suspendinstitution','admin'), 'value' => '<span class="icon icon-lg text-danger icon-ban left" role="presentation"></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"></span>' . get_string('unsuspendinstitution','admin'), 'value' => '<span class="icon icon-lg text-success icon-check left" role="presentation"></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"></span>' . get_string('makepublic', 'artefact.annotation'), 'value' => '<span class="icon icon-lock text-default left" role="presentation"></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"></span><span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash text-danger" role="presentation"></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"></span><span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></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"></span> ' .get_string('unpublish', 'artefact.blog'); $strchangepoststatus = '<span class="icon icon-times icon-lg left text-danger" role="presentation"></span> ' .get_string('unpublish', 'artefact.blog');
} }
else { else {
$strchangepoststatus = '<span class="icon icon-check icon-lg left text-success"></span> ' . get_string('publish', 'artefact.blog'); $strchangepoststatus = '<span class="icon icon-check icon-lg left text-success" role="presentation"></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"></span><span class="sr-only">' .get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></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"></span> ' + {$strchangepoststatusunpublish}; $('changepoststatus_' + data.id + '_submit').innerHTML = '<span class="icon icon-times icon-lg left text-danger" role="presentation"></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"></span>' + {$strchangepoststatuspublish}; $('changepoststatus_' + data.id + '_submit').innerHTML = '<span class="icon icon-check icon-lg left text-success" role="presentation"></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"></span>' . get_string('makepublic', 'artefact.comment'), 'value' => '<span class="icon icon-lock text-default left" role="presentation"></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"></span> <span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation"></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"></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"></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.'", {
......
...@@ -361,7 +361,7 @@ EOF; ...@@ -361,7 +361,7 @@ EOF;
'type' => 'html', 'type' => 'html',
'class' => 'hidden text-right', 'class' => 'hidden text-right',
'value' => '<a href="' . $manageurl . '" target="_blank" class="pull-right">' 'value' => '<a href="' . $manageurl . '" target="_blank" class="pull-right">'
. get_string('managealltextboxcontent1', 'blocktype.internal/textbox') . ' <span class="icon icon-arrow-right right"></span></a>', . get_string('managealltextboxcontent1', 'blocktype.internal/textbox') . ' <span class="icon icon-arrow-right right" role="presentation"></span></a>',
), ),
'artefactid' => self::artefactchooser_element(isset($artefactid) ? $artefactid : null), 'artefactid' => self::artefactchooser_element(isset($artefactid) ? $artefactid : null),
'license' => license_form_el_basic(isset($artefact) ? $artefact : null), 'license' => license_form_el_basic(isset($artefact) ? $artefact : null),
......
...@@ -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"></span> ', 'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation"></span> ',
), ),
), ),
); );
......
...@@ -1098,7 +1098,7 @@ EOF; ...@@ -1098,7 +1098,7 @@ EOF;
if (r._rownumber > 1) { if (r._rownumber > 1) {
var up = var up =
A({'href': '', 'class': 'moveup'}, A({'href': '', 'class': 'moveup'},
SPAN({'class': 'icon icon-long-arrow-up'}), SPAN({'class': 'icon icon-long-arrow-up','role':'presentation'}),
SPAN({'class': 'sr-only'}, '{$upstr}')); SPAN({'class': 'sr-only'}, '{$upstr}'));
connect(up, 'onclick', function (e) { connect(up, 'onclick', function (e) {
e.stop(); e.stop();
...@@ -1109,7 +1109,7 @@ EOF; ...@@ -1109,7 +1109,7 @@ EOF;
if (!r._last) { if (!r._last) {
var down = var down =
A({'href': '', 'class':'movedown'}, A({'href': '', 'class':'movedown'},
SPAN({'class': 'icon icon-long-arrow-down'}), SPAN({'class': 'icon icon-long-arrow-down', 'role':'presentation'}),
SPAN({'class': 'sr-only'}, '{$downstr}')); SPAN({'class': 'sr-only'}, '{$downstr}'));
connect(down, 'onclick', function (e) { connect(down, 'onclick', function (e) {
e.stop(); e.stop();
...@@ -1128,11 +1128,11 @@ EOF; ...@@ -1128,11 +1128,11 @@ EOF;
function (r, d) { function (r, d) {
var editlink = var editlink =
A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': {$editstr}, 'class': 'btn btn-default btn-xs'}, A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': {$editstr}, 'class': 'btn btn-default btn-xs'},
SPAN({'class': 'icon icon-pencil icon-lg'}), SPAN({'class': 'icon icon-pencil icon-lg', 'role':'presentation'}),
SPAN({'class': 'sr-only'}, {$editstr})); SPAN({'class': 'sr-only'}, {$editstr}));
var dellink = var dellink =
A({'href': '', 'title': {$delstr}, 'class': 'btn btn-default btn-xs'}, A({'href': '', 'title': {$delstr}, 'class': 'btn btn-default btn-xs'},
SPAN({'class': 'icon icon-trash text-danger icon-lg'}), SPAN({'class': 'icon icon-trash text-danger icon-lg','role':'presentation'}),
SPAN({'class': 'sr-only'}, {$deljsstr})); SPAN({'class': 'sr-only'}, {$deljsstr}));
connect(dellink, 'onclick', function (e) { connect(dellink, 'onclick', function (e) {
e.stop(); e.stop();
......
...@@ -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"></span>' .get_string('addtomyfriends', 'group') 'value' => '<span class="icon icon-user-plus icon-lg left" role="presentation"></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"><span class="sr-only">' . get_string('remove') . '</span></span>' ), 'value' => '<span class="icon icon-times icon-lg text-danger" role="presentation"><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"><span class="sr-only">' . get_string('remove') . '</span></span>', 'value' => '<span class="icon icon-times icon-lg text-danger" role="presentation"><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"></span>' . get_string('addviews','collection'), 'value' => '<span class="icon icon-arrow-right left" role="presentation"></span>' . get_string('addviews','collection'),
'goto' => get_config('wwwroot') . 'collection/views.php?id='.$id, 'goto' => get_config('wwwroot') . 'collection/views.php?id='.$id,
); );