Skip to content

Commit

Permalink
Improvement: Fix more mustache linter warnings, solves #360. (#361)
Browse files Browse the repository at this point in the history
  • Loading branch information
abias authored Aug 20, 2023
1 parent 8dc7e37 commit f5d5932
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Changes

### Unreleased

* 2023-08-19 - Improvement: Fix more mustache linter warnings, solves #360.
* 2023-08-02 - Improvement: Add 'aboutus', 'offers', 'page1', 'page2' and 'page3' static pages, solves #351.
* 2023-08-19 - Bugfix: Fix unparsable example JSON in Mustache template, solves #348.
* 2023-08-18 - Improvement: Add CSS and Scripts for local_och5p local_och5pcore to the theme renderer.
Expand Down
2 changes: 1 addition & 1 deletion templates/course-hint-guestaccess.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div class="media-body align-self-center">
{{#str}} showhintcourseguestaccessgeneral, theme_boost_union, { "role": "{{role}}" } {{/str}}
{{#showselfenrollink}}
<br />{{#str}} showhintcourseguestaccesslink, theme_boost_union, { "url": "{{config.wwwroot}}/enrol/index.php?id={{courseid}}" } {{/str}}
<br>{{#str}} showhintcourseguestaccesslink, theme_boost_union, { "url": "{{config.wwwroot}}/enrol/index.php?id={{courseid}}" } {{/str}}
{{/showselfenrollink}}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/course-hint-hidden.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="media-body align-self-center">
{{#str}} showhintcoursehiddengeneral, theme_boost_union {{/str}}
{{#showcoursesettingslink}}
<br />{{#str}} showhintcoursehiddensettingslink, theme_boost_union, { "url": "{{config.wwwroot}}/course/edit.php?id={{courseid}}" } {{/str}}
<br>{{#str}} showhintcoursehiddensettingslink, theme_boost_union, { "url": "{{config.wwwroot}}/course/edit.php?id={{courseid}}" } {{/str}}
{{/showcoursesettingslink}}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/course-hint-selfenrol.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<div class="media-body align-self-center">
{{{selfenrolhintstart}}}
{{#selfenrolinstances}}
<br />{{{.}}}
<br>{{{.}}}
{{/selfenrolinstances}}
{{#calltoaction}}
<br />{{#str}} showhintcourseselfenrolinstancecallforaction, theme_boost_union {{/str}}
<br>{{#str}} showhintcourseselfenrolinstancecallforaction, theme_boost_union {{/str}}
{{/calltoaction}}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/course-hint-switchedrole.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div class="mr-3 icon-size-5"><i class="fa fa-exclamation-circle fa-3x"></i></div>
<div class="media-body align-self-center">
{{#str}} switchedroleto, theme_boost_union, { "role": "{{role}}" } {{/str}}
<br /><a href="{{{url}}}" class="switched-role-backlink">{{#str}} switchrolereturn, core {{/str}}</a>
<br><a href="{{{url}}}" class="switched-role-backlink">{{#str}} switchrolereturn, core {{/str}}</a>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions templates/settings-additionalresources-filelist.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
{{{fileicon}}}
<div class="ml-2">
<h6 class="mb-0">{{filename}}</h6>
<small>{{#str}}mimetype, tool_filetypes{{/str}}: {{filetype}}</small><br />
<small>{{#str}}size, repository{{/str}}: {{filesize}}</small><br />
<small>{{#str}}additionalresourcesfileurlpersistent, theme_boost_union{{/str}}: <a href="{{fileurlpersistent}}">{{fileurlpersistent}}</a></small><br />
<small>{{#str}}mimetype, tool_filetypes{{/str}}: {{filetype}}</small><br>
<small>{{#str}}size, repository{{/str}}: {{filesize}}</small><br>
<small>{{#str}}additionalresourcesfileurlpersistent, theme_boost_union{{/str}}: <a href="{{fileurlpersistent}}">{{fileurlpersistent}}</a></small><br>
<small>{{#str}}additionalresourcesfileurlrevisioned, theme_boost_union{{/str}}: <a href="{{fileurlrevisioned}}">{{fileurlrevisioned}}</a></small>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/settings-fontawesome-filelist.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
{{^exists}}<span class="{{#mandatory}}text-danger{{/mandatory}}{{^mandatory}}text-muted{{/mandatory}}"><i class="fa fa-times-circle-o fa-3x fa-fw"></i></span>{{/exists}}
<div class="ml-3">
<h6 class="mb-0">{{filepath}}</h6>
<small>{{description}}</small><br />
<small>{{description}}</small><br>
{{#exists}}<small>{{#mandatory}}{{#str}}fontawesomelistmandatoryuploaded,theme_boost_union{{/str}}{{/mandatory}}{{^mandatory}}{{#str}}fontawesomelistoptionaluploaded,theme_boost_union{{/str}}{{/mandatory}}</small>{{/exists}}
{{^exists}}<small>{{#mandatory}}{{#str}}fontawesomelistmandatorymissing,theme_boost_union{{/str}}{{/mandatory}}{{^mandatory}}{{#str}}fontawesomelistoptionalmissing,theme_boost_union{{/str}}{{/mandatory}}</small>{{/exists}}
</div>
Expand Down
10 changes: 5 additions & 5 deletions templates/settings-modicon-filelist.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@
<div class="ml-3">
<h6 class="mb-0">{{path}}</h6>
{{#mod}}
<small>{{#str}}modiconactivity, theme_boost_union{{/str}}: {{mod}}</small><br />
{{#moodle4}}<small>{{#str}}modiconversion, theme_boost_union{{/str}}: {{#str}}modicongtmoodle4, theme_boost_union{{/str}}</small><br />{{/moodle4}}
{{#moodle3}}<small>{{#str}}modiconversion, theme_boost_union{{/str}}: {{#str}}modiconltmoodle311, theme_boost_union{{/str}}</small><br />{{/moodle3}}
<small>{{#str}}modiconactivity, theme_boost_union{{/str}}: {{mod}}</small><br>
{{#moodle4}}<small>{{#str}}modiconversion, theme_boost_union{{/str}}: {{#str}}modicongtmoodle4, theme_boost_union{{/str}}</small><br>{{/moodle4}}
{{#moodle3}}<small>{{#str}}modiconversion, theme_boost_union{{/str}}: {{#str}}modiconltmoodle311, theme_boost_union{{/str}}</small><br>{{/moodle3}}
{{^invalidname}}
{{#moodle4}}<small>{{#str}}modiconsuccess4x, theme_boost_union, {{mod}}{{/str}}</small>{{/moodle4}}
{{#moodle3}}<small>{{#str}}modiconsuccess3x, theme_boost_union, {{mod}}{{/str}}</small>{{/moodle3}}
{{/invalidname}}
{{#invalidname}}
<small>{{#str}}modiconversion, theme_boost_union{{/str}}: {{#str}}modiconactivityunknown, theme_boost_union{{/str}}</small><br />
<small>{{#str}}modiconversion, theme_boost_union{{/str}}: {{#str}}modiconactivityunknown, theme_boost_union{{/str}}</small><br>
<small>{{#str}}modiconnamefail, theme_boost_union, {{mod}}{{/str}}</small>
{{/invalidname}}
{{/mod}}
{{^mod}}
<small>{{#str}}modiconactivity, theme_boost_union{{/str}}: {{#str}}modiconactivityunknown, theme_boost_union{{/str}}</small><br />
<small>{{#str}}modiconactivity, theme_boost_union{{/str}}: {{#str}}modiconactivityunknown, theme_boost_union{{/str}}</small><br>
<small>{{#str}}modiconnotexist, theme_boost_union, {{path}}{{/str}}</small>
{{/mod}}
</div>
Expand Down

0 comments on commit f5d5932

Please sign in to comment.