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) {
'type' => 'button',
'class' => 'btn-secondary btn-sm',
'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'),
),
......
......@@ -115,7 +115,7 @@ jQuery(function($) {
'title':{$getstring['delete']},
'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.on('click', function (e) { e.preventDefault(); delitem(item.id); });
......
......@@ -87,10 +87,10 @@ jQuery(function($) {
var type = eval(item.type);
var linkedto = $('<a>', {'href':item.linkedto, 'text': item.linktext});
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); });
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); });
var buttonGroup = $('<span>', {'class':'btn-group'}).append(edit, del);
......
......@@ -95,7 +95,7 @@ function editsitepage_submit(Pieform $form, $values) {
}
$smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
setpageicon($smarty, 'icon-pencil');
setpageicon($smarty, 'icon-pencil-alt');
$smarty->assign('pageeditform', $form);
$smarty->display('admin/site/pages.tpl');
......@@ -62,7 +62,7 @@ $urlparams['institution'] = 'mahara';
$urlparamsstr = '&' . http_build_query($urlparams);
$smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-file-text');
setpageicon($smarty, 'icon-file-alt');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('views', $views);
......
......@@ -760,7 +760,7 @@ $deleteform = pieform(array(
'type' => 'button',
'usebuttontag' => true,
'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'),
),
),
......
......@@ -1399,7 +1399,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'type' => 'button',
'usebuttontag' => true,
'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'),
'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
'name' => 'delete_annotation_feedback_submit',
......
......@@ -602,7 +602,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" 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(
'type' => 'hidden',
......@@ -1254,7 +1254,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
'class' => 'btn-secondary btn-sm last',
'elementtitle' => get_string('delete'),
'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 {
'type' => 'button',
'usebuttontag' => true,
'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'),
'name' => 'delete_comment_submit',
),
......
......@@ -25,7 +25,7 @@ $form = pieform(ArtefactTypeFileBase::files_form(get_config('wwwroot') . 'artefa
$js = ArtefactTypeFileBase::files_js();
$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('institution', 'mahara');
......
......@@ -152,7 +152,7 @@ $smarty = smarty(array(), array(), array(), array(
image_filebrowser: "editnote_filebrowser",
'
));
setpageicon($smarty, 'icon-pencil-square-o');
setpageicon($smarty, 'icon-regular icon-edit');
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', $artefact->get('title'));
......
......@@ -212,7 +212,7 @@ function deletenote_form($id, $notedata) {
'usebuttontag' => true,
'class' => 'btn-secondary btn-sm last',
'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($) {
});';
$smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-pencil-square-o');
setpageicon($smarty, 'icon-regular icon-edit');
$smarty->assign('PAGEHEADING', $pageheading);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('data', $data);
......@@ -227,7 +227,7 @@ function deletenote_form($id, $notedata) {
'usebuttontag' => true,
'class' => 'btn-secondary btn-sm last',
'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 {
'type' => 'button',
'usebuttontag' => true,
'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'),
'name' => 'delete_assessment_submit',
),
......
......@@ -1138,12 +1138,12 @@ EOF;
var editlink =
jQuery('<a>', {'href': 'editcomposite.php?id=' + row.id + '&artefact=' + row.artefact,
'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})
);
var dellink =
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})
);
dellink.on('click', function (e) {
......
......@@ -51,7 +51,7 @@ if ($token) {
'type' => 'button',
'usebuttontag' => true,
'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),
);
}
......
......@@ -30,7 +30,7 @@
}
else {
// 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);
$('#' + pieformname + '_customlayoutnumrows').val(numrows + 1);
......
......@@ -1053,7 +1053,7 @@
blockinstanceId = blockinstance.attr('data-id'),
content = blockinstance.find('.js-blockinstance-content'),
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};
......
......@@ -99,7 +99,7 @@ function pieform_element_calendar(Pieform $form, $element) {
previous: "icon icon-chevron-left",
next: "icon icon-chevron-right",
close: "icon icon-times",
clear: "icon icon-trash",
clear: "icon icon-trash-alt",
today: "icon icon-crosshairs",
},
});
......
......@@ -2867,7 +2867,7 @@ function mahara_standard_nav() {
'url' => null,
'title' => get_string('share'),
'weight' => 30,
'iconclass' => 'unlock-alt',
'iconclass' => 'unlock',
),
'engage' => array(
'path' => 'engage',
......
......@@ -196,7 +196,7 @@ if ($frameworks) {
'type' => 'button',
'class' => 'btn-secondary btn-sm button',
'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'),
),
'framework' => array(
......
......@@ -171,7 +171,7 @@ else {
'type' => 'button',
'usebuttontag' => true,
'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),
),
),
......
......@@ -241,7 +241,7 @@ $form = pieform(array(
));
$smarty = smarty();
setpageicon($smarty, 'icon-pencil-square-o');
setpageicon($smarty, 'icon-regular icon-edit');
$smarty->assign('form', $form);
$smarty->assign('user', $USER);
$smarty->assign('messages', $messages);
......
......@@ -29,7 +29,7 @@
<div class="btn-group btn-group-top comment-item-buttons">
{if $item->canedit}
<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>
</a>
{/if}
......
......@@ -35,7 +35,7 @@
<span class="text-small">{str tag=submittedforassessment section=view}</span>
{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">
<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>
</a>
{$blog->deleteform|safe}
......
......@@ -31,7 +31,7 @@
<input type="hidden" name="id" value="{$post->id}">
<div class="first">
<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>
</button>
</div>
......
......@@ -42,7 +42,7 @@
{if !$onview}
{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">
<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>
</a>
{/if}
......
......@@ -118,7 +118,7 @@
{elseif !$file->isparent}
{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}">
<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'}
<span class="sr-only">{str tag=editfolderspecific section=artefact.file arg1=$displaytitle|escape:html|safe}</span>
{else}
......@@ -158,12 +158,12 @@
{/if}
<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>
</button>
<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>
</button>
</div>
......
......@@ -20,7 +20,7 @@
{str tag="setdefault" section=artefact.file}
</button>
<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}
</button>
</td>
......
......@@ -89,7 +89,7 @@
{else}
<div class="btn-group">
<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">
{str(tag=editspecific arg1=$n->title)|escape:html|safe}
</span>
......
......@@ -38,12 +38,12 @@
<td class="control-buttons">
<div class="btn-group">
<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>
</a>
{if $candelete}
<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>
</a>
{/if}
......
<a id="modify_assessment_feedback_{$block}" class="js-peerassessment-modal feedback assessbtn btn btn-secondary btn-sm" href="#" data-toggle="modal-docked" data-target="#assessment_feedbackform_{$block}" data-blockid="{$block}" data-id="{$id}">
<span class="icon icon-pencil" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=editspecific arg1=$title}</span>
</a>
......@@ -6,7 +6,7 @@
{if $editing}
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=editspecific arg1=$plan.title)|escape:html|safe}">
<span class="icon icon-pencil"></span>
<span class="icon icon-pencil-alt"></span>
<span class="sr-only">{str tag='edit'}</span>
</a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/new.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=addtaskspecific section='artefact.plans' arg1=$plan.title)|escape:html|safe}">
......@@ -14,7 +14,7 @@
<span class="sr-only">{str tag='addtask' section='artefact.plans'}</span>
</a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=deletespecific arg1=$plan.title)|escape:html|safe}">
<span class="icon icon-trash text-danger"></span>
<span class="icon icon-trash-alt text-danger"></span>
<span class="sr-only">{str tag='Delete'}</span>
</a>
</div>
......
......@@ -9,7 +9,7 @@
<div class="list-group-item-controls">
<div class="btn-group btn-group-top">
<a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}" 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">{str tag=edit}</span>
</a>
<a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-secondary btn-sm">
......@@ -17,7 +17,7 @@
<span class="sr-only">{str tag=managetasks section=artefact.plans}</span>
</a>
<a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}" 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>
</a>
</div>
......
......@@ -3,8 +3,8 @@
<div class="task-item plan_incomplete list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
{if $editing}
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil-alt text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
</div>
{/if}
{if $task->description || $task->tags} <a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if}
......@@ -42,8 +42,8 @@
<div class="task-item list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
{if $editing}
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil-alt text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
</div>
{/if}
{if $task->description || $task->tags}<a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if}
......
......@@ -38,11 +38,11 @@
<td class="planscontrols control-buttons text-right">
<div class="btn-group">
<a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" 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=editspecific arg1=$task->title)|escape:html|safe}</span>
</a>
<a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" 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=deletespecific arg1=$task->title)|escape:html|safe}</span>
</a>
</div>
......
......@@ -13,13 +13,13 @@
{if $n->exists}
<a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
{str tag=$n->artefacttype section='artefact.resume'}
<span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{else}
<a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
{str tag=$n->artefacttype section='artefact.resume'}
<span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{/if}
......
......@@ -14,13 +14,13 @@
{if $n->exists}
<a id="skills_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
{str tag=$n->artefacttype section='artefact.resume'}
<span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{else}
<a id="skills_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
{str tag=$n->artefacttype section='artefact.resume'}
<span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{/if}
......
{if $r.delete}
<button type="button" onclick="deleteidp(this, '{$r.idpentityid}')" name="delete" value="{$r.idpentityid}" class="deletebutton btn btn-secondary btn-sm" alt='{str tag=deletespecific section=mahara arg1=$r.name}'>
<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 section=mahara}
</span>
......
......@@ -56,7 +56,7 @@
buttons += '<span class="emptybtnspace"></span>';
}
}
buttons += '<a class="btn btn-secondary btn-sm" href="" onclick="removeConnection(' + id + '); return false;"><span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' + get_string('deleteitem') + '</span></a>' + "\n";
buttons += '<a class="btn btn-secondary btn-sm" href="" onclick="removeConnection(' + id + '); return false;"><span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' + get_string('deleteitem') + '</span></a>' + "\n";
return buttons;
}
......@@ -146,7 +146,7 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div.
<span class="emptybtnspace"></span>
{{/if}}
<a href="" class="btn btn-secondary btn-sm" onclick="removeConnection({{$instance->id}}); return false;">
<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{{str tag=deleteitem}}</span>
</a>
</span>
......
......@@ -14,7 +14,7 @@
</a>
{if $wallpost->deletable}
<a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}" class="card-control card-header-action">
<span class="icon icon-trash left text-danger icon-sm" role="presentation" aria-hidden="true"></span>
<span class="icon icon-trash-alt left text-danger icon-sm" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag='delete' section='blocktype.wall'}</span>
</a>
{/if}
......
......@@ -85,12 +85,12 @@
<td class="right control-buttons">
<div class="btn-group">
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="btn btn-secondary btn-sm" 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>
<span class="sr-only">{str tag=editspecific arg1=$forum->title}</span>
</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id}&amp;returnto=index" class="btn btn-secondary btn-sm" title="{str tag=delete}">
<span class="text-danger icon icon-trash icon-lg" role="presentation" aria-hidden="true"></span>
<span class="text-danger icon icon-trash-alt icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=deletespecific arg1=$forum->title}</span>
</a>
</div>
......
......@@ -51,14 +51,14 @@
{if $post->canedit}
<a href="{$WWWROOT}interaction/forum/editpost.php?id={$post->id}">
<span class="icon icon-pencil" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt" role="presentation" aria-hidden="true"></span>
{str tag="edit"}
</a>
{/if}
{if $moderator && $post->parent}
<a href="{$WWWROOT}interaction/forum/deletepost.php?id={$post->id}">
<span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span>
<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span>
{str tag="delete"}
</a>
{/if}
......
......@@ -6,12 +6,12 @@
{/if}
{if $topic->canedit}
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}" class="btn btn-secondary editforum">
<span class="icon icon-pencil icon-lg left" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=edittopic section=interaction.forum}
</a>
{if $moderator}
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}" class="btn btn-secondary deletetopic">
<span class="icon icon-trash icon-lg left text-danger" role="presentation" aria-hidden="true"></span>
<span class="icon icon-trash-alt icon-lg left text-danger" role="presentation" aria-hidden="true"></span>
{str tag=deletetopic section=interaction.forum}
</a>
{/if}
......
......@@ -86,13 +86,13 @@
<td class="control-buttons">
<div class="btn-group">
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-secondary btn-sm" 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>
<span class="sr-only">
{str tag=edittopicspecific section=interaction.forum arg1=$topic->subject}
</span>
</a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-secondary btn-sm" title="{str tag="delete"}">
<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=deletetopicspecific section=interaction.forum arg1=$topic->subject}
</span>
......
......@@ -19,7 +19,7 @@
{if $membership && ($moderator || ($forum->newtopicusers != 'moderators') && $ineditwindow) }
{if $admin}
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id}" class="btn btn-secondary deleteforum">
<span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span>
<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span>
{str tag="deleteforum" section="interaction.forum"}
</a>
{/if}
......
......@@ -2,7 +2,7 @@
{if $candeleteself && !$deletionsent}
<div class="btn-top-right btn-group btn-group-top">
<a href="{$WWWROOT}account/delete.php" class="btn btn-secondary 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>
<span>{str tag=deleteaccount1}</span>
</a>
</div>
......
......@@ -22,7 +22,7 @@
<div class="btn-group">
<a id="edit-{$item.id}" class="url-open-editform btn btn-secondary btn-sm float-left closed" title="{str tag=edit}" href="">
<span class="icon icon-pencil" role="presentation" aria-hidden="true"></span>
<span class="icon icon-pencil-alt" role="presentation" aria-hidden="true"></span>
<span class="icon icon-chevron-down icon-sm" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str(tag=editspecific arg1=$item.name)|escape:html|safe}</span>
</a>
......
......@@ -26,7 +26,7 @@
<span class="icon icon-clone icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=copygroup section=group arg1=$group->name)|escape:html|safe}</span>
</a>
<a class="btn btn-secondary btn-sm" title="{str tag="delete"}" href="{$WWWROOT}admin/groups/delete.php?id={$group->id}">
<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=deletespecific arg1=$group->name)|escape:html|safe}</span>