From a8452c9d251e751e31d9e264ecce2e089c05515e Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Mon, 3 Oct 2022 12:40:04 +0200
Subject: [PATCH] MDL-75684 mod_data: Remove List/Single view headings

Apart from removing the "List view" and "Single view" h2 headings,
the presets and templates must be also reviewed to confirm no
heading is skipped (so h2 > h3 > h4 ...).

For the Journal preset, the "Reflections" heading has been removed
here too.
---
 mod/data/preset/imagegallery/rsstemplate.html    | 2 +-
 mod/data/preset/imagegallery/singletemplate.html | 2 +-
 mod/data/preset/journal/listtemplate.html        | 2 +-
 mod/data/preset/journal/rsstemplate.html         | 3 +--
 mod/data/preset/journal/singletemplate.html      | 5 ++---
 mod/data/preset/proposals/rsstemplate.html       | 6 +++---
 mod/data/preset/proposals/singletemplate.html    | 6 +++---
 mod/data/preset/resources/rsstemplate.html       | 4 ++--
 mod/data/preset/resources/singletemplate.html    | 4 ++--
 mod/data/view.php                                | 6 ------
 10 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/mod/data/preset/imagegallery/rsstemplate.html b/mod/data/preset/imagegallery/rsstemplate.html
index 18e25db10ee..b1a4e91015f 100644
--- a/mod/data/preset/imagegallery/rsstemplate.html
+++ b/mod/data/preset/imagegallery/rsstemplate.html
@@ -1,6 +1,6 @@
 <div class="imagegallery-rss">
     <div class="d-flex">
-        <h3 class="card-title">[[title]]</h3>
+        <h2 class="card-title">[[title]]</h2>
     </div>
     <div class="imagegallery-single-body">
         <div class="row singleentry-image">
diff --git a/mod/data/preset/imagegallery/singletemplate.html b/mod/data/preset/imagegallery/singletemplate.html
index 3d6589f3fcc..db023c38cca 100644
--- a/mod/data/preset/imagegallery/singletemplate.html
+++ b/mod/data/preset/imagegallery/singletemplate.html
@@ -1,6 +1,6 @@
 <div class="imagegallery-single">
     <div class="d-flex">
-        <h3 class="card-title">[[title]]</h3>
+        <h2 class="card-title">[[title]]</h2>
         <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
         <div class="my-auto">##actionsmenu##</div>
     </div>
diff --git a/mod/data/preset/journal/listtemplate.html b/mod/data/preset/journal/listtemplate.html
index 2e58d0b7e2e..b2776bf4a36 100644
--- a/mod/data/preset/journal/listtemplate.html
+++ b/mod/data/preset/journal/listtemplate.html
@@ -1,7 +1,7 @@
 <div class="card my-3">
     <div class="card-body">
         <div class="d-flex">
-            <h3 class="card-title">[[Title]]</h3>
+            <h2 class="card-title">[[Title]]</h2>
             <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
             <div class="my-auto">##actionsmenu##</div>
         </div>
diff --git a/mod/data/preset/journal/rsstemplate.html b/mod/data/preset/journal/rsstemplate.html
index 90521468818..2a3f6d51ee4 100644
--- a/mod/data/preset/journal/rsstemplate.html
+++ b/mod/data/preset/journal/rsstemplate.html
@@ -1,6 +1,6 @@
 <div class="journal-single">
     <div class="d-flex">
-        <h3 class="card-title">[[Title]]</h3>
+        <h2 class="card-title">[[Title]]</h2>
     </div>
     <div class="journal-single-body">
         <div class="row">
@@ -13,7 +13,6 @@
         </div>
         <div class="row singleentry-content">
             <div class="col">
-                <h4>Description</h4>
                 [[Content]]
             </div>
         </div>
diff --git a/mod/data/preset/journal/singletemplate.html b/mod/data/preset/journal/singletemplate.html
index 8d9bc608850..d975f3c17e5 100644
--- a/mod/data/preset/journal/singletemplate.html
+++ b/mod/data/preset/journal/singletemplate.html
@@ -1,6 +1,6 @@
 <div class="journal-single my-5">
     <div class="d-flex">
-        <h3 class="card-title">[[Title]]</h3>
+        <h2 class="card-title">[[Title]]</h2>
         <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
         <div class="my-auto">##actionsmenu##</div>
     </div>
@@ -14,8 +14,7 @@
             <div class="col">##timeadded##</div>
         </div>
         <div class="row singleentry-content">
-            <div class="col">
-                <h4 class="my-5">Reflections</h4>
+            <div class="col my-5">
                 [[Content]]
             </div>
         </div>
diff --git a/mod/data/preset/proposals/rsstemplate.html b/mod/data/preset/proposals/rsstemplate.html
index 2724369f704..3331b988020 100644
--- a/mod/data/preset/proposals/rsstemplate.html
+++ b/mod/data/preset/proposals/rsstemplate.html
@@ -1,6 +1,6 @@
 <div class="proposals-single">
     <div class="d-flex">
-        <h3 class="card-title">[[Title]]</h3>
+        <h2 class="card-title">[[Title]]</h2>
     </div>
     <div class="proposals-single-body">
         <div class="row">
@@ -13,12 +13,12 @@
         </div>
         <div class="row singleentry-summary">
             <div class="col">
-                <h4>Summary</h4>
+                <h3>Summary</h3>
                 [[Summary]]
             </div>
         </div>        <div class="row singleentry-content">
             <div class="col">
-                <h4>Description</h4>
+                <h3>Description</h3>
                 [[Content]]
             </div>
         </div>
diff --git a/mod/data/preset/proposals/singletemplate.html b/mod/data/preset/proposals/singletemplate.html
index 98a254995b5..7452a317e3e 100644
--- a/mod/data/preset/proposals/singletemplate.html
+++ b/mod/data/preset/proposals/singletemplate.html
@@ -1,6 +1,6 @@
 <div class="proposals-single my-5">
     <div class="d-flex">
-        <h3 class="card-title">[[Title]]</h3>
+        <h2 class="card-title">[[Title]]</h2>
         <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
         <div class="my-auto">##actionsmenu##</div>
     </div>
@@ -23,13 +23,13 @@
         </div>
         <div class="row singleentry-summary">
             <div class="col">
-                <h4 class="my-5">Summary</h4>
+                <h3 class="my-5">Summary</h3>
                 [[Summary]]
             </div>
         </div>
         <div class="row singleentry-content">
             <div class="col">
-                <h4 class="my-5">Content</h4>
+                <h3 class="my-5">Content</h3>
                 [[Content]]
             </div>
         </div>
diff --git a/mod/data/preset/resources/rsstemplate.html b/mod/data/preset/resources/rsstemplate.html
index 4096f11de72..0326f4cfb31 100644
--- a/mod/data/preset/resources/rsstemplate.html
+++ b/mod/data/preset/resources/rsstemplate.html
@@ -1,5 +1,5 @@
 <div class="resources-single my-5">
-    <h3 class="card-title">[[Title]]</h3>
+    <h2 class="card-title">[[Title]]</h2>
     <div class="resources-single-body my-5">
         <div class="d-flex">
             <div class="single-entry-header w-100">
@@ -21,7 +21,7 @@
 
         <div class="row singleentry-content">
             <div class="col">
-                <h4 class="my-5">Description</h4>
+                <h3 class="my-5">Description</h3>
                 [[Description]]
             </div>
         </div>
diff --git a/mod/data/preset/resources/singletemplate.html b/mod/data/preset/resources/singletemplate.html
index 40ce12d8751..4dcb7723947 100644
--- a/mod/data/preset/resources/singletemplate.html
+++ b/mod/data/preset/resources/singletemplate.html
@@ -1,6 +1,6 @@
 <div class="resources-single my-5">
     <div class="d-flex">
-        <h3 class="card-title">[[Title]]</h3>
+        <h2 class="card-title">[[Title]]</h2>
         <div class="ml-auto">##actionsmenu##</div>
     </div>
     <div class="resources-single-body my-5">
@@ -24,7 +24,7 @@
 
         <div class="row singleentry-content">
             <div class="col">
-                <h4 class="my-5">Description</h4>
+                <h3 class="my-5">Description</h3>
                 [[Description]]
             </div>
         </div>
diff --git a/mod/data/view.php b/mod/data/view.php
index f4caf7355fc..13ec9f551a1 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -397,12 +397,6 @@ if ($showactivity) {
         $actionbar = new \mod_data\output\action_bar($data->id, $pageurl);
         echo $actionbar->get_view_action_bar($hasrecords);
 
-        if ($mode === 'single') {
-            echo $OUTPUT->heading(get_string('singleview', 'mod_data'), 2, 'mb-4');
-        } else {
-            echo $OUTPUT->heading(get_string('listview', 'mod_data'), 2, 'mb-4');
-        }
-
         if ($groupmode) {
             $returnurl = new moodle_url('/mod/data/view.php', ['d' => $data->id, 'mode' => $mode, 'search' => s($search),
                 'sort' => s($sort), 'order' => s($order)]);