From 7db2c719a27b3ef963274c81bc1145c3669f6c9d Mon Sep 17 00:00:00 2001 From: Rebecca Blundell Date: Thu, 9 May 2019 18:50:20 +1200 Subject: [PATCH] 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 --- htdocs/admin/site/cookieconsent.php | 2 +- htdocs/admin/site/networking.php | 2 +- htdocs/admin/site/options.php | 2 +- htdocs/admin/users/statistics.php | 2 +- htdocs/auth/saml/lib.php | 2 +- htdocs/blocktype/openbadgedisplayer/lib.php | 2 +- htdocs/group/topics.php | 2 +- htdocs/lib/pieforms/pieform/elements/calendar.php | 2 +- htdocs/lib/web.php | 8 ++++---- htdocs/module/mobileapi/apps.php | 2 +- .../elasticsearch/templates/interaction_forum_post.tpl | 4 ++-- htdocs/theme/raw/sass/components/_btn.scss | 2 +- htdocs/theme/raw/sass/lib/font-awesome/_variables.scss | 2 +- htdocs/theme/raw/sass/typography/_icons.scss | 2 +- htdocs/theme/raw/templates/admin/index.tpl | 6 +++--- htdocs/theme/raw/templates/admin/users/search.tpl | 2 +- htdocs/theme/raw/templates/form/viewacl.tpl | 2 +- htdocs/theme/raw/templates/group/info.tpl | 4 ++-- htdocs/theme/raw/templates/styleguide.tpl | 6 +++--- htdocs/theme/raw/templates/view/blocktypecategorylist.tpl | 2 +- .../raw/templates/view/blocktypecontainerediting.tpl | 2 +- htdocs/theme/raw/templates/view/blocktypelist.tpl | 2 +- htdocs/webservice/apptokens.php | 2 +- 23 files changed, 32 insertions(+), 32 deletions(-) diff --git a/htdocs/admin/site/cookieconsent.php b/htdocs/admin/site/cookieconsent.php index eef688235..0046210af 100644 --- a/htdocs/admin/site/cookieconsent.php +++ b/htdocs/admin/site/cookieconsent.php @@ -63,7 +63,7 @@ function cookieconsent_submit(Pieform $form, $values) { $smarty = smarty(); -setpageicon($smarty, 'icon-shield'); +setpageicon($smarty, 'icon-shield-alt'); $smarty->assign('form', $form); $smarty->assign('introtext1', get_string('cookieconsentintro1', 'cookieconsent')); diff --git a/htdocs/admin/site/networking.php b/htdocs/admin/site/networking.php index bd8ac8753..018efb8ef 100644 --- a/htdocs/admin/site/networking.php +++ b/htdocs/admin/site/networking.php @@ -103,7 +103,7 @@ $networkingform = pieform( 'name' => 'submit', // must be called submit so we can access it's value 'type' => 'button', 'usebuttontag' => true, - 'content' => ' '. get_string('deletekey', 'admin'), + 'content' => ' '. get_string('deletekey', 'admin'), 'value' => 'deletekey' ) ) diff --git a/htdocs/admin/site/options.php b/htdocs/admin/site/options.php index c7f670845..6769ee210 100755 --- a/htdocs/admin/site/options.php +++ b/htdocs/admin/site/options.php @@ -370,7 +370,7 @@ $siteoptionform = array( ), ), 'accountsettings' => array( - 'iconclass'=>'clock-o', + 'iconclass'=>'regular icon-clock', 'type' => 'fieldset', 'collapsible' => true, 'collapsed' => true, diff --git a/htdocs/admin/users/statistics.php b/htdocs/admin/users/statistics.php index 2e543ef9d..98e1256d6 100644 --- a/htdocs/admin/users/statistics.php +++ b/htdocs/admin/users/statistics.php @@ -275,7 +275,7 @@ 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('institutiondata', $institutiondata); $smarty->assign('type', $type); diff --git a/htdocs/auth/saml/lib.php b/htdocs/auth/saml/lib.php index 0245eb378..bd08a0bbd 100644 --- a/htdocs/auth/saml/lib.php +++ b/htdocs/auth/saml/lib.php @@ -679,7 +679,7 @@ class PluginAuthSaml extends PluginAuth { 'name' => 'submit', // must be called submit so we can access it's value 'type' => 'button', 'usebuttontag' => true, - 'content' => ' '. get_string($certstatus . 'text', 'auth.saml'), + 'content' => ' '. get_string($certstatus . 'text', 'auth.saml'), 'value' => $certstatus, ); diff --git a/htdocs/blocktype/openbadgedisplayer/lib.php b/htdocs/blocktype/openbadgedisplayer/lib.php index 196b10d5e..3f0958cda 100644 --- a/htdocs/blocktype/openbadgedisplayer/lib.php +++ b/htdocs/blocktype/openbadgedisplayer/lib.php @@ -50,7 +50,7 @@ class PluginBlocktypeOpenbadgedisplayer extends SystemBlocktype { } public static function get_css_icon($blocktypename) { - return 'shield'; + return 'shield-alt'; } public static function get_viewtypes() { diff --git a/htdocs/group/topics.php b/htdocs/group/topics.php index 363064662..3a6136f19 100644 --- a/htdocs/group/topics.php +++ b/htdocs/group/topics.php @@ -41,7 +41,7 @@ $pagination = build_pagination(array( )); $smarty = smarty(array('paginator')); -setpageicon($smarty, 'icon-commenting-o'); +setpageicon($smarty, 'icon-regular icon-comment-dots'); $smarty->assign('topics', $data['data']); $smarty->assign('pagination', $pagination['html']); $smarty->assign('INLINEJAVASCRIPT', 'jQuery(function() { p = ' . $pagination['javascript'] . '});'); diff --git a/htdocs/lib/pieforms/pieform/elements/calendar.php b/htdocs/lib/pieforms/pieform/elements/calendar.php index 06d642da2..7f5dc7506 100644 --- a/htdocs/lib/pieforms/pieform/elements/calendar.php +++ b/htdocs/lib/pieforms/pieform/elements/calendar.php @@ -92,7 +92,7 @@ function pieform_element_calendar(Pieform $form, $element) { }, tooltips: ' . $tooltips . ', icons: { - time: "icon icon-clock-o", + time: "icon icon-regular icon-clock", date: "icon icon-calendar", up: "icon icon-arrow-up", down: "icon icon-arrow-down", diff --git a/htdocs/lib/web.php b/htdocs/lib/web.php index d2af93c74..0812991e6 100755 --- a/htdocs/lib/web.php +++ b/htdocs/lib/web.php @@ -2495,7 +2495,7 @@ function admin_nav() { 'url' => 'admin/users/statistics.php', 'title' => get_string('reports', 'statistics'), 'weight' => 60, - 'iconclass' => 'pie-chart', + 'iconclass' => 'chart-pie', ), 'configextensions' => array( 'path' => 'configextensions', @@ -2736,7 +2736,7 @@ function institutional_admin_nav() { 'url' => 'admin/users/statistics.php', 'title' => get_string('reports', 'statistics'), 'weight' => 40, - 'iconclass' => 'pie-chart', + 'iconclass' => 'chart-pie', ), ); @@ -2787,7 +2787,7 @@ function staff_nav() { 'url' => 'admin/users/statistics.php', 'title' => get_string('reports', 'statistics'), 'weight' => 30, - 'iconclass' => 'pie-chart', + 'iconclass' => 'chart-pie', ), ); @@ -2828,7 +2828,7 @@ function institutional_staff_nav() { 'url' => 'admin/users/statistics.php', 'title' => get_string('reports', 'statistics'), 'weight' => 20, - 'iconclass' => 'pie-chart', + 'iconclass' => 'chart-pie', ), ); } diff --git a/htdocs/module/mobileapi/apps.php b/htdocs/module/mobileapi/apps.php index 021e277ba..6e833b30f 100644 --- a/htdocs/module/mobileapi/apps.php +++ b/htdocs/module/mobileapi/apps.php @@ -225,7 +225,7 @@ if (get_config_plugin('module', 'mobileapi', 'manualtokens')) { 'type' => 'button', 'usebuttontag' => true, 'class' => 'btn-secondary btn-sm', - 'value' => ' ' . get_string('gen', 'auth.webservice'), + 'value' => ' ' . get_string('gen', 'auth.webservice'), 'elementtitle' => get_string('gen', 'auth.webservice') ), ), diff --git a/htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_forum_post.tpl b/htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_forum_post.tpl index b3746bb6c..b67c373f6 100644 --- a/htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_forum_post.tpl +++ b/htdocs/theme/raw/plugintype/search/elasticsearch/templates/interaction_forum_post.tpl @@ -1,12 +1,12 @@ {if $record->deleted}

- + {$record->subject}

({str tag=deletedforumpost section=search.elasticsearch}) {else}

- + {$record->subject} diff --git a/htdocs/theme/raw/sass/components/_btn.scss b/htdocs/theme/raw/sass/components/_btn.scss index 4248effce..9fbca3a8f 100644 --- a/htdocs/theme/raw/sass/components/_btn.scss +++ b/htdocs/theme/raw/sass/components/_btn.scss @@ -289,7 +289,7 @@ td.action-list-copy { font-size: $font-size-base - 3; padding: 7px 5px 0 0; vertical-align: top; - &.icon-arrows { + &.icon-arrows-alt { vertical-align: middle; margin-left: -7px; } diff --git a/htdocs/theme/raw/sass/lib/font-awesome/_variables.scss b/htdocs/theme/raw/sass/lib/font-awesome/_variables.scss index c9b74ee5e..b973d6ba2 100644 --- a/htdocs/theme/raw/sass/lib/font-awesome/_variables.scss +++ b/htdocs/theme/raw/sass/lib/font-awesome/_variables.scss @@ -1,7 +1,7 @@ // 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-display: auto !default; $fa-css-prefix: icon !default; diff --git a/htdocs/theme/raw/sass/typography/_icons.scss b/htdocs/theme/raw/sass/typography/_icons.scss index 9f4a1d5cd..1decd870a 100644 --- a/htdocs/theme/raw/sass/typography/_icons.scss +++ b/htdocs/theme/raw/sass/typography/_icons.scss @@ -7,7 +7,7 @@ font-weight: 400; } &.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; } &.right { diff --git a/htdocs/theme/raw/templates/admin/index.tpl b/htdocs/theme/raw/templates/admin/index.tpl index dd58216f0..e04a10657 100644 --- a/htdocs/theme/raw/templates/admin/index.tpl +++ b/htdocs/theme/raw/templates/admin/index.tpl @@ -98,7 +98,7 @@ {if $sitedata}
-

{$sitedata.displayname}: {str tag=siteinformation section=admin}

+

{$sitedata.displayname}: {str tag=siteinformation section=admin}

{include file='admin/users/stats.tpl' institutiondata=$sitedata showall='_all' fromindex='1'} {str tag=viewfullsitestatistics section=admin}
@@ -122,7 +122,7 @@
-

{str tag=clearcachesheading section=admin}

+

{str tag=clearcachesheading section=admin}

{str tag=cliclearcachesdescription section=admin}

{$clearcachesform|safe} @@ -378,7 +378,7 @@
-

{str tag=reports section=statistics}

+

{str tag=reports section=statistics}

  • {str tag=reports section=statistics} diff --git a/htdocs/theme/raw/templates/admin/users/search.tpl b/htdocs/theme/raw/templates/admin/users/search.tpl index 32614fd84..7862fd499 100644 --- a/htdocs/theme/raw/templates/admin/users/search.tpl +++ b/htdocs/theme/raw/templates/admin/users/search.tpl @@ -176,7 +176,7 @@
    diff --git a/htdocs/theme/raw/templates/form/viewacl.tpl b/htdocs/theme/raw/templates/form/viewacl.tpl index 9826fd3a8..0f0f60cfd 100644 --- a/htdocs/theme/raw/templates/form/viewacl.tpl +++ b/htdocs/theme/raw/templates/form/viewacl.tpl @@ -175,7 +175,7 @@ jQuery(function($) { }, tooltips: {{$datepickertooltips|safe}}, icons: { - time: "icon icon-clock-o", + time: "icon icon-regular icon-clock", date: "icon icon-calendar", up: "icon icon-arrow-up", down: "icon icon-arrow-down", diff --git a/htdocs/theme/raw/templates/group/info.tpl b/htdocs/theme/raw/templates/group/info.tpl index 40a9ef832..93ee20212 100644 --- a/htdocs/theme/raw/templates/group/info.tpl +++ b/htdocs/theme/raw/templates/group/info.tpl @@ -6,7 +6,7 @@

    - + {$group->settingsdescription}

    @@ -27,7 +27,7 @@ {/if}