From 678a2bc29b14ee934ebee7807851a000459a771d Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya@moodle.com>
Date: Wed, 26 Oct 2022 10:11:54 +0300
Subject: [PATCH] MDL-75423 gradereport_singleview: Styling fixes.

---
 grade/lib.php                                         |  2 +-
 grade/renderer.php                                    |  2 +-
 .../classes/local/ui/checkbox_attribute.php           |  3 ++-
 grade/report/singleview/classes/report/singleview.php |  2 +-
 grade/report/singleview/index.php                     |  2 +-
 grade/report/singleview/styles.css                    | 11 +++++++++--
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/grade/lib.php b/grade/lib.php
index 5bf3c18c09e..4ec636eae57 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -1716,7 +1716,7 @@ class grade_structure {
      * @param grade_grade $grade A grade_grade object
      * @return string
      */
-    public function get_grade_action_menu(grade_grade $grade) {
+    public function get_grade_action_menu(grade_grade $grade) : string {
         global $OUTPUT;
 
         $menuitems = [];
diff --git a/grade/renderer.php b/grade/renderer.php
index ee9a9ff0b54..49aba778eb4 100644
--- a/grade/renderer.php
+++ b/grade/renderer.php
@@ -93,7 +93,7 @@ class core_grades_renderer extends plugin_renderer_base {
      * @param bool $showbuttons Whether to display buttons (message, add to contacts) within the heading.
      * @return string The raw HTML to render.
      */
-    public function user_heading(stdClass $user, int $courseid, bool $showbuttons = true) {
+    public function user_heading(stdClass $user, int $courseid, bool $showbuttons = true) : string {
         global $USER;
 
         $headingdata = [
diff --git a/grade/report/singleview/classes/local/ui/checkbox_attribute.php b/grade/report/singleview/classes/local/ui/checkbox_attribute.php
index e1983eff2ae..9d5a47853a8 100644
--- a/grade/report/singleview/classes/local/ui/checkbox_attribute.php
+++ b/grade/report/singleview/classes/local/ui/checkbox_attribute.php
@@ -110,7 +110,8 @@ class checkbox_attribute extends element {
                 html_writer::empty_tag('input', $hidden)
             );
         } else if ($this->ischecked) {
-            return $OUTPUT->pix_icon('i/checked', get_string('selected', 'core_form'));
+            return $OUTPUT->pix_icon('i/checked', get_string('selected', 'core_form'),
+                'moodle', ['class' => 'overrideexcludecheck']);
         } else {
             return '';
         }
diff --git a/grade/report/singleview/classes/report/singleview.php b/grade/report/singleview/classes/report/singleview.php
index 6e32756c2bc..d36cedc023f 100644
--- a/grade/report/singleview/classes/report/singleview.php
+++ b/grade/report/singleview/classes/report/singleview.php
@@ -142,7 +142,7 @@ class singleview extends grade_report {
     }
 
     /**
-     * Function used to set the the appropriate item selector (raw HTML) based on the selected single view item type.
+     * Function used to set the appropriate item selector (raw HTML) based on the selected single view item type.
      *
      * @param string $itemtype The single view item type.
      * @param int|null $itemid The item ID.
diff --git a/grade/report/singleview/index.php b/grade/report/singleview/index.php
index 936e540e2bb..f03a4134cfe 100644
--- a/grade/report/singleview/index.php
+++ b/grade/report/singleview/index.php
@@ -121,7 +121,7 @@ if ($itemtype == 'user') {
         true, null, null, $report->screen->item, $actionbar);
 } else {
     print_grade_page_head($course->id, 'report', 'singleview', $reportname, false, $button,
-        true, null, null, null, $actionbar);
+        true, null, null, null, $actionbar, false);
 }
 
 if ($data = data_submitted()) {
diff --git a/grade/report/singleview/styles.css b/grade/report/singleview/styles.css
index 1d2a91cd8ad..1ca310c3034 100644
--- a/grade/report/singleview/styles.css
+++ b/grade/report/singleview/styles.css
@@ -24,7 +24,7 @@
 }
 
 .path-grade-report-singleview div.reporttable form div {
-    text-align: center;
+    text-align: left;
 }
 
 .path-grade-report-singleview .singleview_buttons {
@@ -32,7 +32,14 @@
 }
 
 .path-grade-report-singleview div.reporttable h2 {
-    text-align: center;
+    text-align: left;
+}
+
+
+.overrideexcludecheck {
+    width: 14.75px;
+    height: 12px;
+    color: #2ca14f;
 }
 
 .path-grade-report-singleview .reporttable tbody th,