Revert "Issue #358: Added some extra styling for outage icons"

.github/workflows/ci.yml

@@ -8,4 +8,5 @@ jobs:
     uses: catalyst/catalyst-moodle-workflows/.github/workflows/ci.yml@main
     secrets:
       moodle_org_token: ${{ secrets.MOODLE_ORG_TOKEN }}
-
+    with:
+      disable_behat: true

classes/output/manage/base_table.php

@@ -77,7 +77,12 @@ class base_table extends flexible_table {
         // View button.
         $buttons .= html_writer::link(
             new moodle_url('/auth/outage/info.php', ['id' => $outage->id]),
-            $OUTPUT->pix_icon('t/preview', get_string('view'), 'moodle', array('class' => 'iconsmall')),
+            html_writer::empty_tag('img', [
+                'src' => $OUTPUT->image_url('t/preview'),
+                'alt' => get_string('view'),
+                'class' => 'iconsmall',
+
+            ]),
             [
                 'title' => get_string('view'),
                 'target' => '_blank',
@@ -88,7 +93,11 @@ class base_table extends flexible_table {
         if ($editdelete) {
             $buttons .= html_writer::link(
                 new moodle_url('/auth/outage/edit.php', ['edit' => $outage->id]),
-                $OUTPUT->pix_icon('t/edit', get_string('edit'), 'moodle', array('class' => 'iconsmall')),
+                html_writer::empty_tag('img', [
+                    'src' => $OUTPUT->image_url('t/edit'),
+                    'alt' => get_string('edit'),
+                    'class' => 'iconsmall',
+                ]),
                 ['title' => get_string('edit')]
             );
         }
@@ -96,7 +105,12 @@ class base_table extends flexible_table {
         // Clone button.
         $buttons .= html_writer::link(
             new moodle_url('/auth/outage/edit.php', ['clone' => $outage->id]),
-            $OUTPUT->pix_icon('t/copy', get_string('clone', 'auth_outage'), 'moodle', array('class' => 'iconsmall')),
+            html_writer::empty_tag('img', [
+                'src' => $OUTPUT->image_url('t/copy'),
+                'alt' => get_string('clone', 'auth_outage'),
+                'class' => 'iconsmall',
+
+            ]),
             ['title' => get_string('clone', 'auth_outage')]
         );
 
@@ -104,7 +118,11 @@ class base_table extends flexible_table {
         if ($outage->is_ongoing()) {
             $buttons .= html_writer::link(
                 new moodle_url('/auth/outage/finish.php', ['id' => $outage->id]),
-                $OUTPUT->pix_icon('t/check', get_string('finish', 'auth_outage'), 'moodle', array('class' => 'iconsmall')),
+                html_writer::empty_tag('img', [
+                    'src' => $OUTPUT->image_url('t/check'),
+                    'alt' => get_string('finish', 'auth_outage'),
+                    'class' => 'iconsmall',
+                ]),
                 ['title' => get_string('finish', 'auth_outage')]
             );
         }
@@ -113,7 +131,11 @@ class base_table extends flexible_table {
         if ($editdelete) {
             $buttons .= html_writer::link(
                 new moodle_url('/auth/outage/delete.php', ['id' => $outage->id]),
-                $OUTPUT->pix_icon('t/delete', get_string('delete'), 'moodle', array('class' => 'iconsmall')),
+                html_writer::empty_tag('img', [
+                    'src' => $OUTPUT->image_url('t/delete'),
+                    'alt' => get_string('delete'),
+                    'class' => 'iconsmall',
+                ]),
                 ['title' => get_string('delete')]
             );
         }

views/warningbar/warningbar.php

@@ -47,15 +47,17 @@ if (!$viewbag['static']) {
         ['target' => '_blank', 'class' => 'auth_outage_warningbar_box_title']
     );
     if (is_siteadmin()) {
-        $link = html_writer::link(
-            new moodle_url('/auth/outage/finish.php', ['id' => $viewbag['outage']->id]),
-            $OUTPUT->pix_icon('t/check', get_string('finish', 'auth_outage'), 'moodle', array('class' => 'iconsmall')) . get_string('finish', 'auth_outage'),
-            [
-                'title' => get_string('finish', 'auth_outage'),
-                'class' => 'auth_outage_warningbar_box_finish',
-            ]
-        );
-        $title .= ' '.html_writer::span($link, '', ['id' => 'auth_outage_warningbar_button']);
+        $url = new moodle_url('/auth/outage/finish.php', ['id' => $viewbag['outage']->id]);
+        $text = html_writer::empty_tag('img', [
+                'src' => $OUTPUT->image_url('t/check'),
+                'alt' => get_string('finish', 'auth_outage'),
+                'class' => 'iconsmall',
+            ]).' '.get_string('finish', 'auth_outage');
+        $attr = [
+            'title' => get_string('finish', 'auth_outage'),
+            'class' => 'auth_outage_warningbar_box_finish',
+        ];
+        $title .= ' '.html_writer::span(html_writer::link($url, $text, $attr), '', ['id' => 'auth_outage_warningbar_button']);
     }
 }
 ?>