From 46d51c8ca9a4cc30d77fc452dc7aa64429dd0d47 Mon Sep 17 00:00:00 2001 From: Ryan Wyllie Date: Tue, 5 Nov 2019 13:15:12 +0800 Subject: [PATCH] MDL-66893 mod_forum: update grading panel UI in grader --- lang/en/grades.php | 1 + .../output/icon_system_fontawesome.php | 1 + lib/templates/drawer.mustache | 6 +- .../amd/build/local/grades/grader.min.js | 2 +- .../amd/build/local/grades/grader.min.js.map | 2 +- .../grades/local/grader/selectors.min.js | 2 +- .../grades/local/grader/selectors.min.js.map | 2 +- mod/forum/amd/src/local/grades/grader.js | 14 +- .../local/grades/local/grader/selectors.js | 1 + .../templates/local/grades/grader.mustache | 16 +- .../grades/local/grader/grading.mustache | 79 +++- theme/boost/scss/moodle/layout.scss | 10 +- theme/boost/scss/moodle/modules.scss | 270 +++++++++++++- theme/boost/style/moodle.css | 350 ++++++++++-------- theme/classic/style/moodle.css | 350 ++++++++++-------- 15 files changed, 769 insertions(+), 337 deletions(-) diff --git a/lang/en/grades.php b/lang/en/grades.php index 669b4ae31b5..63f2b000431 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -357,6 +357,7 @@ $string['gradevaluetoobig'] = 'One of the grade values is larger than the allowe $string['gradeview'] = 'View grade'; $string['gradewasmodifiedduringediting'] = 'The grade entered for {$a->itemname} for {$a->username} was ignored because it was more recently updated by someone else.'; $string['gradeweighthelp'] = 'Grade weight help'; +$string['gradingmodulename'] = 'Grading ({$a})'; $string['groupavg'] = 'Group average'; $string['hidden'] = 'Hidden'; $string['hidden_help'] = 'If ticked, grades are hidden from students. A hidden until date may be set if desired, to release grades after grading is completed.'; diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php index 84a6cbb89cf..0b3978a6bfd 100644 --- a/lib/classes/output/icon_system_fontawesome.php +++ b/lib/classes/output/icon_system_fontawesome.php @@ -241,6 +241,7 @@ class icon_system_fontawesome extends icon_system_font { 'core:i/grade_incorrect' => 'fa-remove text-danger', 'core:i/grade_partiallycorrect' => 'fa-check-square', 'core:i/grades' => 'fa-table', + 'core:i/grading' => 'fa-magic', 'core:i/groupevent' => 'fa-group', 'core:i/groupn' => 'fa-user', 'core:i/group' => 'fa-users', diff --git a/lib/templates/drawer.mustache b/lib/templates/drawer.mustache index 39c237490e3..e21fd2f037f 100644 --- a/lib/templates/drawer.mustache +++ b/lib/templates/drawer.mustache @@ -33,9 +33,9 @@ }}