Commit 106c0612 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 eb6455cf
......@@ -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"></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'),
),
......
......@@ -149,12 +149,12 @@ $failurestring = json_encode(get_string('upgradefailure', 'admin'));
$javascript = <<<JAVASCRIPT
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) {
if (!data.error) {
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 = '';
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=":("></span>' + message;
$(name).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + message;
}
},
function () {
......
......@@ -91,7 +91,7 @@ function formatrow (item) {
'type':'button',
'title':{$getstring['edit']},
'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))
);
......@@ -104,7 +104,7 @@ function formatrow (item) {
'type':'button',
'title':{$getstring['delete']},
'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))
);
......
......@@ -73,9 +73,9 @@ function formatrow (item) {
// item has id, type, name, link, linkedto
var type = eval(item.type);
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); });
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); });
var buttonGroup = SPAN({'class':'btn-group'}, edit, del);
var cells = map(
......@@ -107,7 +107,7 @@ function editform(item) {
// Either a save, a cancel button, or both.
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); });
// The link field will be a text box or a select in the case of an admin file.
......
......@@ -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"></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'
)
)
......
......@@ -148,18 +148,18 @@ $js = <<< EOJS
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) {
if ( !data.error ) {
var message;
if (data.coredata) {
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) {
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) {
if (data.install) {
......@@ -174,15 +174,15 @@ $js = <<< EOJS
}
}
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) {
message = data.message;
$(data.key).innerHTML = '<span class="{$warningicon}" title=":|"></span> ' + message;
$(data.key).innerHTML = '<span class="{$warningicon}" title=":|" role="presentation"></span> ' + message;
}
else {
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) {
var feedback_element = DIV();
......@@ -199,11 +199,11 @@ $js = <<< EOJS
else {
message = {$failurestring};
}
$(data.key).innerHTML = '<span class="{$failureicon}" title=":("></span>' + message;
$(data.key).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></span>' + message;
}
},
function () {
$(element).innerHTML = '<span class="{$failureicon}" title=":(" ></span>' + {$failurestring};
$(element).innerHTML = '<span class="{$failureicon}" title=":(" role="presentation"></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"></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(
'type' => 'button',
'usebuttontag' => true,
'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'),
),
),
......
......@@ -1080,7 +1080,7 @@ if ($institution && $institution != 'mahara') {
'type' => 'button',
'usebuttontag' => true,
'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'),
),
)
);
......@@ -1102,7 +1102,7 @@ if ($institution && $institution != 'mahara') {
'type' => 'button',
'usebuttontag' => true,
'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'),
),
)
......
......@@ -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"></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 {
'type' => 'button',
'usebuttontag' => true,
'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'),
'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
'name' => 'delete_annotation_feedback_submit',
......
......@@ -541,7 +541,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"></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(
'type' => 'hidden',
......@@ -1113,10 +1113,10 @@ class ArtefactTypeBlogPost extends ArtefactType {
$published = $post->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 {
$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(
'name' => 'changepoststatus_' . $id,
......@@ -1163,7 +1163,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"></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>',
),
),
));
......
......@@ -166,13 +166,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"></span> ' + {$strchangepoststatusunpublish};
$('changepoststatus_' + data.id + '_submit').innerHTML = '<span class="icon icon-times icon-lg left text-danger" role="presentation"></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"></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) {
......
......@@ -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"></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 {
'type' => 'button',
'usebuttontag' => true,
'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'),
'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"></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 .= '<script type="application/javascript">
flowplayer("'.$id.'", "'.$playerurl.'", {
......
......@@ -361,7 +361,7 @@ EOF;
'type' => 'html',
'class' => 'hidden text-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),
'license' => license_form_el_basic(isset($artefact) ? $artefact : null),
......
......@@ -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"></span> ',
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation"></span> ',
),
),
);
......
......@@ -1098,7 +1098,7 @@ EOF;
if (r._rownumber > 1) {
var up =
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}'));
connect(up, 'onclick', function (e) {
e.stop();
......@@ -1109,7 +1109,7 @@ EOF;
if (!r._last) {
var down =
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}'));
connect(down, 'onclick', function (e) {
e.stop();
......@@ -1128,11 +1128,11 @@ EOF;
function (r, d) {
var editlink =
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}));
var dellink =
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}));
connect(dellink, 'onclick', function (e) {
e.stop();
......
......@@ -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"></span>' .get_string('addtomyfriends', 'group')
'value' => '<span class="icon icon-user-plus icon-lg left" role="presentation"></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"><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) {
'usebuttontag' => true,
'class' => 'btn-link btn-sm',
'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)
'class' => 'btn-primary pull-right add-pages',
'type' => 'button',
'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,
);
......
......@@ -54,7 +54,7 @@ $elements['submit'] = array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-primary input-group-btn',
'value' => '<span class="icon icon-filter left"></span> ' . get_string('filter'),
'value' => '<span class="icon icon-filter left" role="presentation"></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"></span> ' . get_string('Unsubscribe', 'interaction.forum') : '<span class="icon icon-lg icon-star left"></span> ' . get_string('Subscribe', 'interaction.forum'),
'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'),
'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"></span>'. get_string('unsubscribefromtopic', 'interaction.forum') : '<span class="icon icon-star icon-lg left"></span>' . get_string('subscribetotopic', 'interaction.forum'),
'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'),
'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"></span> ' . get_string('unsubscribefromforum', 'interaction.forum') : '<span class="icon icon-lg icon-star left"></span> ' . get_string('subscribetoforum', 'interaction.forum'),
'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'),
'help' => false
),
'forum' => array(
......
......@@ -3,11 +3,11 @@
<h3>Show controls to add and remove columns when editing a page</h3>
<p>You can choose to display a row with the buttons
<span class="btn btn-primary btn-xs text-left" title="Add column">
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm"></span>
<span class="icon-plus icon icon-sm"></span>
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm" role="presentation"></span>
<span class="icon-plus icon icon-sm" role="presentation"></span>
</span> and
<span title="Remove this column" class="text-center btn btn-default btn-xs">
<span class="icon-times-circle icon icon-sm"></span>
<span class="icon-times-circle icon icon-sm" role="presentation"></span>
</span>
in the page editor. These buttons add and remove columns from that page when you click on them.</p>
<p>Even if not enabled, you can change the number of columns for your page in the page layout section.</p>
......@@ -3,11 +3,11 @@
<h3>Show controls to add and remove columns when editing a page</h3>
<p>You can choose to display a row with the buttons
<span class="btn btn-primary btn-xs text-left" title="Add column">
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm"></span>
<span class="icon-plus icon icon-sm"></span>
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm" role="presentation"></span>
<span class="icon-plus icon icon-sm" role="presentation"></span>
</span> and
<span title="Remove this column" class="text-center btn btn-default btn-xs">
<span class="icon-times-circle icon icon-sm"></span>
<span class="icon-times-circle icon icon-sm" role="presentation"></span>
</span>
in the page editor. These buttons add and remove columns from that page.</p>
<p>Even if not enabled, you can change the number of columns for your page in the page layout section.</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Show controls to add and remove columns when editing a page</h3>
<p>The users can choose to display a row with the buttons <span class="btn btn-primary btn-xs text-left" title="Add column">
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm"></span>
<span class="icon-plus icon icon-sm"></span>
<p>The users can choose to display a row with the buttons
<span class="btn btn-primary btn-xs text-left" title="Add column">
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm" role="presentation"></span>
<span class="icon-plus icon icon-sm" role="presentation"></span>
</span> and
<span title="Remove this column" class="text-center btn btn-default btn-xs">
<span class="icon-times-circle icon icon-sm"></span>
<span class="icon-times-circle icon icon-sm" role="presentation"></span>
</span> in the page editor. These buttons add and remove columns from that page when you click on them.</p>
<p>Even if not enabled, the users can change the number of columns in their page in the page layout section.</p>
......@@ -1096,7 +1096,7 @@ function group_get_join_form($name, $groupid, $returnto='view') {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-lg icon-plus left"></span> ' . get_string('joingroup', 'group')
'value' => '<span class="icon icon-lg icon-plus left" role="presentation"></span> ' . get_string('joingroup', 'group')
)
)
),
......@@ -1129,13 +1129,13 @@ function group_get_accept_form($name, $groupid, $returnto) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default form-as-button pull-left',
'value' => '<span class="icon icon-lg icon-check text-success left"></span> ' . get_string('acceptinvitegroup', 'group')
'value' => '<span class="icon icon-lg icon-check text-success left" role="presentation"></span> ' . get_string('acceptinvitegroup', 'group')
),
'decline' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default form-as-button pull-left',
'value' => '<span class="icon icon-lg icon-ban text-danger left"></span> ' . get_string('declineinvitegroup', 'group')
'value' => '<span class="icon icon-lg icon-ban text-danger left" role="presentation"></span> ' . get_string('declineinvitegroup', 'group')
)
),
),
......@@ -1173,7 +1173,7 @@ function group_get_adduser_form($userid, $groupid) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-lg icon-check left text-success"></span> ' .get_string('add'),
'value' => '<span class="icon icon-lg icon-check left text-success" role="presentation"></span> ' .get_string('add'),
),
),
));
......@@ -1203,7 +1203,7 @@ function group_get_removeuser_form($userid, $groupid) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-times icon-lg text-danger left"></span>' . get_string('removefromgroup', 'group'),
'value' => '<span class="icon icon-times icon-lg text-danger left" role="presentation"></span>' . get_string('removefromgroup', 'group'),
),
),
));
......@@ -1232,7 +1232,7 @@ function group_get_denyuser_form($userid, $groupid) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-ban icon-lg text-danger left"></span>' . get_string('declinerequest', 'group'),
'value' => '<span class="icon icon-ban icon-lg text-danger left" role="presentation"></span>' . get_string('declinerequest', 'group'),
),
),
));
......
......@@ -155,7 +155,7 @@ function notrude_form() {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-lg icon-times text-danger left"></span> '.get_string('notobjectionable'),
'value' => '<span class="icon icon-lg icon-times text-danger left" role="presentation"></span> '.get_string('notobjectionable'),
),
),
);
......
......@@ -285,12 +285,12 @@ function pieform_element_calendar_get_headdata($element) {
*/
function add_prev_next_year(inst) {
var widgetHeader = jQuery("#ui-datepicker-div").find(".ui-datepicker-header");
var prevYrBtn = jQuery('<a class="ui-datepicker-prev-year ui-corner-all" title="$prev"><span class="ui-icon ui-icon-circle-triangle-wy">$prev</span></a>');
var prevYrBtn = jQuery('<a class="ui-datepicker-prev-year ui-corner-all" title="$prev"><span class="ui-icon ui-icon-circle-triangle-wy" role="presentation">$prev</span></a>');
prevYrBtn.unbind("click").bind("click", function() {
jQuery.datepicker._adjustDate(inst.input, -1, "Y");
}).hover(function() { \$j(this).addClass('ui-datepicker-prev-year-hover ui-state-hover')},
function() { \$j(this).removeClass('ui-datepicker-prev-year-hover ui-state-hover')});
var nextYrBtn = jQuery('<a class="ui-datepicker-next-year ui-corner-all" title="$next"><span class="ui-icon ui-icon-circle-triangle-ey">$next</span></a>');
var nextYrBtn = jQuery('<a class="ui-datepicker-next-year ui-corner-all" title="$next"><span class="ui-icon ui-icon-circle-triangle-ey" role="presentation">$next</span></a>');
nextYrBtn.unbind("click").bind("click", function() {
jQuery.datepicker._adjustDate(inst.input, +1, "Y");
}).hover(function() { \$j(this).addClass('ui-datepicker-next-year-hover ui-state-hover')},
......
......@@ -71,10 +71,10 @@ function pieform_element_fieldset(Pieform $form, $element) {
$legendcontent = '<a href="#' . $openparam . '" data-toggle="collapse" aria-expanded="'.$ariaexpanded.'" aria-controls="' . $openparam . '" class="'.$triggerclass.'">';
if (!empty($element['iconclass'])){
$legendcontent .= '<span class="icon-fieldset icon icon-'.$element['iconclass'].'"> </span>';
$legendcontent .= '<span class="icon-fieldset icon icon-'.$element['iconclass'].'" role="presentation"> </span>';
}
$legendcontent .= Pieform::hsc($element['legend']);
$legendcontent .= '<span class="icon icon-chevron-down collapse-indicator right pull-right"> </span> ';
$legendcontent .= '<span class="icon icon-chevron-down collapse-indicator right pull-right" role="presentation"> </span> ';
$legendcontent .= '</a>';
}
......
......@@ -2257,7 +2257,7 @@ function addfriend_form($friendid) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default last',
'value' => '<span class="icon icon-user-plus icon-lg left"></span>' . get_string('addtofriendslist', 'group'),
'value' => '<span class="icon icon-user-plus icon-lg left" role="presentation"></span>' . get_string('addtofriendslist', 'group'),
),
'id' => array(
'type' => 'hidden',
......
......@@ -6305,7 +6305,7 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-plus icon-lg left"></span>' . get_string('createview', 'view'),
'value' => '<span class="icon icon-plus icon-lg left" role="presentation"></span>' . get_string('createview', 'view'),
),
'submitcollection' => array(
'type' => 'hidden',
......@@ -6348,7 +6348,7 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
'type' => 'hidden',
'value' => $template,
);
$form['elements']['submit']['value'] = '<span class="icon icon-lg icon-files-o"></span><span class="sr-only">' . get_string('copyview', 'view') . '</span>';
$form['elements']['submit']['value'] = '<span class="icon icon-lg icon-files-o" role="presentation"></span><span class="sr-only">' . get_string('copyview', 'view') . '</span>';
$form['elements']['submit']['class'] = 'btn-default';
$form['name'] .= $template;
}
......
......@@ -2172,7 +2172,7 @@ function get_help_icon($plugintype, $pluginname, $form, $element, $page='', $sec
json_encode($pluginname) . ',' . json_encode($page) . ',' .
json_encode($section)
. ',this); return false;'
) . '"><span class="icon icon-info-circle"></span><span class="sr-only">'. $content . '</span></a></span>';
) . '"><span class="icon icon-info-circle" role="presentation"></span><span class="sr-only">'. $content . '</span></a></span>';
}
function pieform_get_help(Pieform $form, $element) {
......
......@@ -58,7 +58,7 @@ $form = pieform(array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-primary input-group-btn',
'value' => '<span class="icon icon-filter left"></span>' . get_string('filter'),
'value' => '<span class="icon icon-filter left" role="presentation"></span>' . get_string('filter'),
),
),
),
......
......@@ -12,20 +12,20 @@
{if $USERMASQUERADING}
<div class="site-message alert alert-warning" role="alert">
<span class="icon icon-lg icon-exclamation-triangle left"></span>
<span class="icon icon-lg icon-exclamation-triangle left" role="presentation"></span>
<span>{$masqueradedetails}</span>
<a href="{$becomeyoulink}">{$becomeyouagain}</a>
</div>
{/if}
{if !$PRODUCTIONMODE}
<div class="site-message alert alert-info" role="alert">
<span class="icon icon-lg icon-info-circle left"></span>
<span class="icon icon-lg icon-info-circle left" role="presentation"></span>
{str tag=notproductionsite section=error}
</div>
{/if}
{if $SITECLOSED}
<div class="site-message alert alert-danger" role="alert">
<span class="icon icon-lg icon-lock left"></span>
<span class="icon icon-lg icon-lock left" role="presentation"></span>
{if $SITECLOSED == 'logindisabled'}{str tag=siteclosedlogindisabled section=mahara arg1="`$WWWROOT`admin/upgrade.php"}{else}{str tag=siteclosed}{/if}
</div>
{/if}
......@@ -42,14 +42,14 @@
<!-- Brand and toggle get grouped for better mobile display -->
<button type="button" class="menu-toggle navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-main">
<span class="sr-only">{str tag="show"} {str tag="menu"}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>