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

Bug 1811904: Fontawesome: more name changes

icon-arrows     -> icon-arrows-alt
icon-shield     -> icon-shield-alt
icon-refresh        -> icon-sync-alt
icon-clock-o        -> icon-clock
icon-pie-chart      -> icon-chart-pie
icon-area-chart     -> icon-chart-area
icon-commenting-o   -> icon-comment-dots
icon-arrows     -> icon-arrows-alt
icon-question-circle-o  -> icon-question-circle

behatnotneeded

Change-Id: I4fb3feebc11cc335f5dde05cc6e45c50b29359a6
parent 7b952964
...@@ -63,7 +63,7 @@ function cookieconsent_submit(Pieform $form, $values) { ...@@ -63,7 +63,7 @@ function cookieconsent_submit(Pieform $form, $values) {
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-shield'); setpageicon($smarty, 'icon-shield-alt');
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('introtext1', get_string('cookieconsentintro1', 'cookieconsent')); $smarty->assign('introtext1', get_string('cookieconsentintro1', 'cookieconsent'));
......
...@@ -103,7 +103,7 @@ $networkingform = pieform( ...@@ -103,7 +103,7 @@ $networkingform = pieform(
'name' => 'submit', // must be called submit so we can access it's value 'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'content' => '<span class="icon icon-refresh icon-lg left text-danger" role="presentation" aria-hidden="true"></span> '. get_string('deletekey', 'admin'), 'content' => '<span class="icon icon-sync-alt icon-lg left text-danger" role="presentation" aria-hidden="true"></span> '. get_string('deletekey', 'admin'),
'value' => 'deletekey' 'value' => 'deletekey'
) )
) )
......
...@@ -370,7 +370,7 @@ $siteoptionform = array( ...@@ -370,7 +370,7 @@ $siteoptionform = array(
), ),
), ),
'accountsettings' => array( 'accountsettings' => array(
'iconclass'=>'clock-o', 'iconclass'=>'regular icon-clock',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
......
...@@ -275,7 +275,7 @@ JS; ...@@ -275,7 +275,7 @@ JS;
} }
$smarty = smarty(array('paginator','js/chartjs/dist/Chart.min.js')); $smarty = smarty(array('paginator','js/chartjs/dist/Chart.min.js'));
setpageicon($smarty, 'icon-pie-chart'); setpageicon($smarty, 'icon-chart-pie');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('institutiondata', $institutiondata); $smarty->assign('institutiondata', $institutiondata);
$smarty->assign('type', $type); $smarty->assign('type', $type);
......
...@@ -679,7 +679,7 @@ class PluginAuthSaml extends PluginAuth { ...@@ -679,7 +679,7 @@ class PluginAuthSaml extends PluginAuth {
'name' => 'submit', // must be called submit so we can access it's value 'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'content' => '<span class="icon icon-refresh icon-lg left text-danger" role="presentation" aria-hidden="true"></span> '. get_string($certstatus . 'text', 'auth.saml'), 'content' => '<span class="icon icon-sync-alt icon-lg left text-danger" role="presentation" aria-hidden="true"></span> '. get_string($certstatus . 'text', 'auth.saml'),
'value' => $certstatus, 'value' => $certstatus,
); );
......
...@@ -50,7 +50,7 @@ class PluginBlocktypeOpenbadgedisplayer extends SystemBlocktype { ...@@ -50,7 +50,7 @@ class PluginBlocktypeOpenbadgedisplayer extends SystemBlocktype {
} }
public static function get_css_icon($blocktypename) { public static function get_css_icon($blocktypename) {
return 'shield'; return 'shield-alt';
} }
public static function get_viewtypes() { public static function get_viewtypes() {
......
...@@ -41,7 +41,7 @@ $pagination = build_pagination(array( ...@@ -41,7 +41,7 @@ $pagination = build_pagination(array(
)); ));
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-commenting-o'); setpageicon($smarty, 'icon-regular icon-comment-dots');
$smarty->assign('topics', $data['data']); $smarty->assign('topics', $data['data']);
$smarty->assign('pagination', $pagination['html']); $smarty->assign('pagination', $pagination['html']);
$smarty->assign('INLINEJAVASCRIPT', 'jQuery(function() { p = ' . $pagination['javascript'] . '});'); $smarty->assign('INLINEJAVASCRIPT', 'jQuery(function() { p = ' . $pagination['javascript'] . '});');
......
...@@ -92,7 +92,7 @@ function pieform_element_calendar(Pieform $form, $element) { ...@@ -92,7 +92,7 @@ function pieform_element_calendar(Pieform $form, $element) {
}, },
tooltips: ' . $tooltips . ', tooltips: ' . $tooltips . ',
icons: { icons: {
time: "icon icon-clock-o", time: "icon icon-regular icon-clock",
date: "icon icon-calendar", date: "icon icon-calendar",
up: "icon icon-arrow-up", up: "icon icon-arrow-up",
down: "icon icon-arrow-down", down: "icon icon-arrow-down",
......
...@@ -2495,7 +2495,7 @@ function admin_nav() { ...@@ -2495,7 +2495,7 @@ function admin_nav() {
'url' => 'admin/users/statistics.php', 'url' => 'admin/users/statistics.php',
'title' => get_string('reports', 'statistics'), 'title' => get_string('reports', 'statistics'),
'weight' => 60, 'weight' => 60,
'iconclass' => 'pie-chart', 'iconclass' => 'chart-pie',
), ),
'configextensions' => array( 'configextensions' => array(
'path' => 'configextensions', 'path' => 'configextensions',
...@@ -2736,7 +2736,7 @@ function institutional_admin_nav() { ...@@ -2736,7 +2736,7 @@ function institutional_admin_nav() {
'url' => 'admin/users/statistics.php', 'url' => 'admin/users/statistics.php',
'title' => get_string('reports', 'statistics'), 'title' => get_string('reports', 'statistics'),
'weight' => 40, 'weight' => 40,
'iconclass' => 'pie-chart', 'iconclass' => 'chart-pie',
), ),
); );
...@@ -2787,7 +2787,7 @@ function staff_nav() { ...@@ -2787,7 +2787,7 @@ function staff_nav() {
'url' => 'admin/users/statistics.php', 'url' => 'admin/users/statistics.php',
'title' => get_string('reports', 'statistics'), 'title' => get_string('reports', 'statistics'),
'weight' => 30, 'weight' => 30,
'iconclass' => 'pie-chart', 'iconclass' => 'chart-pie',
), ),
); );
...@@ -2828,7 +2828,7 @@ function institutional_staff_nav() { ...@@ -2828,7 +2828,7 @@ function institutional_staff_nav() {
'url' => 'admin/users/statistics.php', 'url' => 'admin/users/statistics.php',
'title' => get_string('reports', 'statistics'), 'title' => get_string('reports', 'statistics'),
'weight' => 20, 'weight' => 20,
'iconclass' => 'pie-chart', 'iconclass' => 'chart-pie',
), ),
); );
} }
......
...@@ -225,7 +225,7 @@ if (get_config_plugin('module', 'mobileapi', 'manualtokens')) { ...@@ -225,7 +225,7 @@ if (get_config_plugin('module', 'mobileapi', 'manualtokens')) {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-refresh"></span> ' . get_string('gen', 'auth.webservice'), 'value' => '<span class="icon icon-sync-alt"></span> ' . get_string('gen', 'auth.webservice'),
'elementtitle' => get_string('gen', 'auth.webservice') 'elementtitle' => get_string('gen', 'auth.webservice')
), ),
), ),
......
{if $record->deleted} {if $record->deleted}
<h3 class="title list-group-item-heading text-inline"> <h3 class="title list-group-item-heading text-inline">
<span class="icon icon-commenting-o left" role="presentation" aria-hidden="true"></span> <span class="icon icon-regular icon-comment-dots left" role="presentation" aria-hidden="true"></span>
{$record->subject} {$record->subject}
</h3> </h3>
<span class="artefacttype text-midtone">({str tag=deletedforumpost section=search.elasticsearch})</span> <span class="artefacttype text-midtone">({str tag=deletedforumpost section=search.elasticsearch})</span>
{else} {else}
<h3 class="title list-group-item-heading text-inline"> <h3 class="title list-group-item-heading text-inline">
<span class="icon icon-commenting-o left" role="presentation" aria-hidden="true"></span> <span class="icon icon-regular icon-comment-dots left" role="presentation" aria-hidden="true"></span>
<a href="{$WWWROOT}interaction/forum/topic.php?id={$record->topic}#post{$record->id}"> <a href="{$WWWROOT}interaction/forum/topic.php?id={$record->topic}#post{$record->id}">
{$record->subject} {$record->subject}
</a> </a>
......
...@@ -289,7 +289,7 @@ td.action-list-copy { ...@@ -289,7 +289,7 @@ td.action-list-copy {
font-size: $font-size-base - 3; font-size: $font-size-base - 3;
padding: 7px 5px 0 0; padding: 7px 5px 0 0;
vertical-align: top; vertical-align: top;
&.icon-arrows { &.icon-arrows-alt {
vertical-align: middle; vertical-align: middle;
margin-left: -7px; margin-left: -7px;
} }
......
// Variables // Variables
// -------------------------- // --------------------------
$fa-font-path: "./../raw/fonts/font-awesome" !default; $fa-font-path: "../../raw/fonts/font-awesome" !default;
$fa-font-size-base: 16px !default; $fa-font-size-base: 16px !default;
$fa-font-display: auto !default; $fa-font-display: auto !default;
$fa-css-prefix: icon !default; $fa-css-prefix: icon !default;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
font-weight: 400; font-weight: 400;
} }
&.icon-brand { &.icon-brand {
font-family: "Font Awesome 5 Free Brands", "Font Awesome 5 Free" !important; font-family: "Font Awesome 5 Brands Regular", "Font Awesome 5 Free" !important;
font-weight: 400; font-weight: 400;
} }
&.right { &.right {
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
{if $sitedata} {if $sitedata}
<div class="card bg-info site-stats"> <div class="card bg-info site-stats">
<h3 class="card-header">{$sitedata.displayname}: {str tag=siteinformation section=admin} <span class="icon icon-area-chart float-right" role="presentation" aria-hidden="true"></span></h3> <h3 class="card-header">{$sitedata.displayname}: {str tag=siteinformation section=admin} <span class="icon icon-chart-area float-right" role="presentation" aria-hidden="true"></span></h3>
{include file='admin/users/stats.tpl' institutiondata=$sitedata showall='_all' fromindex='1'} {include file='admin/users/stats.tpl' institutiondata=$sitedata showall='_all' fromindex='1'}
<a class="card-footer text-small" href="{$WWWROOT}admin/users/statistics.php?type=information&subtype=information">{str tag=viewfullsitestatistics section=admin} <span class="icon icon-arrow-circle-right float-right" role="presentation" aria-hidden="true"></span></a> <a class="card-footer text-small" href="{$WWWROOT}admin/users/statistics.php?type=information&subtype=information">{str tag=viewfullsitestatistics section=admin} <span class="icon icon-arrow-circle-right float-right" role="presentation" aria-hidden="true"></span></a>
</div> </div>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</div> </div>
<div class="card"> <div class="card">
<h3 class="card-header">{str tag=clearcachesheading section=admin} <span class="icon icon-refresh float-right" role="presentation" aria-hidden="true"></span></h3> <h3 class="card-header">{str tag=clearcachesheading section=admin} <span class="icon icon-sync-alt float-right" role="presentation" aria-hidden="true"></span></h3>
<div class="card-body"> <div class="card-body">
<p>{str tag=cliclearcachesdescription section=admin}</p> <p>{str tag=cliclearcachesdescription section=admin}</p>
{$clearcachesform|safe} {$clearcachesform|safe}
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
</div> </div>
<div class="card"> <div class="card">
<h3 class="card-header">{str tag=reports section=statistics} <span class="icon icon-area-chart float-right" role="presentation" aria-hidden="true"></span></h3> <h3 class="card-header">{str tag=reports section=statistics} <span class="icon icon-chart-area float-right" role="presentation" aria-hidden="true"></span></h3>
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"> <li class="list-group-item">
<a href="{$WWWROOT}admin/users/statistics.php">{str tag=reports section=statistics}</a> <a href="{$WWWROOT}admin/users/statistics.php">{str tag=reports section=statistics}</a>
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
<form class="nojs-hidden-inline form-as-button float-left" action="{$WWWROOT}admin/users/statistics.php" id="report" method="post"> <form class="nojs-hidden-inline form-as-button float-left" action="{$WWWROOT}admin/users/statistics.php" id="report" method="post">
<button action="{$WWWROOT}admin/users/statistics.php" type="submit" class="btn btn-secondary disabled" name="reports" id="reportsbtn" value="{str tag=getreports section=admin}"> <button action="{$WWWROOT}admin/users/statistics.php" type="submit" class="btn btn-secondary disabled" name="reports" id="reportsbtn" value="{str tag=getreports section=admin}">
<span class="icon icon-area-chart left" role="presentation" aria-hidden="true"></span> <span class="icon icon-chart-area left" role="presentation" aria-hidden="true"></span>
{str tag=withselectedusersreports section=admin} {str tag=withselectedusersreports section=admin}
</button> </button>
<input type="hidden" name="type" value="users"> <input type="hidden" name="type" value="users">
......
...@@ -175,7 +175,7 @@ jQuery(function($) { ...@@ -175,7 +175,7 @@ jQuery(function($) {
}, },
tooltips: {{$datepickertooltips|safe}}, tooltips: {{$datepickertooltips|safe}},
icons: { icons: {
time: "icon icon-clock-o", time: "icon icon-regular icon-clock",
date: "icon icon-calendar", date: "icon icon-calendar",
up: "icon icon-arrow-up", up: "icon icon-arrow-up",
down: "icon icon-arrow-down", down: "icon icon-arrow-down",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</p> </p>
<p> <p>
<span class="icon icon-shield left" role="presentation" aria-hidden="true"></span> <span class="icon icon-shield-alt left" role="presentation" aria-hidden="true"></span>
<span class="">{$group->settingsdescription}</span> <span class="">{$group->settingsdescription}</span>
</p> </p>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
{/if} {/if}
<ul class="list-unstyled list-inline "> <ul class="list-unstyled list-inline ">
<li class="list-inline-item"> <li class="list-inline-item">
<span class="icon icon-area-chart" role="presentation" aria-hidden="true"></span> <span class="icon icon-chart-area" role="presentation" aria-hidden="true"></span>
</li> </li>
{if $group->membercount} {if $group->membercount}
<li class="list-inline-item"> <li class="list-inline-item">
......
...@@ -1362,7 +1362,7 @@ Shows that a card can be expanded or collapsed to the right. ...@@ -1362,7 +1362,7 @@ Shows that a card can be expanded or collapsed to the right.
### Area chart ### Area chart
As seen on the "Statistics" page in the administration area. As seen on the "Statistics" page in the administration area.
``` ```
<i class="icon icon-area-chart" role="presentation"></i> <i class="icon icon-chart-area" role="presentation"></i>
``` ```
</section> </section>
...@@ -1882,7 +1882,7 @@ Used for the "Recent journal entries" block. ...@@ -1882,7 +1882,7 @@ Used for the "Recent journal entries" block.
### Refresh ### Refresh
As seen on the button on the "Networking" page. As seen on the button on the "Networking" page.
``` ```
<i class="icon icon-refresh" role="presentation"></i> <i class="icon icon-sync-alt" role="presentation"></i>
``` ```
</section> </section>
...@@ -1937,7 +1937,7 @@ Used to signify searchable items ...@@ -1937,7 +1937,7 @@ Used to signify searchable items
### Shield ### Shield
As used on the "Cookie consent" page in the administration area. As used on the "Cookie consent" page in the administration area.
``` ```
<i class="icon icon-shield" role="presentation"></i> <i class="icon icon-shield-alt" role="presentation"></i>
``` ```
</section> </section>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
{/if} {/if}
{/foreach} {/foreach}
<a id="blockshelp" class="text-left blocktypelink btn btn-help hide-title-collapsed btn-secondary btn-accordion" href="{$manualhelpblock}" target="_blank"> <a id="blockshelp" class="text-left blocktypelink btn btn-help hide-title-collapsed btn-secondary btn-accordion" href="{$manualhelpblock}" target="_blank">
<span class="icon icon-question-circle-o block-icon" role="presentation" aria-hidden="true"></span> <span class="icon icon-regular icon-question-circle block-icon" role="presentation" aria-hidden="true"></span>
<span class="title">{str tag=blockhelp section=view}</span> <span class="title">{str tag=blockhelp section=view}</span>
</a> </a>
......
<div class="bt-{$blocktype}-editor js-blockinstance blockinstance card card-secondary clearfix {if $configure} configure{elseif $retractable} retractable{/if}" data-id="{$id}" id="blockinstance_{$id}{if $configure}_configure{/if}"> <div class="bt-{$blocktype}-editor js-blockinstance blockinstance card card-secondary clearfix {if $configure} configure{elseif $retractable} retractable{/if}" data-id="{$id}" id="blockinstance_{$id}{if $configure}_configure{/if}">
<h3 class="card-header js-heading drag-handle {if !$title}card-header-placeholder{/if}" title="{$strmovetitletexttooltip}"> <h3 class="card-header js-heading drag-handle {if !$title}card-header-placeholder{/if}" title="{$strmovetitletexttooltip}">
<span class="icon icon-arrows move-indicator" role="presentation" aria-hidden="true"></span> <span class="icon icon-arrows-alt move-indicator" role="presentation" aria-hidden="true"></span>
<span class="blockinstance-header"> <span class="blockinstance-header">
{if $configure}{$configtitle}: {str tag=Configure section=view}{else}{$title|default:"[$strnotitle]"}{/if} {if $configure}{$configtitle}: {str tag=Configure section=view}{else}{$title|default:"[$strnotitle]"}{/if}
{if $retractable && !$configure} {if $retractable && !$configure}
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{foreach from=$blocktypes item=blocktype} {foreach from=$blocktypes item=blocktype}
{* TODO at this point we have now $blocktype.singleonly *} {* TODO at this point we have now $blocktype.singleonly *}
<a class="blocktype-drag blocktypelink btn btn-secondary hide-title-collapsed text-left" href="#" title="{$blocktype.description}"> <a class="blocktype-drag blocktypelink btn btn-secondary hide-title-collapsed text-left" href="#" title="{$blocktype.description}">
<span class="icon icon-arrows icon-sm left move-indicator" role="presentation" aria-hidden="true"></span> <span class="icon icon-arrows-alt icon-sm left move-indicator" role="presentation" aria-hidden="true"></span>
<input type="radio" id="blocktype-list-radio-{$blocktype.name}" class="blocktype-radio" name="blocktype" value="{$blocktype.name}"> <input type="radio" id="blocktype-list-radio-{$blocktype.name}" class="blocktype-radio" name="blocktype" value="{$blocktype.name}">
{if $blocktype.cssicon}{* {if $blocktype.cssicon}{*
*}<span class="icon icon-{$blocktype.cssicon} block-icon" title="{$blocktype.title}" role="presentation" aria-hidden="true"></span>{* *}<span class="icon icon-{$blocktype.cssicon} block-icon" title="{$blocktype.title}" role="presentation" aria-hidden="true"></span>{*
......
...@@ -208,7 +208,7 @@ if (!empty($dbservices)) { ...@@ -208,7 +208,7 @@ if (!empty($dbservices)) {
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-secondary btn-sm', 'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-refresh"></span> ' . get_string('gen', 'auth.webservice'), 'value' => '<span class="icon icon-sync-alt"></span> ' . get_string('gen', 'auth.webservice'),
'elementtitle' => get_string('gen', 'auth.webservice') 'elementtitle' => get_string('gen', 'auth.webservice')
), ),
), ),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment