Merge branch 'MDL-67359' of git://github.com/Chocolate-lightning/moodle_forum-project

This commit is contained in:
Andrew Nicols 2019-12-04 10:32:03 +08:00
commit 96302b7aec
4 changed files with 20 additions and 18 deletions

View File

@ -243,6 +243,7 @@ class icon_system_fontawesome extends icon_system_font {
'core:i/grade_partiallycorrect' => 'fa-check-square',
'core:i/grades' => 'fa-table',
'core:i/grading' => 'fa-magic',
'core:i/gradingnotifications' => 'fa-bell-o',
'core:i/groupevent' => 'fa-group',
'core:i/groupn' => 'fa-user',
'core:i/group' => 'fa-users',

View File

@ -98,6 +98,22 @@
<div data-region="grade" class="pt-3 px-3">
{{> mod_forum/local/grades/local/grader/grade_placeholder }}
</div>
<h4 id="send-student-notifications-setting" class="mb-0 h5 px-3 font-weight-normal">
{{#pix}} i/gradingnotifications, core {{/pix}}{{#str}}notifications, core{{/str}}
</h4>
<div data-region="notification" class="pt-3 px-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}}
</label>
<label class="form-check">
<input class="form-check-input" type="radio" name="sendstudentnotifications" value="0"{{^defaultsendnotifications}} checked{{/defaultsendnotifications}}/>
{{#str}}sendstudentnotificationsno, mod_forum{{/str}}
</label>
{{#helpicon}}
{{>core/help_icon}}
{{/helpicon}}
</div>
<div data-region="grade-errors" role="alert" aria-role="assertive"></div>
</div>
</div>
@ -105,22 +121,5 @@
</div>
<div data-region="grade-errors" role="alert" aria-role="assertive"></div>
<hr/>
<div class="col-sm-12">
<h4 class="d-inline mb-0 fa fa-bell-o"></h4>
<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}}
</label>
<label class="form-check">
<input class="form-check-input" type="radio" name="sendstudentnotifications" value="0"{{^defaultsendnotifications}} checked{{/defaultsendnotifications}}/>
{{#str}}sendstudentnotificationsno, mod_forum{{/str}}
</label>
{{#helpicon}}
{{>core/help_icon}}
{{/helpicon}}
</div>
</div>
{{/drawercontent}}
{{/core/drawer}}
{{/core/drawer}}

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M912 1696q0-16-16-16-59 0-101.5-42.5t-42.5-101.5q0-16-16-16t-16 16q0 73 51.5 124.5t124.5 51.5q16 0 16-16zm-666-288h1300q-266-300-266-832 0-51-24-105t-69-103-121.5-80.5-169.5-31.5-169.5 31.5-121.5 80.5-69 103-24 105q0 532-266 832zm1482 0q0 52-38 90t-90 38h-448q0 106-75 181t-181 75-181-75-75-181h-448q-52 0-90-38t-38-90q50-42 91-88t85-119.5 74.5-158.5 50-206 19.5-260q0-152 117-282.5t307-158.5q-8-19-8-39 0-40 28-68t68-28 68 28 28 68q0 20-8 39 190 28 307 158.5t117 282.5q0 139 19.5 260t50 206 74.5 158.5 85 119.5 91 88z" fill="#999"/></svg>

After

Width:  |  Height:  |  Size: 678 B