Commit 7b952964 authored by Rebecca Blundell's avatar Rebecca Blundell Committed by Robert Lyon

Bug 1811904: Fontawesome - Name changes

new default for fontawesome is 'solid',
where we are using a different class (regular or brand),
we need to add these.

also confirming that where the icon name has changed, we've
picked that up.

Where there's a choice of icon, I've kept it as close to what we
currently have as possible.
All free icons can be seen here:
https://fontawesome.com/icons?d=gallery&m=free

Name changes:
icon-trash-alt      -> icon-trash
icon-pencil         -> icon-pencil-alt
icon-unlock-alt     -> icon-unlock
icon-files-o        -> icon-regular icon-copy
icon-pencil-square  -> icon-regular icon-edit
icon-file-text      -> icon-file-alt || icon-regular icon-file-alt
icon-image          -> icon-regular icon-image

behatnotneeded

Change-Id: I34646a6857f6cf54dc39572f5a66c07da4f4c0e2
parent 3b881010
...@@ -101,7 +101,7 @@ foreach ($iframesources as $url => $name) { ...@@ -101,7 +101,7 @@ foreach ($iframesources as $url => $name) {
'type' => 'button', 'type' => 'button',
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'usebuttontag' => true, 'usebuttontag' => true,
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash-alt 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'),
), ),
......
...@@ -115,7 +115,7 @@ jQuery(function($) { ...@@ -115,7 +115,7 @@ jQuery(function($) {
'title':{$getstring['delete']}, 'title':{$getstring['delete']},
'alt':{$getstring['deletespecific']}.replace('%s', item.name) 'alt':{$getstring['deletespecific']}.replace('%s', item.name)
}); });
del.append($('<span>', {'class':'icon icon-trash text-danger icon-lg', 'role':'presentation'})); del.append($('<span>', {'class':'icon icon-trash-alt text-danger icon-lg', 'role':'presentation'}));
del.append($('<span class="sr-only">' + {$getstring['deletespecific']}.replace('%s', item.name) + '</span>')); del.append($('<span class="sr-only">' + {$getstring['deletespecific']}.replace('%s', item.name) + '</span>'));
del.on('click', function (e) { e.preventDefault(); delitem(item.id); }); del.on('click', function (e) { e.preventDefault(); delitem(item.id); });
......
...@@ -87,10 +87,10 @@ jQuery(function($) { ...@@ -87,10 +87,10 @@ jQuery(function($) {
var type = eval(item.type); var type = eval(item.type);
var linkedto = $('<a>', {'href':item.linkedto, 'text': item.linktext}); var linkedto = $('<a>', {'href':item.linkedto, 'text': item.linktext});
var edit = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title':{$getstring['edit']}}) var edit = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title':{$getstring['edit']}})
.append($('<span>', {'class':'icon icon-lg icon-pencil', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['edit']}})); .append($('<span>', {'class':'icon icon-lg icon-pencil-alt', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['edit']}}));
edit.on('click', function () { edititem(item); }); edit.on('click', function () { edititem(item); });
var del = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title': {$getstring['delete']}}) var del = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title': {$getstring['delete']}})
.append($('<span>', {'class':'icon icon-lg icon-trash text-danger', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['delete']}})); .append($('<span>', {'class':'icon icon-lg icon-trash-alt text-danger', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['delete']}}));
del.on('click', function() { delitem(item.id); }); del.on('click', function() { delitem(item.id); });
var buttonGroup = $('<span>', {'class':'btn-group'}).append(edit, del); var buttonGroup = $('<span>', {'class':'btn-group'}).append(edit, del);
......
...@@ -95,7 +95,7 @@ function editsitepage_submit(Pieform $form, $values) { ...@@ -95,7 +95,7 @@ function editsitepage_submit(Pieform $form, $values) {
} }
$smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits'))); $smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
setpageicon($smarty, 'icon-pencil'); setpageicon($smarty, 'icon-pencil-alt');
$smarty->assign('pageeditform', $form); $smarty->assign('pageeditform', $form);
$smarty->display('admin/site/pages.tpl'); $smarty->display('admin/site/pages.tpl');
...@@ -62,7 +62,7 @@ $urlparams['institution'] = 'mahara'; ...@@ -62,7 +62,7 @@ $urlparams['institution'] = 'mahara';
$urlparamsstr = '&' . http_build_query($urlparams); $urlparamsstr = '&' . http_build_query($urlparams);
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-file-text'); setpageicon($smarty, 'icon-file-alt');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('views', $views); $smarty->assign('views', $views);
......
...@@ -760,7 +760,7 @@ $deleteform = pieform(array( ...@@ -760,7 +760,7 @@ $deleteform = pieform(array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary', 'class' => 'btn-secondary',
'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span><span>'. get_string('deleteuser', 'admin') . '</span>', 'value' => '<span class="icon icon-trash-alt 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'),
), ),
), ),
......
...@@ -1399,7 +1399,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType { ...@@ -1399,7 +1399,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash-alt 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',
......
...@@ -602,7 +602,7 @@ class ArtefactTypeBlog extends ArtefactType { ...@@ -602,7 +602,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" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>', 'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
), ),
'delete' => array( 'delete' => array(
'type' => 'hidden', 'type' => 'hidden',
...@@ -1254,7 +1254,7 @@ class ArtefactTypeBlogPost extends ArtefactType { ...@@ -1254,7 +1254,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
'class' => 'btn-secondary btn-sm last', 'class' => 'btn-secondary btn-sm last',
'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" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>', 'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
), ),
), ),
)); ));
......
...@@ -1037,7 +1037,7 @@ class ArtefactTypeComment extends ArtefactType { ...@@ -1037,7 +1037,7 @@ class ArtefactTypeComment extends ArtefactType {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash-alt 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',
), ),
......
...@@ -25,7 +25,7 @@ $form = pieform(ArtefactTypeFileBase::files_form(get_config('wwwroot') . 'artefa ...@@ -25,7 +25,7 @@ $form = pieform(ArtefactTypeFileBase::files_form(get_config('wwwroot') . 'artefa
$js = ArtefactTypeFileBase::files_js(); $js = ArtefactTypeFileBase::files_js();
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-file-image-o'); setpageicon($smarty, 'icon-regular icon-file-image');
$smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>')); $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>'));
$smarty->assign('institution', 'mahara'); $smarty->assign('institution', 'mahara');
......
...@@ -152,7 +152,7 @@ $smarty = smarty(array(), array(), array(), array( ...@@ -152,7 +152,7 @@ $smarty = smarty(array(), array(), array(), array(
image_filebrowser: "editnote_filebrowser", image_filebrowser: "editnote_filebrowser",
' '
)); ));
setpageicon($smarty, 'icon-pencil-square-o'); setpageicon($smarty, 'icon-regular icon-edit');
$smarty->assign('INLINEJAVASCRIPT', $javascript); $smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', $artefact->get('title')); $smarty->assign('PAGEHEADING', $artefact->get('title'));
......
...@@ -212,7 +212,7 @@ function deletenote_form($id, $notedata) { ...@@ -212,7 +212,7 @@ function deletenote_form($id, $notedata) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm last', 'class' => 'btn-secondary btn-sm last',
'elementtitle' => get_string('delete'), 'elementtitle' => get_string('delete'),
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> ', 'value' => '<span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
), ),
), ),
); );
......
...@@ -201,7 +201,7 @@ jQuery(function($) { ...@@ -201,7 +201,7 @@ jQuery(function($) {
});'; });';
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-pencil-square-o'); setpageicon($smarty, 'icon-regular icon-edit');
$smarty->assign('PAGEHEADING', $pageheading); $smarty->assign('PAGEHEADING', $pageheading);
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('data', $data); $smarty->assign('data', $data);
...@@ -227,7 +227,7 @@ function deletenote_form($id, $notedata) { ...@@ -227,7 +227,7 @@ function deletenote_form($id, $notedata) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm last', 'class' => 'btn-secondary btn-sm last',
'elementtitle' => get_string('delete'), 'elementtitle' => get_string('delete'),
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> ', 'value' => '<span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
), ),
), ),
); );
......
...@@ -804,7 +804,7 @@ class ArtefactTypePeerassessment extends ArtefactType { ...@@ -804,7 +804,7 @@ class ArtefactTypePeerassessment extends ArtefactType {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>',
'confirm' => get_string('reallydeletethisassessment', 'artefact.peerassessment'), 'confirm' => get_string('reallydeletethisassessment', 'artefact.peerassessment'),
'name' => 'delete_assessment_submit', 'name' => 'delete_assessment_submit',
), ),
......
...@@ -1138,12 +1138,12 @@ EOF; ...@@ -1138,12 +1138,12 @@ EOF;
var editlink = var editlink =
jQuery('<a>', {'href': 'editcomposite.php?id=' + row.id + '&artefact=' + row.artefact, jQuery('<a>', {'href': 'editcomposite.php?id=' + row.id + '&artefact=' + row.artefact,
'title': {$editstr}, 'class': 'btn btn-secondary btn-sm'}).append( 'title': {$editstr}, 'class': 'btn btn-secondary btn-sm'}).append(
jQuery('<span>',{'class': 'icon icon-pencil icon-lg', 'role':'presentation'}), jQuery('<span>',{'class': 'icon icon-pencil-alt icon-lg', 'role':'presentation'}),
jQuery('<span>',{'class': 'sr-only'}).append({$editjsstr}) jQuery('<span>',{'class': 'sr-only'}).append({$editjsstr})
); );
var dellink = var dellink =
jQuery('<a>', {'href': '', 'title': {$delstr}, 'class': 'btn btn-secondary btn-sm'}).append( jQuery('<a>', {'href': '', 'title': {$delstr}, 'class': 'btn btn-secondary btn-sm'}).append(
jQuery('<span>',{'class': 'icon icon-trash text-danger icon-lg','role':'presentation'}), jQuery('<span>',{'class': 'icon icon-trash-alt text-danger icon-lg','role':'presentation'}),
jQuery('<span>',{'class': 'sr-only'}).append({$deljsstr}) jQuery('<span>',{'class': 'sr-only'}).append({$deljsstr})
); );
dellink.on('click', function (e) { dellink.on('click', function (e) {
......
...@@ -51,7 +51,7 @@ if ($token) { ...@@ -51,7 +51,7 @@ if ($token) {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'), 'value' => '<span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
'elementtitle' => get_string('deletespecific', 'mahara', $token), 'elementtitle' => get_string('deletespecific', 'mahara', $token),
); );
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
} }
else { else {
// warning: classes are modified above for any subsequent button instances // warning: classes are modified above for any subsequent button instances
newrow.append('<button name="removerow" class="float-left btn btn-sm btn-secondary removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(\'' + pieformname + '\', this)"><span class="icon icon-lg icon-trash text-danger"></span><span class="d-none d-md-inline-block"> ' + get_string('removethisrow', 'view') + '</span></button>'); newrow.append('<button name="removerow" class="float-left btn btn-sm btn-secondary removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(\'' + pieformname + '\', this)"><span class="icon icon-lg icon-trash-alt text-danger"></span><span class="d-none d-md-inline-block"> ' + get_string('removethisrow', 'view') + '</span></button>');
} }
$('#customrow_' + numrows).after(newrow); $('#customrow_' + numrows).after(newrow);
$('#' + pieformname + '_customlayoutnumrows').val(numrows + 1); $('#' + pieformname + '_customlayoutnumrows').val(numrows + 1);
......
...@@ -1053,7 +1053,7 @@ ...@@ -1053,7 +1053,7 @@
blockinstanceId = blockinstance.attr('data-id'), blockinstanceId = blockinstance.attr('data-id'),
content = blockinstance.find('.js-blockinstance-content'), content = blockinstance.find('.js-blockinstance-content'),
oldContent = content.html(), oldContent = content.html(),
loading = $('<span>').attr('class', 'icon icon-spinner icon-spin block-loading'), loading = $('<span>').attr('class', 'icon icon-spinner icon-pulse block-loading'),
pd = {'id': $('#viewid').val(), 'change': 1}; pd = {'id': $('#viewid').val(), 'change': 1};
......
...@@ -99,7 +99,7 @@ function pieform_element_calendar(Pieform $form, $element) { ...@@ -99,7 +99,7 @@ function pieform_element_calendar(Pieform $form, $element) {
previous: "icon icon-chevron-left", previous: "icon icon-chevron-left",
next: "icon icon-chevron-right", next: "icon icon-chevron-right",
close: "icon icon-times", close: "icon icon-times",
clear: "icon icon-trash", clear: "icon icon-trash-alt",
today: "icon icon-crosshairs", today: "icon icon-crosshairs",
}, },
}); });
......
...@@ -2867,7 +2867,7 @@ function mahara_standard_nav() { ...@@ -2867,7 +2867,7 @@ function mahara_standard_nav() {
'url' => null, 'url' => null,
'title' => get_string('share'), 'title' => get_string('share'),
'weight' => 30, 'weight' => 30,
'iconclass' => 'unlock-alt', 'iconclass' => 'unlock',
), ),
'engage' => array( 'engage' => array(
'path' => 'engage', 'path' => 'engage',
......
...@@ -196,7 +196,7 @@ if ($frameworks) { ...@@ -196,7 +196,7 @@ if ($frameworks) {
'type' => 'button', 'type' => 'button',
'class' => 'btn-secondary btn-sm button', 'class' => 'btn-secondary btn-sm button',
'usebuttontag' => true, 'usebuttontag' => true,
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash-alt 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'),
), ),
'framework' => array( 'framework' => array(
......
...@@ -171,7 +171,7 @@ else { ...@@ -171,7 +171,7 @@ else {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'), 'value' => '<span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
'elementtitle' => get_string('deletespecific', 'mahara', $service->clientname), 'elementtitle' => get_string('deletespecific', 'mahara', $service->clientname),
), ),
), ),
......
...@@ -241,7 +241,7 @@ $form = pieform(array( ...@@ -241,7 +241,7 @@ $form = pieform(array(
)); ));
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-pencil-square-o'); setpageicon($smarty, 'icon-regular icon-edit');
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('user', $USER); $smarty->assign('user', $USER);
$smarty->assign('messages', $messages); $smarty->assign('messages', $messages);
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="btn-group btn-group-top comment-item-buttons"> <div class="btn-group btn-group-top comment-item-buttons">
{if $item->canedit} {if $item->canedit}
<a href="{$WWWROOT}artefact/annotation/edit.php?id={$item->id}&amp;viewid={$viewid}" class="btn btn-secondary btn-sm"> <a href="{$WWWROOT}artefact/annotation/edit.php?id={$item->id}&amp;viewid={$viewid}" class="btn btn-secondary btn-sm">
<span class="icon icon-lg icon-pencil text-default" role="presentation" aria-hidden="true"></span> <span class="icon icon-lg icon-pencil-alt text-default" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=edit}</span> <span class="sr-only">{str tag=edit}</span>
</a> </a>
{/if} {/if}
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<span class="text-small">{str tag=submittedforassessment section=view}</span> <span class="text-small">{str tag=submittedforassessment section=view}</span>
{else} {else}
<a href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->id}" title="{str(tag=settingsspecific arg1=$blog->title)|escape:html|safe}" class="btn btn-secondary btn-sm btn-group-item"> <a href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->id}" title="{str(tag=settingsspecific arg1=$blog->title)|escape:html|safe}" class="btn btn-secondary btn-sm btn-group-item">
<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=editspecific arg1=$blog->title}</span> <span class="sr-only">{str tag=editspecific arg1=$blog->title}</span>
</a> </a>
{$blog->deleteform|safe} {$blog->deleteform|safe}
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<input type="hidden" name="id" value="{$post->id}"> <input type="hidden" name="id" value="{$post->id}">
<div class="first"> <div class="first">
<button type="submit" class="submit btn btn-secondary btn-sm" title="{str(tag=edit)|escape:html|safe}"> <button type="submit" class="submit btn btn-secondary btn-sm" title="{str(tag=edit)|escape:html|safe}">
<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=editspecific arg1=$post->title |escape:html|safe}</span> <span class="sr-only">{str tag=editspecific arg1=$post->title |escape:html|safe}</span>
</button> </button>
</div> </div>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
{if !$onview} {if !$onview}
{if $item->canedit} {if $item->canedit}
<a href="{$WWWROOT}artefact/comment/edit.php?id={$item->id}&amp;view={$viewid}" class="btn btn-secondary btn-group-item form-as-button float-left"> <a href="{$WWWROOT}artefact/comment/edit.php?id={$item->id}&amp;view={$viewid}" class="btn btn-secondary btn-group-item form-as-button float-left">
<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=edit}</span> <span class="sr-only">{str tag=edit}</span>
</a> </a>
{/if} {/if}
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
{elseif !$file->isparent} {elseif !$file->isparent}
{if !isset($file->can_edit) || $file->can_edit !== 0} {if !isset($file->can_edit) || $file->can_edit !== 0}
<button name="{$prefix}_edit[{$file->id}]" class="btn btn-secondary btn-sm editable" title="{str tag=edit}"> <button name="{$prefix}_edit[{$file->id}]" class="btn btn-secondary btn-sm editable" title="{str tag=edit}">
<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
{if $file->artefacttype == 'folder'} {if $file->artefacttype == 'folder'}
<span class="sr-only">{str tag=editfolderspecific section=artefact.file arg1=$displaytitle|escape:html|safe}</span> <span class="sr-only">{str tag=editfolderspecific section=artefact.file arg1=$displaytitle|escape:html|safe}</span>
{else} {else}
...@@ -158,12 +158,12 @@ ...@@ -158,12 +158,12 @@
{/if} {/if}
<button name="{$prefix}_edit[{$file->id}]" class="btn btn-secondary btn-sm"> <button name="{$prefix}_edit[{$file->id}]" class="btn btn-secondary btn-sm">
<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{$edittext|escape:html|safe}</span> <span class="sr-only">{$edittext|escape:html|safe}</span>
</button> </button>
<button name="{$prefix}_delete[{$file->id}]" class="btn btn-secondary btn-sm"> <button name="{$prefix}_delete[{$file->id}]" class="btn btn-secondary btn-sm">
<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{$deletetext|escape:html|safe}</span> <span class="sr-only">{$deletetext|escape:html|safe}</span>
</button> </button>
</div> </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
{str tag="setdefault" section=artefact.file} {str tag="setdefault" section=artefact.file}
</button> </button>
<button id="settings_delete" type="submit" class="delete btn btn-secondary" name="delete"> <button id="settings_delete" type="submit" class="delete btn btn-secondary" name="delete">
<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span> <span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>
{str tag="deleteselectedicons" section=artefact.file} {str tag="deleteselectedicons" section=artefact.file}
</button> </button>
</td> </td>
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
{else} {else}
<div class="btn-group"> <div class="btn-group">
<a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}" class="btn btn-secondary btn-sm"> <a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}" class="btn btn-secondary btn-sm">
<span class="icon icon-lg icon-pencil" role="presentation" aria-hidden="true"></span> <span class="icon icon-lg icon-pencil-alt" role="presentation" aria-hidden="true"></span>
<span class="sr-only"> <span class="sr-only">
{str(tag=editspecific arg1=$n->title)|escape:html|safe} {str(tag=editspecific arg1=$n->title)|escape:html|safe}
</span> </span>
......
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<td class="control-buttons"> <td class="control-buttons">
<div class="btn-group"> <div class="btn-group">
<a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}" title="{str tag='edit'}" class="btn btn-secondary btn-sm"> <a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}" title="{str tag='edit'}" class="btn btn-secondary btn-sm">
<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag='edit'}</span> <span class="sr-only">{str tag='edit'}</span>
</a> </a>
{if $candelete} {if $candelete}
<a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}&delete=1" title="{str tag='delete'}" class="btn btn-secondary btn-sm"> <a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}&delete=1" title="{str tag='delete'}" class="btn btn-secondary btn-sm">
<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag='delete'}</span> <span class="sr-only">{str tag='delete'}</span>
</a> </a>
{/if} {/if}
......