mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-73952 course: Revert iscurrent => highlighted rename

Browse Source
This commit is contained in:
Andrew Nicols 2022-03-28 14:37:49 +08:00
parent 305a25ae53
commit 4bb0feb176
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/amd/build/actions.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
course/amd/build/actions.min.js.map
View File

File diff suppressed because one or more lines are too long

4
course/amd/src/actions.js
View File

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

8
course/format/templates/local/content/section/badges.mustache
View File

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