From 6dede51557ab96d0c233529602702b7d3f8caf24 Mon Sep 17 00:00:00 2001
From: Charles Fulton <fultonc@lafayette.edu>
Date: Mon, 24 Jul 2017 10:49:58 -0400
Subject: [PATCH 1/3] MDL-59492 block_myoverview: handle course visibility
 style

---
 blocks/myoverview/classes/output/courses_view.php             | 3 +++
 blocks/myoverview/templates/courses-view-course-item.mustache | 4 ++--
 .../block_myoverview/courses-view-course-item.mustache        | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/blocks/myoverview/classes/output/courses_view.php b/blocks/myoverview/classes/output/courses_view.php
index 2949c098d6b..9f16ea3c9e6 100644
--- a/blocks/myoverview/classes/output/courses_view.php
+++ b/blocks/myoverview/classes/output/courses_view.php
@@ -83,6 +83,9 @@ class courses_view implements renderable, templatable {
             // Convert summary to plain text.
             $exportedcourse->summary = content_to_text($exportedcourse->summary, $exportedcourse->summaryformat);
 
+            // Include course visibility.
+            $exportedcourse->visible = $course->visible;
+
             $courseprogress = null;
 
             $classified = course_classify_for_timeline($course);
diff --git a/blocks/myoverview/templates/courses-view-course-item.mustache b/blocks/myoverview/templates/courses-view-course-item.mustache
index b2f39a88d48..f2cde3cce82 100644
--- a/blocks/myoverview/templates/courses-view-course-item.mustache
+++ b/blocks/myoverview/templates/courses-view-course-item.mustache
@@ -31,7 +31,7 @@
         <div class="card-block course-info-container" id="course-info-container-{{id}}">
             <div class="hidden-sm-up hidden-phone">
                 {{> block_myoverview/progress-chart}}
-                <h4 class="h5"><a href="{{viewurl}}">{{{fullnamedisplay}}}</a></h4>
+                <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed_text{{/visible}}">{{{fullnamedisplay}}}</a></h4>
             </div>
             <div class="hidden-xs-down visible-phone">
                 <div class="media">
@@ -41,7 +41,7 @@
                         </div>
                     </div>
                     <div class="media-body">
-                        <h4 class="h5"><a href="{{viewurl}}">{{{fullnamedisplay}}}</a></h4>
+                        <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed_text{{/visible}}">{{{fullnamedisplay}}}</a></h4>
                     </div>
                 </div>
             </div>
diff --git a/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache b/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
index ba7c132f891..1efcb2290b4 100644
--- a/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
+++ b/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
@@ -35,7 +35,7 @@
                 </div>
             </div>
             <div class="media-body">
-                <h4 class="media-heading"><a href="{{viewurl}}">{{fullnamedisplay}}</a></h4>
+                <h4 class="media-heading"><a href="{{viewurl}}" class="{{^visible}}dimmed_text{{/visible}}">{{fullnamedisplay}}</a></h4>
             </div>
         </div>
         <p class="text-muted">

From 54798b5fbbad5c0d3cd127cdcd7c2d463f605b14 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Thu, 10 Aug 2017 10:44:09 +0800
Subject: [PATCH 2/3] MDL-59492 block_myoverview: fix remaining course links
 visibility

---
 blocks/myoverview/classes/output/courses_view.php           | 2 +-
 blocks/myoverview/templates/course-event-list.mustache      | 3 +++
 blocks/myoverview/templates/course-summary.mustache         | 6 +++---
 .../myoverview/templates/courses-view-course-item.mustache  | 4 ++--
 .../templates/block_myoverview/course-event-list.mustache   | 5 ++++-
 .../templates/block_myoverview/course-summary.mustache      | 4 ++--
 .../block_myoverview/courses-view-course-item.mustache      | 2 +-
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/blocks/myoverview/classes/output/courses_view.php b/blocks/myoverview/classes/output/courses_view.php
index 9f16ea3c9e6..2f8cb9aca07 100644
--- a/blocks/myoverview/classes/output/courses_view.php
+++ b/blocks/myoverview/classes/output/courses_view.php
@@ -84,7 +84,7 @@ class courses_view implements renderable, templatable {
             $exportedcourse->summary = content_to_text($exportedcourse->summary, $exportedcourse->summaryformat);
 
             // Include course visibility.
-            $exportedcourse->visible = $course->visible;
+            $exportedcourse->visible = (bool)$course->visible;
 
             $courseprogress = null;
 
diff --git a/blocks/myoverview/templates/course-event-list.mustache b/blocks/myoverview/templates/course-event-list.mustache
index 74922d68161..8b5a2dcaf6e 100644
--- a/blocks/myoverview/templates/course-event-list.mustache
+++ b/blocks/myoverview/templates/course-event-list.mustache
@@ -22,6 +22,9 @@
 
     Example context (json):
     {
+        "urls": {
+            "noevents": "#"
+        }
     }
 }}
 <div data-region="event-list-container"
diff --git a/blocks/myoverview/templates/course-summary.mustache b/blocks/myoverview/templates/course-summary.mustache
index 21368a7d53d..acc214b9b08 100644
--- a/blocks/myoverview/templates/course-summary.mustache
+++ b/blocks/myoverview/templates/course-summary.mustache
@@ -29,11 +29,11 @@
 <div class="course-info-container" id="course-info-container-{{id}}">
     <div class="hidden-sm-up hidden-tablet hidden-phone">
         {{> block_myoverview/progress-chart}}
-        <h4 class="h5"><a href="{{viewurl}}">{{{fullnamedisplay}}}</a></h4>
+        <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
     </div>
     <div class="hidden-sm-down hidden-tablet hidden-desktop">
         {{> block_myoverview/progress-chart}}
-        <h4 class="h5"><a href="{{viewurl}}">{{{fullnamedisplay}}}</a></h4>
+        <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
     </div>
     <div class="hidden-xs-down hidden-md-up visible-tablet">
         <div class="media">
@@ -43,7 +43,7 @@
                 </div>
             </div>
             <div class="media-body">
-                <h4 class="h5"><a href="{{viewurl}}">{{{fullnamedisplay}}}</a></h4>
+                <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
             </div>
         </div>
     </div>
diff --git a/blocks/myoverview/templates/courses-view-course-item.mustache b/blocks/myoverview/templates/courses-view-course-item.mustache
index f2cde3cce82..fd8a4fb0c74 100644
--- a/blocks/myoverview/templates/courses-view-course-item.mustache
+++ b/blocks/myoverview/templates/courses-view-course-item.mustache
@@ -31,7 +31,7 @@
         <div class="card-block course-info-container" id="course-info-container-{{id}}">
             <div class="hidden-sm-up hidden-phone">
                 {{> block_myoverview/progress-chart}}
-                <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed_text{{/visible}}">{{{fullnamedisplay}}}</a></h4>
+                <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
             </div>
             <div class="hidden-xs-down visible-phone">
                 <div class="media">
@@ -41,7 +41,7 @@
                         </div>
                     </div>
                     <div class="media-body">
-                        <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed_text{{/visible}}">{{{fullnamedisplay}}}</a></h4>
+                        <h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
                     </div>
                 </div>
             </div>
diff --git a/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache b/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
index f6bcb038fad..4742a536dea 100644
--- a/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
+++ b/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
@@ -22,6 +22,9 @@
 
     Example context (json):
     {
+         "urls": {
+            "noevents": "#"
+        }
     }
 }}
 <div data-region="event-list-container"
@@ -93,7 +96,7 @@
              alt="{{#str}} noevents, block_myoverview {{/str}}"
              role="presentation">
         <p class="text-muted m-t-1">{{#str}} noevents, block_myoverview {{/str}}</p>
-        <a href="{{viewurl}}" class="btn btn-secondary text-primary"
+        <a href="{{viewurl}}" class="btn btn-secondary {{#visible}}text-primary{{/visible}}"
            aria-label="{{#str}} viewcoursename, block_myoverview, {{fullnamedisplay}} {{/str}}">
             {{#str}} viewcourse, block_myoverview {{/str}}
         </a>
diff --git a/theme/bootstrapbase/templates/block_myoverview/course-summary.mustache b/theme/bootstrapbase/templates/block_myoverview/course-summary.mustache
index e799799af1e..e6c99b2d1f0 100644
--- a/theme/bootstrapbase/templates/block_myoverview/course-summary.mustache
+++ b/theme/bootstrapbase/templates/block_myoverview/course-summary.mustache
@@ -29,7 +29,7 @@
 <div class="course-info-container" id="course-info-container-{{id}}">
     <div class="visible-desktop">
         {{> block_myoverview/progress-chart}}
-        <h4><a href="{{viewurl}}">{{fullnamedisplay}}</a></h4>
+        <h4><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{fullnamedisplay}}</a></h4>
     </div>
     <div class="hidden-desktop">
         <div class="media">
@@ -39,7 +39,7 @@
                 </div>
             </div>
             <div class="media-body">
-                <h4 class="media-heading"><a href="{{viewurl}}">{{fullnamedisplay}}</a></h4>
+                <h4 class="media-heading"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{fullnamedisplay}}</a></h4>
             </div>
         </div>
     </div>
diff --git a/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache b/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
index 1efcb2290b4..d4c448ae3ef 100644
--- a/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
+++ b/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
@@ -35,7 +35,7 @@
                 </div>
             </div>
             <div class="media-body">
-                <h4 class="media-heading"><a href="{{viewurl}}" class="{{^visible}}dimmed_text{{/visible}}">{{fullnamedisplay}}</a></h4>
+                <h4 class="media-heading"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{fullnamedisplay}}</a></h4>
             </div>
         </div>
         <p class="text-muted">

From 1f9f277d3e4c6ac8f38f3274d109db78aaff1bb1 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Thu, 10 Aug 2017 10:59:22 +0800
Subject: [PATCH 3/3] MDL-59492 block_myoverview: make view course buttons
 consistent

---
 blocks/myoverview/templates/course-event-list.mustache          | 2 +-
 .../templates/block_myoverview/course-event-list.mustache       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blocks/myoverview/templates/course-event-list.mustache b/blocks/myoverview/templates/course-event-list.mustache
index 8b5a2dcaf6e..d9e729afb08 100644
--- a/blocks/myoverview/templates/course-event-list.mustache
+++ b/blocks/myoverview/templates/course-event-list.mustache
@@ -96,7 +96,7 @@
              alt="{{#str}} noevents, block_myoverview {{/str}}"
              role="presentation">
         <p class="text-muted m-t-1">{{#str}} noevents, block_myoverview {{/str}}</p>
-        <a href="{{viewurl}}" class="btn btn-secondary text-primary"
+        <a href="{{viewurl}}" class="btn btn-secondary {{#visible}}text-primary{{/visible}}"
            aria-label="{{#str}} viewcoursename, block_myoverview, {{fullnamedisplay}} {{/str}}">
             {{#str}} viewcourse, block_myoverview {{/str}}
         </a>
diff --git a/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache b/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
index 4742a536dea..45ea47e713e 100644
--- a/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
+++ b/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
@@ -96,7 +96,7 @@
              alt="{{#str}} noevents, block_myoverview {{/str}}"
              role="presentation">
         <p class="text-muted m-t-1">{{#str}} noevents, block_myoverview {{/str}}</p>
-        <a href="{{viewurl}}" class="btn btn-secondary {{#visible}}text-primary{{/visible}}"
+        <a href="{{viewurl}}" class="btn"
            aria-label="{{#str}} viewcoursename, block_myoverview, {{fullnamedisplay}} {{/str}}">
             {{#str}} viewcourse, block_myoverview {{/str}}
         </a>