Merge branch 'MDL-67268-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 Nov 2019 04:08:33 +0000 (12:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 Nov 2019 04:08:33 +0000 (12:08 +0800)
grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache
mod/forum/templates/local/grades/local/grader/grading.mustache

index 5164b59..5da5be9 100644 (file)
@@ -59,7 +59,7 @@
         {{#criteria}}
             <div class="mb-3">
                 <div class="d-flex align-items-center mb-2">
-                    <h5 class="px-0 mb-0 description font-weight-bold">{{{description}}}</h5>
+                    <h5 id="criterion-description-{{id}}" class="px-0 mb-0 description font-weight-bold">{{{description}}}</h5>
                     <button class="criterion-toggle btn btn-icon icon-no-margin text-reset p-0 font-weight-bold mb-0 ml-auto"
                             type="button"
                             data-toggle="collapse"
@@ -76,7 +76,7 @@
                             </span>
                     </button>
                 </div>
-                <div class="collapse show" id="criteria-{{id}}">
+                <div class="collapse show" id="criteria-{{id}}" role="radiogroup" aria-labelledby="criterion-description-{{id}}">
                     {{#levels}}
                         <div class="form-check">
                             <input class="form-check-input level"
index 013164f..2d7b658 100644 (file)
         <hr/>
         <div class="col-sm-12">
             <h4 class="d-inline mb-0 fa fa-bell-o"></h4>
-            <h4 class="d-inline mb-0 ">{{#str}}notifications, core{{/str}}</h4>
-            <div data-region="notification" class="col-md-12 mt-3">
+            <h4 id="send-student-notifications-setting" class="d-inline mb-0">{{#str}}notifications, core{{/str}}</h4>
+            <div data-region="notification" class="col-md-12 mt-3" role="radiogroup" aria-labelledby="send-student-notifications-setting">
                 <label class="form-check">
                     <input class="form-check-input" type="radio" name="sendstudentnotifications" value="1"{{#defaultsendnotifications}} checked{{/defaultsendnotifications}}/>
                     {{#str}}sendstudentnotificationsyes, mod_forum{{/str}}