Commit 4b16a73f authored by Rebecca Blundell's avatar Rebecca Blundell Committed by Robert Lyon
Browse files

Bug 1811904: Fontawesome - more name changes 2

icon-envelope-o     -> icon-regular icon-envelope
icon-exchange       -> icon-exchange-alt
icon-file-image-o   -> icon-regular icon-file-image
icon-id-badge       -> icon-regular icon-id-badge
icon-id-card-o      -> icon-regular icon-id-card
icon-clone          -> icon-regular icon-clone
icon-sign-out       -> icon-sign-out-alt

behatnotneeded

Change-Id: I6f07f3b9c14184e98e44cd1b5568766d3fa9221a
parent 7db2c719
...@@ -40,7 +40,7 @@ $prefsform = pieform(array( ...@@ -40,7 +40,7 @@ $prefsform = pieform(array(
)); ));
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-envelope-o'); setpageicon($smarty, 'icon-regular icon-envelope');
$smarty->assign('pagedescription', get_string('prefsdescr', 'activity')); $smarty->assign('pagedescription', get_string('prefsdescr', 'activity'));
$smarty->assign('form', $prefsform); $smarty->assign('form', $prefsform);
$dropdownmenu = get_config('dropdownmenu') && get_config('dropdownmenuenabled'); $dropdownmenu = get_config('dropdownmenu') && get_config('dropdownmenuenabled');
......
...@@ -28,7 +28,7 @@ $xmlrpcext = extension_loaded('xmlrpc'); ...@@ -28,7 +28,7 @@ $xmlrpcext = extension_loaded('xmlrpc');
if (!$opensslext || !$curlext || !$xmlrpcext) { if (!$opensslext || !$curlext || !$xmlrpcext) {
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-exchange'); setpageicon($smarty, 'icon-exchange-alt');
$missingextensions = array(); $missingextensions = array();
!$opensslext && $missingextensions[] = 'openssl'; !$opensslext && $missingextensions[] = 'openssl';
...@@ -169,6 +169,6 @@ function networkingform_submit(Pieform $form, $values) { ...@@ -169,6 +169,6 @@ function networkingform_submit(Pieform $form, $values) {
} }
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-exchange'); setpageicon($smarty, 'icon-exchange-alt');
$smarty->assign('networkingform', $networkingform); $smarty->assign('networkingform', $networkingform);
$smarty->display('admin/site/networking.tpl'); $smarty->display('admin/site/networking.tpl');
...@@ -528,7 +528,7 @@ $siteoptionform = array( ...@@ -528,7 +528,7 @@ $siteoptionform = array(
), ),
# TODO: this should become "Network Settings" at some point # TODO: this should become "Network Settings" at some point
'proxysettings' => array( 'proxysettings' => array(
'iconclass'=>'exchange', 'iconclass'=>'exchange-alt',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
......
...@@ -24,7 +24,7 @@ $form = pieform(ArtefactTypeFileBase::files_form(get_config('wwwroot') . 'artefa ...@@ -24,7 +24,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('form', $form); $smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->display('artefact:file:files.tpl'); $smarty->display('artefact:file:files.tpl');
...@@ -57,7 +57,7 @@ class PluginArtefactFile extends PluginArtefact { ...@@ -57,7 +57,7 @@ class PluginArtefactFile extends PluginArtefact {
'url' => 'artefact/file/profileicons.php', 'url' => 'artefact/file/profileicons.php',
'title' => get_string('profileicons', 'artefact.file'), 'title' => get_string('profileicons', 'artefact.file'),
'weight' => 15, 'weight' => 15,
'iconclass' => 'id-badge', 'iconclass' => 'regular icon-id-badge',
), ),
); );
} }
......
...@@ -323,7 +323,7 @@ function settings_submit_delete(Pieform $form, $values) { ...@@ -323,7 +323,7 @@ function settings_submit_delete(Pieform $form, $values) {
} }
$smarty = smarty(array('tablerenderer')); $smarty = smarty(array('tablerenderer'));
setpageicon($smarty, 'icon-id-badge'); setpageicon($smarty, 'icon-regular icon-id-badge');
$smarty->assign('INLINEJAVASCRIPT', $IJS); $smarty->assign('INLINEJAVASCRIPT', $IJS);
$smarty->assign('uploadform', $uploadform); $smarty->assign('uploadform', $uploadform);
// This is a rare case where we don't actually care about the form, because // This is a rare case where we don't actually care about the form, because
......
...@@ -510,7 +510,7 @@ $smarty = smarty(array(), array(), array( ...@@ -510,7 +510,7 @@ $smarty = smarty(array(), array(), array(
'loseyourchanges', 'loseyourchanges',
), ),
)); ));
setpageicon($smarty, 'icon-id-card-o'); setpageicon($smarty, 'icon-regular icon-id-card');
$smarty->assign('profileform', $profileform); $smarty->assign('profileform', $profileform);
$smarty->display('artefact:internal:index.tpl'); $smarty->display('artefact:internal:index.tpl');
......
...@@ -119,7 +119,7 @@ class PluginArtefactInternal extends PluginArtefact { ...@@ -119,7 +119,7 @@ class PluginArtefactInternal extends PluginArtefact {
'url' => 'artefact/internal/index.php', 'url' => 'artefact/internal/index.php',
'title' => get_string('profile', 'artefact.internal'), 'title' => get_string('profile', 'artefact.internal'),
'weight' => 10, 'weight' => 10,
'iconclass' => 'id-card-o', 'iconclass' => 'regular icon-id-card',
), ),
); );
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<span class="icon icon-users icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=exportgroupmembershipscsvspecific section=admin arg1=$group->name)|escape:html|safe}</span> <span class="icon icon-users icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=exportgroupmembershipscsvspecific section=admin arg1=$group->name)|escape:html|safe}</span>
</a> </a>
<a class="btn btn-secondary btn-sm" title="{str tag="copy"}" href="{$WWWROOT}group/copy.php?id={$group->id}&return=adminlist"> <a class="btn btn-secondary btn-sm" title="{str tag="copy"}" href="{$WWWROOT}group/copy.php?id={$group->id}&return=adminlist">
<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> <span class="icon icon-regular 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>
<a class="btn btn-secondary btn-sm" title="{str tag="delete"}" href="{$WWWROOT}admin/groups/delete.php?id={$group->id}"> <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-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=deletespecific arg1=$group->name)|escape:html|safe}</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=$group->name)|escape:html|safe}</span>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</a> </a>
{if $cancopy} {if $cancopy}
<a href="{$WWWROOT}group/copy.php?id={$group->id}&return=mygroups" title="{str(tag=copygroup section=group arg1=$group->name)|escape:html|safe}" class="btn btn-secondary"> <a href="{$WWWROOT}group/copy.php?id={$group->id}&return=mygroups" title="{str(tag=copygroup section=group arg1=$group->name)|escape:html|safe}" class="btn btn-secondary">
<span class="icon icon-clone text-default" role="presentation" aria-hidden="true"></span> <span class="icon icon-regular icon-clone text-default" role="presentation" aria-hidden="true"></span>
<span class="btn-title">{str tag=copy}</span> <span class="btn-title">{str tag=copy}</span>
<span class="sr-only">{str(tag=copygroup section=group arg1=$group->name)|escape:html|safe}</span> <span class="sr-only">{str(tag=copygroup section=group arg1=$group->name)|escape:html|safe}</span>
</a> </a>
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
{/foreach} {/foreach}
<li class="btn-logout has-icon"> <li class="btn-logout has-icon">
<a id="logoutbutton" href="{$WWWROOT}?logout" accesskey="l"> <a id="logoutbutton" href="{$WWWROOT}?logout" accesskey="l">
<span class="icon icon-sign-out" role="presentation" aria-hidden="true"></span> <span class="icon icon-sign-out-alt" role="presentation" aria-hidden="true"></span>
<span class="nav-title">{str tag="logout"}</span> <span class="nav-title">{str tag="logout"}</span>
</a> </a>
<script> <script>
......
...@@ -367,7 +367,7 @@ section .navbar-form.navbar-collapse.search-form { ...@@ -367,7 +367,7 @@ section .navbar-form.navbar-collapse.search-form {
</li> </li>
<li class="has-icon"> <li class="has-icon">
<a href=""> <a href="">
<span class="icon icon-sign-out" role="presentation" aria-hidden="true"></span> <span class="icon icon-sign-out-alt" role="presentation" aria-hidden="true"></span>
<span class="nav-title">Link 4</span> <span class="nav-title">Link 4</span>
</a> </a>
</li> </li>
...@@ -1570,7 +1570,7 @@ Used as "Inbox" icon. ...@@ -1570,7 +1570,7 @@ Used as "Inbox" icon.
### Exchange ### Exchange
As seen on the "Networking" page. As seen on the "Networking" page.
``` ```
<i class="icon icon-exchange" role="presentation"></i> <i class="icon icon-exchange-alt" role="presentation"></i>
``` ```
</section> </section>
...@@ -1953,7 +1953,7 @@ Used to show the sign in button. ...@@ -1953,7 +1953,7 @@ Used to show the sign in button.
### Sign out ### Sign out
Used to show the sign out button. Used to show the sign out button.
``` ```
<i class="icon icon-sign-out" role="presentation"></i> <i class="icon icon-sign-out-alt" role="presentation"></i>
``` ```
</section> </section>
......
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