MDL-74251 core: Remove old icon helper classes

adpe · lucaboesch · commit e1353c7649c3 · 2024-06-27T18:28:05.000+02:00
diff --git a/.upgradenotes/MDL-74251-2024062716222581.yml b/.upgradenotes/MDL-74251-2024062716222581.yml
@@ -0,0 +1,7 @@
+issueNumber: MDL-74251
+notes:
+  theme:
+    - message: >-
+        Removed all references to iconhelp, icon-pre, icon-post, iconlarge, and
+        iconsort classes
+      type: removed
diff --git a/admin/renderer.php b/admin/renderer.php
@@ -1004,7 +1004,7 @@ protected function release_notes_link() {
     function upgrade_reload($url) {
         return html_writer::empty_tag('br') .
                 html_writer::tag('div',
-                    html_writer::link($url, $this->pix_icon('i/reload', '', '', array('class' => 'icon icon-pre')) .
+                    html_writer::link($url, $this->pix_icon('i/reload', '', '', ['class' => 'icon']) .
                             get_string('reload'), array('title' => get_string('reload'))),
                 array('class' => 'continuebutton')) . html_writer::empty_tag('br');
     }
diff --git a/admin/tool/analytics/templates/models_list.mustache b/admin/tool/analytics/templates/models_list.mustache
@@ -69,7 +69,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
@@ -87,7 +87,7 @@
                             "url": "http://example.org/help",
                             "linktext": "",
                             "icon": {
-                                "extraclasses": "iconhelp",
+                                "extraclasses": "",
                                 "attributes": [
                                     {"name": "src", "value": "../../../pix/help.svg"},
                                     {"name": "alt", "value": "Help icon"}
@@ -103,7 +103,7 @@
                             "url": "http://example.org/help",
                             "linktext": "",
                             "icon": {
-                                "extraclasses": "iconhelp",
+                                "extraclasses": "",
                                 "attributes": [
                                     {"name": "src", "value": "../../../pix/help.svg"},
                                     {"name": "alt", "value": "Help icon"}
@@ -119,7 +119,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/backup/moodle2/backup_activity_task.class.php b/backup/moodle2/backup_activity_task.class.php
@@ -277,7 +277,7 @@ protected function define_settings() {
         $settingname = $settingprefix . 'included';
         $activityincluded = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
         $activityincluded->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
-            $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
+            $this->modulename, array('class' => 'ml-1')));
         $this->add_setting($activityincluded);
         // Look for "activities" root setting.
         $activities = $this->plan->get_setting('activities');
diff --git a/backup/moodle2/restore_activity_task.class.php b/backup/moodle2/restore_activity_task.class.php
@@ -301,7 +301,7 @@ protected function define_settings() {
         $settingname = $settingprefix . 'included';
         $activity_included = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
         $activity_included->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
-            $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
+            $this->modulename, ['class' => 'ml-1']));
         $this->add_setting($activity_included);
         // Look for "activities" root setting
         $activities = $this->plan->get_setting('activities');
diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php
@@ -203,7 +203,7 @@ public function backup_details($details, $nextstageurl) {
                         $table->data = array();
                     }
                     $name = get_string('pluginname', $activity->modulename);
-                    $icon = new image_icon('monologo', '', $activity->modulename, ['class' => 'iconlarge icon-pre']);
+                    $icon = new image_icon('monologo', '', $activity->modulename);
                     $table->data[] = array(
                         $this->output->render($icon).$name,
                         $activity->title,
diff --git a/badges/renderer.php b/badges/renderer.php
@@ -783,13 +783,13 @@ protected function helper_sortable_heading($text, $sortid = null, $sortby = null
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sort' => $sortid, 'dir' => 'ASC'));
                 $out .= $this->output->action_icon($url,
-                        new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null, array('class' => 'iconsort')));
+                        new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null));
             }
             if ($sortby !== $sortid || $sorthow !== 'DESC') {
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sort' => $sortid, 'dir' => 'DESC'));
                 $out .= $this->output->action_icon($url,
-                        new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null, array('class' => 'iconsort')));
+                        new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null));
             }
         }
         return $out;
diff --git a/badges/templates/award_badge.mustache b/badges/templates/award_badge.mustache
@@ -48,7 +48,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/badges/templates/manage_badge.mustache b/badges/templates/manage_badge.mustache
@@ -47,7 +47,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/course/dndupload.js b/course/dndupload.js
@@ -549,7 +549,7 @@ M.course_dndupload = {
         resel.div.appendChild(resel.a);
 
         resel.icon.src = M.util.image_url('i/ajaxloader');
-        resel.icon.className = 'activityicon iconlarge';
+        resel.icon.className = 'activityicon';
         resel.a.appendChild(resel.icon);
 
         resel.namespan.className = 'instancename';
diff --git a/course/renderer.php b/course/renderer.php
@@ -378,8 +378,8 @@ public function course_section_cm_unavailable_error_message(cm_info $cm) {
         }
 
         $altname = get_accesshide(' ' . $cm->modfullname);
-        $name = html_writer::empty_tag('img', array('src' => $cm->get_icon_url(),
-                'class' => 'iconlarge activityicon', 'alt' => '')) .
+        $name = html_writer::empty_tag('img', ['src' => $cm->get_icon_url(),
+                'class' => 'activityicon', 'alt' => '']) .
             html_writer::tag('span', ' '.$cm->get_formatted_name() . $altname, array('class' => 'instancename'));
         $formattedinfo = \core_availability\info::format_info($cm->availableinfo, $cm->get_course());
         return html_writer::div($name, 'activityinstance-error') .
diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache
@@ -42,7 +42,7 @@
             <input type="checkbox" id="selectactivity_{{cmid}}" class="mr-1" name="cmid[]" data-section="{{sectionnumber}}" value="{{cmid}}" aria-label="{{#str}}checkactivity, completion, {{{modname}}}{{/str}}">
             {{/canmanage}}
             <a href="{{url}}">
-            <img src="{{icon}}" class="iconlarge activityicon" alt="">
+            <img src="{{icon}}" class="activityicon" alt="">
             <span class="instancename">{{{modname}}}</span>
             </a>
         </div>
diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache
@@ -68,7 +68,7 @@
                             {{#pix}} t/expandedchevron, core {{/pix}}
                             <span class="sr-only">{{#str}} collapsecategory, core, {{formatedname}} {{/str}}</span>
                         </span>
-                        <img class="iconlarge activityicon ml-4" src="{{icon}}" alt="" aria-hidden="true">
+                        <img class="activityicon ml-4" src="{{icon}}" alt="" aria-hidden="true">
                         <h2 class="activityname ml-3 mb-0">{{{formattedname}}}</h2>
                     </a>
                 </div>
diff --git a/course/tests/behat/activity_chooser.feature b/course/tests/behat/activity_chooser.feature
@@ -302,7 +302,7 @@ Feature: Display and choose from the available activities in course
     # Confirm more help link exists
     Then "More help" "link" should exist
     # Confirm that corresponding help icon exist
-    And ".iconhelp" "css_element" should exist
+    And ".fa-info-circle" "css_element" should exist
     # Confirm that link opens in new window
     And "Opens in new window" "link" should be visible
     # Confirm the same behaviour for weekly format course
@@ -313,6 +313,6 @@ Feature: Display and choose from the available activities in course
     # Confirm more help link exists
     And "More help" "link" should exist
     # Confirm that corresponding help icon exist
-    And ".iconhelp" "css_element" should exist
+    And ".fa-info-circle" "css_element" should exist
     # Confirm that link opens in new window
     And "Opens in new window" "link" should be visible
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
@@ -1878,7 +1878,7 @@ protected function render_url_select(url_select $select) {
     public function doc_link($path, $text = '', $forcepopup = false, array $attributes = []) {
         global $CFG;
 
-        $icon = $this->pix_icon('book', '', 'moodle', ['class' => 'iconhelp icon-pre']);
+        $icon = $this->pix_icon('book', '', 'moodle');
 
         $attributes['href'] = new moodle_url(get_docs_url($path));
         $newwindowicon = '';
@@ -2079,7 +2079,7 @@ function render_rating(rating $rating) {
     public function heading_with_help($text, $helpidentifier, $component = 'moodle', $icon = '', $iconalt = '', $level = 2, $classnames = null) {
         $image = '';
         if ($icon) {
-            $image = $this->pix_icon($icon, $iconalt, $component, ['class' => 'icon iconlarge']);
+            $image = $this->pix_icon($icon, $iconalt, $component);
         }
 
         $help = '';
@@ -2146,7 +2146,7 @@ public function help_icon_scale($courseid, stdClass $scale) {
 
         $title = get_string('helpprefix2', '', $scale->name) . ' (' . get_string('newwindow') . ')';
 
-        $icon = $this->pix_icon('help', get_string('scales'), 'moodle', ['class' => 'iconhelp']);
+        $icon = $this->pix_icon('help', get_string('scales'), 'moodle');
 
         $scaleid = abs($scale->id);
 
@@ -2521,7 +2521,7 @@ public function error_text($message) {
         if (empty($message)) {
             return '';
         }
-        $message = $this->pix_icon('i/warning', get_string('error'), '', ['class' => 'icon icon-pre', 'title' => '']) . $message;
+        $message = $this->pix_icon('i/warning', get_string('error'), '', ['class' => 'icon', 'title' => '']) . $message;
         return html_writer::tag('span', $message, ['class' => 'error']);
     }
 
diff --git a/lib/classes/output/help_icon.php b/lib/classes/output/help_icon.php
@@ -100,7 +100,7 @@ public function export_for_template(renderer_base $output) {
         $data = get_formatted_help_string($this->identifier, $this->component, false, $this->a);
 
         $data->alt = $alt;
-        $data->icon = (new pix_icon('help', $alt, 'core', ['class' => 'iconhelp']))->export_for_template($output);
+        $data->icon = (new pix_icon('help', $alt, 'core'))->export_for_template($output);
         $data->linktext = $this->linktext;
         $data->title = get_string('helpprefix2', '', trim($title, ". \t"));
 
diff --git a/lib/installlib.php b/lib/installlib.php
@@ -162,7 +162,7 @@ function install_helpbutton($url, $title='') {
     echo "<a href=\"javascript:void(0)\" ";
     echo "onclick=\"return window.open('$url','Help','menubar=0,location=0,scrollbars,resizable,width=500,height=400')\"";
     echo ">";
-    echo "<img src=\"pix/help.gif\" class=\"iconhelp\" alt=\"$title\" title=\"$title\"/>";
+    echo "<img src=\"pix/help.gif\" alt=\"$title\" title=\"$title\"/>";
     echo "</a>\n";
 }
 
diff --git a/lib/templates/activity_header.mustache b/lib/templates/activity_header.mustache
@@ -42,7 +42,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/help_icon.mustache b/lib/templates/help_icon.mustache
@@ -10,7 +10,7 @@
         "linktext": "",
         "icon":{
             "attributes": [
-                {"name": "class", "value": "iconhelp"},
+                {"name": "class", "value": ""},
                 {"name": "src", "value": "../../../pix/help.svg"},
                 {"name": "alt", "value": "Help icon"}
             ]
diff --git a/lib/templates/local/choicelist.mustache b/lib/templates/local/choicelist.mustache
@@ -48,7 +48,7 @@
                 "name": "Second option",
                 "description": "Second option description",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
@@ -64,7 +64,7 @@
                 "name": "Third option",
                 "description": "Third option description",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/local/choicelist/option.mustache b/lib/templates/local/choicelist/option.mustache
@@ -36,7 +36,7 @@
         "name": "Second option",
         "description": "Second option description",
         "icon": {
-            "extraclasses": "iconhelp",
+            "extraclasses": "",
             "attributes": [
                 {"name": "src", "value": "../../../pix/help.svg"},
                 {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/local/dropdown/status.mustache b/lib/templates/local/dropdown/status.mustache
@@ -51,7 +51,7 @@
                     "name": "Second option",
                     "description": "Second option description",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
@@ -67,7 +67,7 @@
                     "name": "Third option",
                     "description": "Third option description",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/loginform.mustache b/lib/templates/loginform.mustache
@@ -56,7 +56,7 @@
                 "attributes": [
                     {
                         "name": "class",
-                        "value": "iconhelp"
+                        "value": ""
                     },
                     {
                         "name": "alt",
diff --git a/lib/templates/url_select.mustache b/lib/templates/url_select.mustache
@@ -14,7 +14,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon":{
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/assign/templates/override_actionmenu.mustache b/mod/assign/templates/override_actionmenu.mustache
@@ -39,7 +39,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/assign/templates/user_submission_actionmenu.mustache b/mod/assign/templates/user_submission_actionmenu.mustache
@@ -48,7 +48,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -76,7 +76,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -104,7 +104,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -132,7 +132,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
diff --git a/mod/feedback/templates/main_action_menu.mustache b/mod/feedback/templates/main_action_menu.mustache
@@ -57,7 +57,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon":{
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/mod/glossary/templates/standard_action_menu.mustache b/mod/glossary/templates/standard_action_menu.mustache
@@ -75,7 +75,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/edit_action_area.mustache b/mod/lesson/templates/edit_action_area.mustache
@@ -43,7 +43,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/override_action_menu.mustache b/mod/lesson/templates/override_action_menu.mustache
@@ -39,7 +39,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/report_action_menu.mustache b/mod/lesson/templates/report_action_menu.mustache
@@ -38,7 +38,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon":{
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/quiz/classes/output/renderer.php b/mod/quiz/classes/output/renderer.php
diff --git a/mod/quiz/templates/add_random_question_form.mustache b/mod/quiz/templates/add_random_question_form.mustache
diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
diff --git a/question/classes/local/bank/column_base.php b/question/classes/local/bank/column_base.php
diff --git a/question/templates/column_header.mustache b/question/templates/column_header.mustache
diff --git a/repository/filepicker.php b/repository/filepicker.php

Original file line number	Diff line number	Diff line change
`@@ -1004,7 +1004,7 @@ protected function release_notes_link() {`
`1004`	`1004`	`function upgrade_reload($url) {`
`1005`	`1005`	`return html_writer::empty_tag('br') .`
`1006`	`1006`	`html_writer::tag('div',`
`1007`		`- html_writer::link($url, $this->pix_icon('i/reload', '', '', array('class' => 'icon icon-pre')) .`
	`1007`	`+ html_writer::link($url, $this->pix_icon('i/reload', '', '', ['class' => 'icon']) .`
`1008`	`1008`	`get_string('reload'), array('title' => get_string('reload'))),`
`1009`	`1009`	`array('class' => 'continuebutton')) . html_writer::empty_tag('br');`
`1010`	`1010`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public function backup_details($details, $nextstageurl) {`
`203`	`203`	`$table->data = array();`
`204`	`204`	`}`
`205`	`205`	`$name = get_string('pluginname', $activity->modulename);`
`206`		`- $icon = new image_icon('monologo', '', $activity->modulename, ['class' => 'iconlarge icon-pre']);`
	`206`	`+ $icon = new image_icon('monologo', '', $activity->modulename);`
`207`	`207`	`$table->data[] = array(`
`208`	`208`	`$this->output->render($icon).$name,`
`209`	`209`	`$activity->title,`
Original file line number	Diff line number	Diff line change
`@@ -783,13 +783,13 @@ protected function helper_sortable_heading($text, $sortid = null, $sortby = null`
`783`	`783`	`$url = new moodle_url($this->page->url);`
`784`	`784`	`$url->params(array('sort' => $sortid, 'dir' => 'ASC'));`
`785`	`785`	`$out .= $this->output->action_icon($url,`
`786`		`- new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null, array('class' => 'iconsort')));`
	`786`	`+ new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null));`
`787`	`787`	`}`
`788`	`788`	`if ($sortby !== $sortid \|\| $sorthow !== 'DESC') {`
`789`	`789`	`$url = new moodle_url($this->page->url);`
`790`	`790`	`$url->params(array('sort' => $sortid, 'dir' => 'DESC'));`
`791`	`791`	`$out .= $this->output->action_icon($url,`
`792`		`- new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null, array('class' => 'iconsort')));`
	`792`	`+ new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null));`
`793`	`793`	`}`
`794`	`794`	`}`
`795`	`795`	`return $out;`