From a29135f883c33ee493f95c47992ae6ca90bfbf0a Mon Sep 17 00:00:00 2001
From: Mathew May <mathewm@hotmail.co.nz>
Date: Thu, 7 Feb 2019 13:45:12 +0800
Subject: [PATCH] MDL-63880 core_course: Move common templates to core_course

Remove repeated templates from myoverview, recentlyaccessedcourse &
starredcourses blocks.
---
 blocks/myoverview/amd/build/view.min.js       | Bin 6262 -> 6257 bytes
 blocks/myoverview/amd/src/view.js             |   2 +-
 .../myoverview/lang/en/block_myoverview.php   |   4 ++-
 blocks/myoverview/lang/en/deprecated.txt      |   3 +-
 .../myoverview/templates/no-courses.mustache  |  33 ------------------
 .../templates/placeholders.mustache           |  32 +++--------------
 .../amd/build/main.min.js                     | Bin 964 -> 922 bytes
 .../recentlyaccessedcourses/amd/src/main.js   |   8 ++---
 .../classes/output/main.php                   |   2 +-
 .../lang/en/block_recentlyaccessedcourses.php |   4 ++-
 .../lang/en/deprecated.txt                    |   1 +
 .../templates/main.mustache                   |   2 +-
 .../recentlyaccessedcourses-view.mustache     |  12 +++----
 blocks/starredcourses/amd/build/main.min.js   | Bin 891 -> 873 bytes
 blocks/starredcourses/amd/src/main.js         |   4 +--
 .../lang/en/block_starredcourses.php          |   3 +-
 blocks/starredcourses/lang/en/deprecated.txt  |   1 +
 .../templates/no-courses.mustache             |  28 ---------------
 .../templates/placeholder-course.mustache     |  26 --------------
 .../templates/view-cards.mustache             |  33 ------------------
 blocks/starredcourses/templates/view.mustache |   6 ++--
 .../templates/no-courses.mustache             |   8 ++---
 .../templates/placeholder-course.mustache     |   4 +--
 .../templates/view-cards.mustache             |   4 +--
 24 files changed, 42 insertions(+), 178 deletions(-)
 delete mode 100644 blocks/myoverview/templates/no-courses.mustache
 create mode 100644 blocks/recentlyaccessedcourses/lang/en/deprecated.txt
 create mode 100644 blocks/starredcourses/lang/en/deprecated.txt
 delete mode 100644 blocks/starredcourses/templates/no-courses.mustache
 delete mode 100644 blocks/starredcourses/templates/placeholder-course.mustache
 delete mode 100644 blocks/starredcourses/templates/view-cards.mustache
 rename {blocks/recentlyaccessedcourses => course}/templates/no-courses.mustache (80%)
 rename {blocks/recentlyaccessedcourses => course}/templates/placeholder-course.mustache (91%)
 rename {blocks/recentlyaccessedcourses => course}/templates/view-cards.mustache (95%)

diff --git a/blocks/myoverview/amd/build/view.min.js b/blocks/myoverview/amd/build/view.min.js
index dbce038b3f70309b12f455a111ac9fbab7e18b11..99b59c42b2053fa53f500c55dbb259f3d2856820 100644
GIT binary patch
delta 24
fcmexn@X=sH4KsIgeo<<Ca(-!1aq8wC=2s#Bh3pDj

delta 29
kcmexp@XcUD4YNQ}PJVKBd~RiaS!z*PW@`E7cIH<i0Kg{<i2wiq

diff --git a/blocks/myoverview/amd/src/view.js b/blocks/myoverview/amd/src/view.js
index f9d0e1db540..85c81e14861 100644
--- a/blocks/myoverview/amd/src/view.js
+++ b/blocks/myoverview/amd/src/view.js
@@ -64,7 +64,7 @@ function(
         COURSES_CARDS: 'block_myoverview/view-cards',
         COURSES_LIST: 'block_myoverview/view-list',
         COURSES_SUMMARY: 'block_myoverview/view-summary',
-        NOCOURSES: 'block_myoverview/no-courses'
+        NOCOURSES: 'core_course/no-courses'
     };
 
     var NUMCOURSES_PERPAGE = [12, 24, 48];
diff --git a/blocks/myoverview/lang/en/block_myoverview.php b/blocks/myoverview/lang/en/block_myoverview.php
index 75c38d39926..22c49e385f3 100644
--- a/blocks/myoverview/lang/en/block_myoverview.php
+++ b/blocks/myoverview/lang/en/block_myoverview.php
@@ -54,7 +54,6 @@ $string['lastaccessed'] = 'Last accessed';
 $string['list'] = 'List';
 $string['myoverview:addinstance'] = 'Add a new course overview block';
 $string['myoverview:myaddinstance'] = 'Add a new course overview block to Dashboard';
-$string['nocourses'] = 'No courses';
 $string['past'] = 'Past';
 $string['pluginname'] = 'Course overview';
 $string['privacy:metadata:overviewsortpreference'] = 'The Course overview block sort preference.';
@@ -90,3 +89,6 @@ $string['timeline'] = 'Timeline';
 $string['viewcoursename'] = 'View course {$a}';
 $string['privacy:metadata:overviewlasttab'] = 'This stores the last tab selected by the user on the overview block.';
 $string['viewcourse'] = 'View course';
+
+// Deprecated since Moodle 3.7.
+$string['nocourses'] = 'No courses';
\ No newline at end of file
diff --git a/blocks/myoverview/lang/en/deprecated.txt b/blocks/myoverview/lang/en/deprecated.txt
index 7927bbae523..4e22e76d8e7 100644
--- a/blocks/myoverview/lang/en/deprecated.txt
+++ b/blocks/myoverview/lang/en/deprecated.txt
@@ -12,4 +12,5 @@ sortbycourses,block_myoverview
 sortbydates,block_myoverview
 timeline,block_myoverview
 viewcoursename,block_myoverview
-privacy:metadata:overviewlasttab,block_myoverview
\ No newline at end of file
+privacy:metadata:overviewlasttab,block_myoverview
+nocourses,block_myoverview
\ No newline at end of file
diff --git a/blocks/myoverview/templates/no-courses.mustache b/blocks/myoverview/templates/no-courses.mustache
deleted file mode 100644
index ba52e4acdbd..00000000000
--- a/blocks/myoverview/templates/no-courses.mustache
+++ /dev/null
@@ -1,33 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template block_myoverview/no-courses
-
-    This template renders the no courses message.
-
-    Example context (json):
-    {
-        "nocoursesimg": "https://moodlesite/theme/image.php/boost/block_myoverview/1535727318/courses"
-    }
-}}
-<div class="text-xs-center text-center m-t-1" data-region="empty-message">
-    <img class="empty-placeholder-image-lg m-t-1"
-         src="{{nocoursesimg}}"
-         alt="{{#str}} nocourses, block_myoverview {{/str}}"
-         role="presentation">
-    <p class="text-muted mt-3">{{#str}} nocourses, block_myoverview {{/str}}</p>
-</div>
diff --git a/blocks/myoverview/templates/placeholders.mustache b/blocks/myoverview/templates/placeholders.mustache
index d61c9843703..5bbe7efffd3 100644
--- a/blocks/myoverview/templates/placeholders.mustache
+++ b/blocks/myoverview/templates/placeholders.mustache
@@ -25,34 +25,10 @@
 <div data-region="loading-placeholder-content" aria-hidden="true">
     {{#cards}}
     <div class="card-deck dashboard-card-deck one-row" style="height: 13rem">
-        <div class="card dashboard-card border-0">
-            <div class="card-img-top bg-pulse-grey w-100" style="height: 7rem">
-            </div>
-            <div class="card-body course-info-container">
-                <div class="bg-pulse-grey w-100" style="height: 1rem"></div>
-            </div>
-        </div>
-        <div class="card dashboard-card border-0">
-            <div class="card-img-top bg-pulse-grey w-100" style="height: 7rem">
-            </div>
-            <div class="card-body course-info-container">
-                <div class="bg-pulse-grey w-100" style="height: 1rem"></div>
-            </div>
-        </div>
-        <div class="card dashboard-card border-0">
-            <div class="card-img-top bg-pulse-grey w-100" style="height: 7rem">
-            </div>
-            <div class="card-body course-info-container">
-                <div class="bg-pulse-grey w-100" style="height: 1rem"></div>
-            </div>
-        </div>
-        <div class="card dashboard-card border-0">
-            <div class="card-img-top bg-pulse-grey w-100" style="height: 7rem">
-            </div>
-            <div class="card-body course-info-container">
-                <div class="bg-pulse-grey w-100" style="height: 1rem"></div>
-            </div>
-        </div>
+        {{> core_course/placeholder-course }}
+        {{> core_course/placeholder-course }}
+        {{> core_course/placeholder-course }}
+        {{> core_course/placeholder-course }}
     </div>
     {{/cards}}
     {{#list}}
diff --git a/blocks/recentlyaccessedcourses/amd/build/main.min.js b/blocks/recentlyaccessedcourses/amd/build/main.min.js
index 73692b57a9905363a15e90e668ec0567cdd52a70..583a92fca43eee9207da04363c1b43e65d068559 100644
GIT binary patch
delta 64
zcmX@YK8t-rGb49$eo<<Ca(-!1aq8p+jF$3Bn$|_BC8b4q3dwp!sd*`>MH))TYIvEX
KHfu4>Vgvx}0v164

delta 88
zcmbQmeuRBPGb3A4PJVKB{KOC9llvGgWlM{4lr*i2QcFsU@)VNwic<4ZQj0W{;EH7R
e^YV3*^Gl10Q;U^!s`K)p?9AMBpw>-Hvls!U^&t8H

diff --git a/blocks/recentlyaccessedcourses/amd/src/main.js b/blocks/recentlyaccessedcourses/amd/src/main.js
index 70e679eb924..16698513627 100644
--- a/blocks/recentlyaccessedcourses/amd/src/main.js
+++ b/blocks/recentlyaccessedcourses/amd/src/main.js
@@ -69,13 +69,13 @@ define(
          */
         var renderCourses = function(root, courses) {
             if (courses.length > 0) {
-                return Templates.render('block_recentlyaccessedcourses/view-cards', {
+                return Templates.render('core_course/view-cards', {
                     courses: courses
                 });
             } else {
-                var nocoursesimgurl = root.attr('data-nocoursesimgurl');
-                return Templates.render('block_recentlyaccessedcourses/no-courses', {
-                    nocoursesimgurl: nocoursesimgurl
+                var nocoursesimgurl = root.attr('data-nocoursesimg');
+                return Templates.render('core_course/no-courses', {
+                    nocoursesimg: nocoursesimgurl
                 });
             }
         };
diff --git a/blocks/recentlyaccessedcourses/classes/output/main.php b/blocks/recentlyaccessedcourses/classes/output/main.php
index 09bbe0374e5..06eb28265c2 100644
--- a/blocks/recentlyaccessedcourses/classes/output/main.php
+++ b/blocks/recentlyaccessedcourses/classes/output/main.php
@@ -49,7 +49,7 @@ class main implements renderable, templatable {
 
         return [
             'userid' => $USER->id,
-            'nocoursesimgurl' => $nocoursesurl
+            'nocoursesimg' => $nocoursesurl
         ];
     }
 }
diff --git a/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php b/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php
index 9730dcda123..74fef63895c 100644
--- a/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php
+++ b/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php
@@ -20,8 +20,10 @@
  * @copyright  2018 Victor Deniz <victor@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-$string['nocourses'] = 'No recent courses';
 $string['pluginname'] = 'Recently accessed courses';
 $string['privacy:metadata'] = 'The Recently accessed courses block does not store any personal data.';
 $string['recentlyaccessedcourses:addinstance'] = 'Add a new Recently accessed courses block';
 $string['recentlyaccessedcourses:myaddinstance'] = 'Add a new recently accessed courses block to Dashboard';
+
+// Deprecated since Moodle 3.7.
+$string['nocourses'] = 'No recent courses';
\ No newline at end of file
diff --git a/blocks/recentlyaccessedcourses/lang/en/deprecated.txt b/blocks/recentlyaccessedcourses/lang/en/deprecated.txt
new file mode 100644
index 00000000000..26e3fd98fcc
--- /dev/null
+++ b/blocks/recentlyaccessedcourses/lang/en/deprecated.txt
@@ -0,0 +1 @@
+nocourses,block_recentlyaccessedcourses
\ No newline at end of file
diff --git a/blocks/recentlyaccessedcourses/templates/main.mustache b/blocks/recentlyaccessedcourses/templates/main.mustache
index 22a86485fad..84e64d532eb 100644
--- a/blocks/recentlyaccessedcourses/templates/main.mustache
+++ b/blocks/recentlyaccessedcourses/templates/main.mustache
@@ -22,7 +22,7 @@
     Example context (json):
     {
         "userid": 2,
-        "nocoursesimgurl": "https://moodlesite/theme/image.php/boost/block_recentlyaccessedcourses/1535727318/courses"
+        "nocoursesimg": "https://moodlesite/theme/image.php/boost/block_recentlyaccessedcourses/1535727318/courses"
     }
 }}
 
diff --git a/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache b/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache
index b2771542aa6..ec44daea4b2 100644
--- a/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache
+++ b/blocks/recentlyaccessedcourses/templates/recentlyaccessedcourses-view.mustache
@@ -21,19 +21,19 @@
 
     Example context (json):
     {
-        "nocoursesimgurl": "https://moodlesite/theme/image.php/boost/block_recentlyaccessedcourses/1535727318/courses"
+        "nocoursesimg": "https://moodlesite/theme/image.php/boost/block_recentlyaccessedcourses/1535727318/courses"
     }
 }}
 <div id="recentlyaccessedcourses-view-{{uniqid}}"
      data-region="recentlyaccessedcourses-view"
-     data-nocoursesimgurl="{{nocoursesimgurl}}">
+     data-nocoursesimg="{{nocoursesimg}}">
     <div data-region="recentlyaccessedcourses-view-content">
         <div data-region="recentlyaccessedcourses-loading-placeholder">
             <div class="card-deck dashboard-card-deck one-row" style="height: 11.1rem">
-                {{> block_recentlyaccessedcourses/placeholder-course }}
-                {{> block_recentlyaccessedcourses/placeholder-course }}
-                {{> block_recentlyaccessedcourses/placeholder-course }}
-                {{> block_recentlyaccessedcourses/placeholder-course }}
+                {{> core_course/placeholder-course }}
+                {{> core_course/placeholder-course }}
+                {{> core_course/placeholder-course }}
+                {{> core_course/placeholder-course }}
             </div>
         </div>
     </div>
diff --git a/blocks/starredcourses/amd/build/main.min.js b/blocks/starredcourses/amd/build/main.min.js
index 8ebbc6867bace0cb8a5421cde8d541a110e5a75c..b06e02218543eb30fa9ce63ca5e54c9607931fbd 100644
GIT binary patch
delta 40
lcmey(_L6Nw5F>YTeo<<Ca(-!1aq8qW#zJKN=GTl97y(3x57z(y

delta 58
vcmaFK_M2@(5Ti&^PJVKBd~r!)QBi72a(-!1acc48SjIxE5}R)_PGAH8u3#5p

diff --git a/blocks/starredcourses/amd/src/main.js b/blocks/starredcourses/amd/src/main.js
index 81d413003e1..db7c0ce6149 100644
--- a/blocks/starredcourses/amd/src/main.js
+++ b/blocks/starredcourses/amd/src/main.js
@@ -53,12 +53,12 @@ function(
      */
     var renderCourses = function(root, courses) {
         if (courses.length > 0) {
-            return Templates.render('block_starredcourses/view-cards', {
+            return Templates.render('core_course/view-cards', {
                 courses: courses
             });
         } else {
             var nocoursesimg = root.find(SELECTORS.STARRED_COURSES_REGION_VIEW).attr('data-nocoursesimg');
-            return Templates.render('block_starredcourses/no-courses', {
+            return Templates.render('core_course/no-courses', {
                 nocoursesimg: nocoursesimg
             });
         }
diff --git a/blocks/starredcourses/lang/en/block_starredcourses.php b/blocks/starredcourses/lang/en/block_starredcourses.php
index 72040e2b500..519693d65e2 100644
--- a/blocks/starredcourses/lang/en/block_starredcourses.php
+++ b/blocks/starredcourses/lang/en/block_starredcourses.php
@@ -22,9 +22,10 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['nocourses'] = 'No starred courses';
 $string['pluginname'] = 'Starred courses';
 $string['privacy:metadata'] = 'The starred courses block does not store any personal data.';
 $string['starredcourses:addinstance'] = 'Add a new starred courses block';
 $string['starredcourses:myaddinstance'] = 'Add a new starred courses block to Dashboard';
 
+// Deprecated since Moodle 3.7.
+$string['nocourses'] = 'No starred courses';
\ No newline at end of file
diff --git a/blocks/starredcourses/lang/en/deprecated.txt b/blocks/starredcourses/lang/en/deprecated.txt
new file mode 100644
index 00000000000..b39db611ce9
--- /dev/null
+++ b/blocks/starredcourses/lang/en/deprecated.txt
@@ -0,0 +1 @@
+nocourses,block_starredcourses
\ No newline at end of file
diff --git a/blocks/starredcourses/templates/no-courses.mustache b/blocks/starredcourses/templates/no-courses.mustache
deleted file mode 100644
index a00de4eee3e..00000000000
--- a/blocks/starredcourses/templates/no-courses.mustache
+++ /dev/null
@@ -1,28 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-     Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-     Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-     You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template block_starredcourses/no-courses
-     This template renders the no courses message.
-     Example context (json):
-    {
-        "nocoursesimg": "https://moodlesite/theme/image.php/boost/block_recentcourses/1535727318/courses"
-    }
-}}
-<div class="text-xs-center text-center m-t-3" data-region="empty-message">
-    <img class="empty-placeholder-image-lg m-t-1"
-         src="{{nocoursesimg}}"
-         alt="{{#str}} nocourses, block_starredcourses {{/str}}"
-         role="presentation">
-    <p class="text-muted mt-3">{{#str}} nocourses, block_starredcourses {{/str}}</p>
-</div>
diff --git a/blocks/starredcourses/templates/placeholder-course.mustache b/blocks/starredcourses/templates/placeholder-course.mustache
deleted file mode 100644
index 3ce061eb579..00000000000
--- a/blocks/starredcourses/templates/placeholder-course.mustache
+++ /dev/null
@@ -1,26 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-     Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-     Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-     You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template block_starredcourses/placeholder-course
-     This template renders an course card item loading placeholder for the starred courses block.
-     Example context (json):
-    {}
-}}
-<div class="card dashboard-card border-0">
-    <div class="card-img-top bg-pulse-grey w-100" style="height: 7rem">
-    </div>
-    <div class="card-body recent-course-info-container">
-        <div class="bg-pulse-grey w-100" style="height: 1rem"></div>
-    </div>
-</div>
diff --git a/blocks/starredcourses/templates/view-cards.mustache b/blocks/starredcourses/templates/view-cards.mustache
deleted file mode 100644
index b84d24eebeb..00000000000
--- a/blocks/starredcourses/templates/view-cards.mustache
+++ /dev/null
@@ -1,33 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-     Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-     Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-     You should have received a copy of the GNU General Public Licensebllsdsadfasfd
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template block_starredcourses/view-cards
-     This template renders the carousel for the starredcourses block.
-     Example context (json):
-    {
-        "courses": [
-            {
-                "name": "Assignment due 1",
-                "viewurl": "https://moodlesite/course/view.php?id=2",
-                "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg",
-                "fullname": "course 3"
-            }
-        ]
-    }
-}}
-
-{{< core_course/coursecards }}
-    {{$classes}}one-row{{/classes}}
-    {{$coursename}} {{fullname}} {{/coursename}}
-{{/ core_course/coursecards }}
diff --git a/blocks/starredcourses/templates/view.mustache b/blocks/starredcourses/templates/view.mustache
index 7046b9626bc..fd2f548fa6a 100644
--- a/blocks/starredcourses/templates/view.mustache
+++ b/blocks/starredcourses/templates/view.mustache
@@ -30,9 +30,9 @@
     <div data-region="starred-courses-view-content">
         <div data-region="starred-courses-loading-placeholder">
             <div class="card-deck dashboard-card-deck one-row" style="height: 11.1rem">
-                {{> block_starredcourses/placeholder-course }}
-                {{> block_starredcourses/placeholder-course }}
-                {{> block_starredcourses/placeholder-course }}
+                {{> core_course/placeholder-course }}
+                {{> core_course/placeholder-course }}
+                {{> core_course/placeholder-course }}
             </div>
         </div>
     </div>
diff --git a/blocks/recentlyaccessedcourses/templates/no-courses.mustache b/course/templates/no-courses.mustache
similarity index 80%
rename from blocks/recentlyaccessedcourses/templates/no-courses.mustache
rename to course/templates/no-courses.mustache
index 27ab207dad3..35eda3d45d0 100644
--- a/blocks/recentlyaccessedcourses/templates/no-courses.mustache
+++ b/course/templates/no-courses.mustache
@@ -15,7 +15,7 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    @template block_recentlyaccessedcourses/no-courses
+    @template core_course/no-courses
 
     This template renders the no courses message.
 
@@ -26,8 +26,8 @@
 }}
 <div class="text-xs-center text-center m-t-3" data-region="empty-message">
     <img class="empty-placeholder-image-lg m-t-1"
-         src="{{nocoursesimgurl}}"
-         alt="{{#str}} nocourses, block_recentlyaccessedcourses {{/str}}"
+         src="{{nocoursesimg}}"
+         alt="{{#str}} nocourses, core {{/str}}"
          role="presentation">
-    <p class="text-muted mt-3">{{#str}} nocourses, block_recentlyaccessedcourses {{/str}}</p>
+    <p class="text-muted mt-3">{{#str}} nocourses, core {{/str}}</p>
 </div>
\ No newline at end of file
diff --git a/blocks/recentlyaccessedcourses/templates/placeholder-course.mustache b/course/templates/placeholder-course.mustache
similarity index 91%
rename from blocks/recentlyaccessedcourses/templates/placeholder-course.mustache
rename to course/templates/placeholder-course.mustache
index 63c455df72b..ce1549a8768 100644
--- a/blocks/recentlyaccessedcourses/templates/placeholder-course.mustache
+++ b/course/templates/placeholder-course.mustache
@@ -15,9 +15,9 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    @template block_recentlyaccessedcourses/placeholder-course
+    @template core_course/placeholder-course
 
-    This template renders an course card item loading placeholder for the recentlyaccessedcourses block.
+    This template renders an course card item loading placeholder for multiple blocks.
 
     Example context (json):
     {}
diff --git a/blocks/recentlyaccessedcourses/templates/view-cards.mustache b/course/templates/view-cards.mustache
similarity index 95%
rename from blocks/recentlyaccessedcourses/templates/view-cards.mustache
rename to course/templates/view-cards.mustache
index 297ff6f2be9..d4844b933c2 100644
--- a/blocks/recentlyaccessedcourses/templates/view-cards.mustache
+++ b/course/templates/view-cards.mustache
@@ -15,9 +15,9 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    @template block_recentlyaccessedcourses/view-cards
+    @template core_course/view-cards
 
-    This template renders the carousel for the recentlyaccessedcourses block.
+    This template renders the carousel for the recentlyaccessedcourses & starredcourses blocks.
 
     Example context (json):
     {
-- 
2.17.1