L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-58138 completion: rebase on font-awesome changes.

Browse Source 
Part of MDL-58138 epic
This commit is contained in:
Jake Dallimore
2017-04-19 08:56:11 +08:00
parent b17ee68202
commit 6b3b9c1d02
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
completion/classes/manager.php
+3 -3
View File
@@ -135,7 +135,7 @@ class manager {
case COMPLETION_TRACKING_MANUAL:
$strings['string'] = get_string('manual');
$strings['icon'] = $OUTPUT->pix_url('i/completion-manual-enabled')->out();
$strings['icon'] = $OUTPUT->pix_icon('i/completion-manual-y', get_string('completion_manual', 'completion'));
break;
case COMPLETION_TRACKING_AUTOMATIC:
@@ -148,7 +148,7 @@ class manager {
}
}
$strings['icon'] = $OUTPUT->pix_url('i/completion-auto-enabled')->out();
$strings['icon'] = $OUTPUT->pix_icon('i/completion-auto-y', get_string('completion_automatic', 'completion'));
break;
default:
@@ -213,7 +213,7 @@ class manager {
$canmanage = has_capability('moodle/course:manageactivities', $coursecontext);
$course = get_course($this->courseid);
foreach ($data->modules as $module) {
$module->icon = $OUTPUT->pix_url('icon', $module->name)->out();
$module->icon = $OUTPUT->image_url('icon', $module->name)->out();
$module->formattedname = format_string(get_string('modulenameplural', 'mod_' . $module->name),
true, ['context' => $coursecontext]);
$module->canmanage = $canmanage && \course_allowed_module($course, $module->name);
course/templates/activityinstance.mustache
+5 -5
View File
@@ -33,7 +33,7 @@
}
}}
{{#activities}}
<div class="row m-b-1">
<div class="row m-b-1 row-fluid">
<div class="activityinstance col-sm-6 span6">
<div class="mod-indent-outer"></div>
<div>
@@ -47,16 +47,16 @@
</a>
</div>
</div>
<div class="activity-completionstatus col-sm-6" id="completionstatus_{{cmid}}">
<div class="col-sm-1">
<div class="activity-completionstatus col-sm-6 span6" id="completionstatus_{{cmid}}">
<div class="col-sm-1 span1 p-l-0">
{{#completionstatus.icon}}
<img src="{{completionstatus.icon}}" class="m-r-2" alt=" " role="presentation">
{{{completionstatus.icon}}}
{{/completionstatus.icon}}
{{^completionstatus.icon}}
<span class="m-r-3"></span>
{{/completionstatus.icon}}
</div>
<div class="col-sm-11">
<div class="col-sm-11 span11 p-l-0">
<span class="text-muted muted">{{{completionstatus.string}}}</span>
</div>
</div>
course/templates/defaultactivitycompletion.mustache
+6 -6
View File
@@ -60,23 +60,23 @@
{{#modules}}
{{#canmanage}}
<div class="module-section m-b-1">
<div class="row m-b-1">
<div class="col-sm-6">
<div class="row m-b-1 row-fluid">
<div class="col-sm-6 span6">
<label class="accesshide" for="modtype_{{id}}">Select {{formattedname}}</label>
<input id="modtype_{{id}}" type="checkbox" class="m-r-1" name="modids[]" value="{{id}}" aria-label="{{#str}}checkactivity, completion, {{formattedname}}{{/str}}">
<img src="{{icon}}" alt=" " role="presentation" />
<span>{{formattedname}}</span>
</div>
<div class="activity-completionstatus col-sm-6">
<div class="col-sm-1">
<div class="activity-completionstatus col-sm-6 span6">
<div class="col-sm-1 span1 p-l-0">
{{#completionstatus.icon}}
<img src="{{completionstatus.icon}}" class="m-r-2" alt=" " role="presentation">
{{{completionstatus.icon}}}
{{/completionstatus.icon}}
{{^completionstatus.icon}}
<span class="m-r-3"></span>
{{/completionstatus.icon}}
</div>
<div class="col-sm-11">
<div class="col-sm-11 span11 p-l-0">
<span class="text-muted muted">{{{completionstatus.string}}}</span>
</div>
</div>