Merge branch 'MDL-86133-main' of https://github.com/roland04/moodle

public/course/format/classes/activityoverviewbase.php

@@ -18,6 +18,7 @@ namespace core_courseformat;
 
 use cm_info;
 use core\context\module as module_context;
+use core\output\local\properties\text_align;
 use core_completion\cm_completion_details;
 use core_courseformat\local\overview\overviewitem;
 use core_courseformat\output\local\overview\activityname;
@@ -283,6 +284,7 @@ abstract class activityoverviewbase {
                 name: $itemnames[$item->id],
                 value: $gradegrade->finalgrade,
                 content: grade_format_gradevalue($gradegrade->finalgrade, $item),
+                textalign: text_align::END,
             );
         }
         return $result;

public/mod/assign/classes/courseformat/overview.php

@@ -149,7 +149,7 @@ class overview extends \core_courseformat\activityoverviewbase {
                 'core',
                 ['count' => $submissions, 'total' => $total]
             ),
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 

public/mod/choice/classes/courseformat/overview.php

@@ -184,7 +184,6 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: get_string('studentwhoresponded', 'choice'),
             value: $studentwhoanswered,
             content: $overviewdialog,
-            textalign: text_align::CENTER,
         );
     }
 }

public/mod/data/classes/courseformat/overview.php

@@ -161,7 +161,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $this->stringmanager->get_string('totalentries', 'data'),
             value: $totalentries,
             content: $totalentries,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 
@@ -180,7 +180,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $this->stringmanager->get_string('myentries', 'data'),
             value: $totalmyentries,
             content: $totalmyentries,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 
@@ -198,7 +198,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $this->stringmanager->get_string('entries', 'data'),
             value: $totalentries,
             content: $totalentries,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 
@@ -216,7 +216,7 @@ class overview extends \core_courseformat\activityoverviewbase {
                 name: $this->stringmanager->get_string('comments', 'data'),
                 value: 0,
                 content: '-',
-                textalign: text_align::CENTER,
+                textalign: text_align::END,
             );
         }
 
@@ -227,7 +227,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $this->stringmanager->get_string('comments', 'data'),
             value: $totalcomments,
             content: $totalcomments,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 }

public/mod/feedback/classes/courseformat/overview.php

@@ -107,7 +107,7 @@ class overview extends \core_courseformat\activityoverviewbase {
         return new overviewitem(
             name: get_string('responses', 'mod_feedback'),
             value: $submissions,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 

public/mod/forum/classes/courseformat/overview.php

@@ -141,14 +141,13 @@ class overview extends \core_courseformat\activityoverviewbase {
         $content = new action_link(
             url: new url('/mod/forum/view.php', ['id' => $this->cm->id]),
             text: $totalreplies .' ' . $badge,
-            attributes: ['class' => button::SECONDARY_OUTLINE->classes()],
+            attributes: ['class' => button::BODY_OUTLINE->classes()],
         );
 
         return new overviewitem(
             name: $this->stringmanager->get_string('posts', 'mod_forum'),
             value: $totalreplies ? : '0',
             content: $content,
-            textalign: text_align::CENTER,
             alertcount: $unread,
             alertlabel: $alertlabel,
         );
@@ -335,7 +334,6 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $this->stringmanager->get_string('digesttype', 'mod_forum'),
             value: $options[$this->forum->maildigest] ?? '-',
             content: $content ?? '-',
-            textalign: text_align::CENTER,
         );
     }
 
@@ -352,7 +350,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $this->stringmanager->get_string('discussions', 'mod_forum'),
             value: $totaldiscussions,
             content: $totaldiscussions,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 

public/mod/h5pactivity/classes/courseformat/overview.php

@@ -107,7 +107,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: get_string('attempts', 'mod_h5pactivity'),
             value: $attempts,
             content: $attempts ?? '-',
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 
@@ -132,7 +132,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: get_string('attempted', 'mod_h5pactivity'),
             value: count($attempts),
             content: get_string('count_of_total', 'core', $params),
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 

public/mod/lesson/classes/courseformat/overview.php

@@ -124,6 +124,7 @@ class overview extends \core_courseformat\activityoverviewbase {
                 'core',
                 ['count' => $attemptedusers, 'total' => $totalusers]
             ),
+            textalign: text_align::END,
         );
     }
 
@@ -161,7 +162,6 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $this->stringmanager->get_string('totalattepmts', 'mod_lesson'),
             value: !empty($overviewdialog) ? $totalattempts : null,
             content: $overviewdialog ?? $totalattempts,
-            textalign: text_align::START,
         );
     }
 }

public/mod/wiki/classes/courseformat/overview.php

@@ -77,7 +77,7 @@ class overview extends \core_courseformat\activityoverviewbase {
         $content = new action_link(
             url: $url,
             text: $text,
-            attributes: ['class' => button::SECONDARY_OUTLINE->classes()],
+            attributes: ['class' => button::BODY_OUTLINE->classes()],
         );
 
         return new overviewitem(
@@ -124,7 +124,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: get_string('myentries', 'wiki'),
             value: $entriescount,
             content: $entriescount,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 
@@ -144,7 +144,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: $label,
             value: $entriescount,
             content: $entriescount,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 }

public/mod/workshop/classes/courseformat/overview.php

@@ -189,7 +189,7 @@ class overview extends \core_courseformat\activityoverviewbase {
                 name: get_string('submissions', 'workshop'),
                 value: 0,
                 content: '-',
-                textalign: text_align::CENTER,
+                textalign: text_align::END,
             );
         }
 
@@ -203,7 +203,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: get_string('submissions', 'workshop'),
             value: $submissions,
             content: $content,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 
@@ -227,7 +227,7 @@ class overview extends \core_courseformat\activityoverviewbase {
                 name: get_string('assessments', 'workshop'),
                 value: 0,
                 content: '-',
-                textalign: text_align::CENTER,
+                textalign: text_align::END,
             );
         }
 
@@ -241,7 +241,7 @@ class overview extends \core_courseformat\activityoverviewbase {
             name: get_string('assessments', 'workshop'),
             value: $assessments,
             content: $content,
-            textalign: text_align::CENTER,
+            textalign: text_align::END,
         );
     }
 }

public/theme/boost/scss/moodle/courseoverview.scss

@@ -7,8 +7,21 @@ $overviewdialogmaxwidth: 20rem !default;
 
 #course-overview-page {
     .table {
+        margin-bottom: 0;
         border-top: none;
+
+        td,
+        th {
+            padding: map-get($spacers, 2) map-get($spacers, 4);
+        }
+
+        tr:last-child {
+            td {
+                border-bottom: none;
+            }
+        }
     }
+
     table tbody td {
         align-content: center;
 

public/theme/boost/style/moodle.css

@@ -31806,8 +31806,16 @@ table.calendartable caption {
  * Course Overview page styles.
  */
 #course-overview-page .table {
+  margin-bottom: 0;
   border-top: none;
 }
+#course-overview-page .table td,
+#course-overview-page .table th {
+  padding: 0.5rem 1.5rem;
+}
+#course-overview-page .table tr:last-child td {
+  border-bottom: none;
+}
 #course-overview-page table tbody td {
   align-content: center;
 }

public/theme/classic/style/moodle.css

@@ -31806,8 +31806,16 @@ table.calendartable caption {
  * Course Overview page styles.
  */
 #course-overview-page .table {
+  margin-bottom: 0;
   border-top: none;
 }
+#course-overview-page .table td,
+#course-overview-page .table th {
+  padding: 0.5rem 1.5rem;
+}
+#course-overview-page .table tr:last-child td {
+  border-bottom: none;
+}
 #course-overview-page table tbody td {
   align-content: center;
 }