MDL-73952 core_course: Rename iscurrent to highlighted

The term 'iscurrent' suggests that something is current, when this may
not be technically true. The term highlight is more appropriate as we
are highlighting content. Whether that content is for the current week
may also be true, but it may be that some course formats allow multiple
sections to be highlighted.
This commit is contained in:
Andrew Nicols 2022-03-28 13:13:55 +08:00
parent a313795354
commit 495da02824
4 changed files with 8 additions and 8 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -616,13 +616,13 @@ define(
replaceActionItem(actionItem, 'i/marked',
'highlightoff', 'core', 'removemarker');
courseeditor.dispatch('legacySectionAction', action, sectionid);
setSectionBadge(sectionElement[0], 'iscurrent', true);
setSectionBadge(sectionElement[0], 'highlighted', true);
} else if (action === 'removemarker') {
sectionElement.removeClass('current');
replaceActionItem(actionItem, 'i/marker',
'highlight', 'core', 'setmarker');
courseeditor.dispatch('legacySectionAction', action, sectionid);
setSectionBadge(sectionElement[0], 'iscurrent', false);
setSectionBadge(sectionElement[0], 'highlighted', false);
}
};

View file

@ -23,14 +23,14 @@
Example context (json):
{
"iscurrent" : true,
"highlighted" : true,
"hiddenfromstudents" : "1",
"notavailable" : "0",
"highlightedlabel" : "Highlighted"
}
}}
{{#editing}}
<span class="badge badge-pill badge-primary order-1 {{^iscurrent}}d-none{{/iscurrent}}" data-type="iscurrent">
<span class="badge badge-pill badge-primary order-1 {{^highlighted}}d-none{{/highlighted}}" data-type="highlighted">
{{ highlightedlabel }}
</span>
<span class="badge badge-pill badge-warning order-2 {{^hiddenfromstudents}}d-none{{/hiddenfromstudents}}" data-type="hiddenfromstudents">
@ -41,9 +41,9 @@
</span>
{{/editing}}
{{^editing}}
{{#iscurrent}}
{{#highlighted}}
<span class="badge badge-pill badge-primary order-1">{{ highlightedlabel }}</span>
{{/iscurrent}}
{{/highlighted}}
{{#hiddenfromstudents}}
<span class="badge badge-pill badge-warning order-2">{{#str}}hiddenfromstudents{{/str}}</span>
{{/hiddenfromstudents}}