Merge branch 'wip-MDL-58671-double-escaping-in-course-overview' of https://github.com/marcusgreen/moodle

This commit is contained in:
Dan Poltawski 2017-04-27 17:02:12 +01:00
commit e6dd8f32f5
4 changed files with 9 additions and 9 deletions

View File

@ -46,7 +46,7 @@
{{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}
</div>
<div class="d-inline-block event-name-container">
<a class="event-name text-truncate" href="{{{url}}}">{{name}}</a>
<a class="event-name text-truncate" href="{{{url}}}">{{{name}}}</a>
<p class="small text-muted text-truncate m-b-0">
{{#userdate}} {{timesort}}, {{#str}} strftimerecent {{/str}} {{/userdate}}
</p>

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}}">{{{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}}">{{{fullnamedisplay}}}</a></h4>
</div>
<div class="hidden-xs-down hidden-md-up visible-tablet">
<div class="media">
@ -43,11 +43,11 @@
</div>
</div>
<div class="media-body">
<h4 class="h5"><a href="{{viewurl}}">{{fullnamedisplay}}</a></h4>
<h4 class="h5"><a href="{{viewurl}}">{{{fullnamedisplay}}}</a></h4>
</div>
</div>
</div>
<p class="text-muted">
{{#shortentext}} 140, {{summary}}{{/shortentext}}
{{#shortentext}} 140, {{{summary}}}{{/shortentext}}
</p>
</div>

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

View File

@ -48,8 +48,8 @@
{{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}
</div>
<div class="d-inline-block event-name-container">
<a class="event-name text-truncate" href="{{{url}}}">{{name}}</a>
<p class="small text-muted text-truncate m-b-0">{{course.fullnamedisplay}}</p>
<a class="event-name text-truncate" href="{{{url}}}">{{{name}}}</a>
<p class="small text-muted text-truncate m-b-0">{{{course.fullnamedisplay}}}</p>
</div>
</div>
<div class="col-sm-4 col-lg-6 col-xl-5">