mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59492-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2017-08-14 12:16:08 +08:00
commit cc012017ad
7 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blocks/myoverview/classes/output/courses_view.php
View File

@ -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 = (bool)$course->visible;
$courseprogress = null;
$classified = course_classify_for_timeline($course);

5
blocks/myoverview/templates/course-event-list.mustache
View File

@ -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>

6
blocks/myoverview/templates/course-summary.mustache
View File

@ -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>

4
blocks/myoverview/templates/courses-view-course-item.mustache
View File

@ -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{{/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{{/visible}}">{{{fullnamedisplay}}}</a></h4>
</div>
</div>
</div>

5
theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
View File

@ -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"
aria-label="{{#str}} viewcoursename, block_myoverview, {{fullnamedisplay}} {{/str}}">
{{#str}} viewcourse, block_myoverview {{/str}}
</a>

4
theme/bootstrapbase/templates/block_myoverview/course-summary.mustache
View File

@ -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>

2
theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
View File

@ -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{{/visible}}">{{fullnamedisplay}}</a></h4>
</div>
</div>
<p class="text-muted">