Skip to content

Commit

Permalink
Merge branch 'MDL-72687-311' of git://github.com/lameze/moodle into M…
Browse files Browse the repository at this point in the history 
…OODLE_311_STABLE
  • Loading branch information
@junpataleta
junpataleta committed Nov 3, 2021
2 parents 1cdacd7 + 66cf7b9 commit 7bf69ea
Show file tree
Hide file tree
Showing 15 changed files with 104 additions and 65 deletions.
4 changes: 3 additions & 1 deletion lib/form/templates/element-group.mustache
View file
Expand Up @@ -8,7 +8,9 @@
{{/label}}
{{$element}}
<fieldset class="w-100 m-0 p-0 border-0">
<legend class="sr-only">{{label}}</legend>
{{#label}}
<legend class="sr-only">{{label}}</legend>
{{/label}}
<div class="d-flex flex-wrap align-items-center">
{{#element.elements}}
{{{separator}}}
Expand Down
2 changes: 1 addition & 1 deletion mod/assign/feedback/editpdf/classes/renderer.php
View file
Expand Up @@ -203,7 +203,7 @@ public function render_assignfeedback_editpdf_widget(assignfeedback_editpdf_widg

// Add toolbars to toolbar_group in order of display, and float the toolbar_group right.
$toolbars = $rotationtools . $toolbar1 . $toolbar2 . $toolbar3 . $toolbar4;
$toolbargroup = html_writer::div($toolbars, 'toolbar_group', array('role' => 'toolbar_group'));
$toolbargroup = html_writer::div($toolbars, 'toolbar_group', ['role' => 'toolbar']);
}

$pageheader = html_writer::div($navigation1 .
Expand Down
4 changes: 4 additions & 0 deletions .../build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
View file
Expand Up @@ -1863,9 +1863,11 @@ Y.extend(COLOURPICKER, M.assignfeedback_editpdf.dropdown, {
button = Y.Node.create('<button><img alt="' + title + '" src="' + img + '"/></button>');
button.setAttribute('data-colour', colour);
button.setAttribute('data-rgb', rgb);
button.setAttribute('role', 'menuitem');
button.setStyle('backgroundImage', 'none');
listitem = Y.Node.create('<li/>');
listitem.append(button);
listitem.setAttribute('role', 'none');
colourlist.append(listitem);
}, this);

Expand Down Expand Up @@ -1988,9 +1990,11 @@ Y.extend(STAMPPICKER, M.assignfeedback_editpdf.dropdown, {
title = M.util.get_string('stamp', 'assignfeedback_editpdf');
button = Y.Node.create('<button><img height="16" width="16" alt="' + title + '" src="' + stamp + '"/></button>');
button.setAttribute('data-stamp', stamp);
button.setAttribute('role', 'menuitem');
button.setStyle('backgroundImage', 'none');
listitem = Y.Node.create('<li/>');
listitem.append(button);
listitem.setAttribute('role', 'none');
stamplist.append(listitem);
}, this);

Expand Down
16 changes: 8 additions & 8 deletions ...ui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions ...df/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
View file
Expand Up @@ -1863,9 +1863,11 @@ Y.extend(COLOURPICKER, M.assignfeedback_editpdf.dropdown, {
button = Y.Node.create('<button><img alt="' + title + '" src="' + img + '"/></button>');
button.setAttribute('data-colour', colour);
button.setAttribute('data-rgb', rgb);
button.setAttribute('role', 'menuitem');
button.setStyle('backgroundImage', 'none');
listitem = Y.Node.create('<li/>');
listitem.append(button);
listitem.setAttribute('role', 'none');
colourlist.append(listitem);
}, this);

Expand Down Expand Up @@ -1988,9 +1990,11 @@ Y.extend(STAMPPICKER, M.assignfeedback_editpdf.dropdown, {
title = M.util.get_string('stamp', 'assignfeedback_editpdf');
button = Y.Node.create('<button><img height="16" width="16" alt="' + title + '" src="' + stamp + '"/></button>');
button.setAttribute('data-stamp', stamp);
button.setAttribute('role', 'menuitem');
button.setStyle('backgroundImage', 'none');
listitem = Y.Node.create('<li/>');
listitem.append(button);
listitem.setAttribute('role', 'none');
stamplist.append(listitem);
}, this);

Expand Down
2 changes: 2 additions & 0 deletions mod/assign/feedback/editpdf/yui/src/editor/js/colourpicker.js
View file
Expand Up @@ -42,9 +42,11 @@ Y.extend(COLOURPICKER, M.assignfeedback_editpdf.dropdown, {
button = Y.Node.create('<button><img alt="' + title + '" src="' + img + '"/></button>');
button.setAttribute('data-colour', colour);
button.setAttribute('data-rgb', rgb);
button.setAttribute('role', 'menuitem');
button.setStyle('backgroundImage', 'none');
listitem = Y.Node.create('<li/>');
listitem.append(button);
listitem.setAttribute('role', 'none');
colourlist.append(listitem);
}, this);

Expand Down
2 changes: 2 additions & 0 deletions mod/assign/feedback/editpdf/yui/src/editor/js/stamppicker.js
View file
Expand Up @@ -37,9 +37,11 @@ Y.extend(STAMPPICKER, M.assignfeedback_editpdf.dropdown, {
title = M.util.get_string('stamp', 'assignfeedback_editpdf');
button = Y.Node.create('<button><img height="16" width="16" alt="' + title + '" src="' + stamp + '"/></button>');
button.setAttribute('data-stamp', stamp);
button.setAttribute('role', 'menuitem');
button.setStyle('backgroundImage', 'none');
listitem = Y.Node.create('<li/>');
listitem.append(button);
listitem.setAttribute('role', 'none');
stamplist.append(listitem);
}, this);

Expand Down
2 changes: 2 additions & 0 deletions mod/assign/lang/en/assign.php
View file
Expand Up @@ -368,6 +368,7 @@
$string['multipleteams'] = 'Member of more than one group';
$string['multipleteams_desc'] = 'The assignment requires submission in groups. You are a member of more than one group. To be able to submit you must be a member of only one group. Please contact your teacher to change your group membership.';
$string['multipleteamsgrader'] = 'Member of more than one group, so unable to make submissions.';
$string['nextuser'] = "Next user";
$string['newsubmissions'] = 'Assignments submitted';
$string['noattempt'] = 'No attempt';
$string['noclose'] = 'No close date';
Expand Down Expand Up @@ -418,6 +419,7 @@
$string['preventsubmissions'] = 'Prevent the user from making any more submissions to this assignment.';
$string['preventsubmissionsshort'] = 'Prevent submission changes';
$string['previous'] = 'Previous';
$string['previoususer'] = 'Previous user';
$string['privacy:attemptpath'] = 'attempt {$a}';
$string['privacy:blindmarkingidentifier'] = 'The identifier used for anonymous submissions';
$string['privacy:gradepath'] = 'grade';
Expand Down
5 changes: 2 additions & 3 deletions mod/assign/locallib.php
View file
Expand Up @@ -7771,16 +7771,15 @@ public function add_grade_form_elements(MoodleQuickForm $mform, stdClass $data,
}

$capabilitylist = array('gradereport/grader:view', 'moodle/grade:viewall');
$usergrade = get_string('notgraded', 'assign');
if (has_all_capabilities($capabilitylist, $this->get_course_context())) {
$urlparams = array('id'=>$this->get_course()->id);
$url = new moodle_url('/grade/report/grader/index.php', $urlparams);
$usergrade = '-';
if (isset($gradinginfo->items[0]->grades[$userid]->str_grade)) {
if (isset($gradinginfo->items[0]->grades[$userid]->grade)) {
$usergrade = $gradinginfo->items[0]->grades[$userid]->str_grade;
}
$gradestring = $this->get_renderer()->action_link($url, $usergrade);
} else {
$usergrade = '-';
if (isset($gradinginfo->items[0]->grades[$userid]) &&
!$gradinginfo->items[0]->grades[$userid]->hidden) {
$usergrade = $gradinginfo->items[0]->grades[$userid]->str_grade;
Expand Down
10 changes: 0 additions & 10 deletions mod/assign/styles.css
View file
Expand Up @@ -967,16 +967,6 @@
height: 60px;
}

/*rtl:ignore*/
.path-mod-assign [data-region="grade-actions-panel"] [data-region="grade-actions"] .collapse-buttons {
position: absolute;
top: 0;
left: auto;
right: 15px;
margin: 0;
line-height: 60px;
}

.path-mod-assign [data-region="grade-actions"] {
padding: 1em;
text-align: center;
Expand Down
48 changes: 28 additions & 20 deletions mod/assign/templates/grading_actions.mustache
View file
Expand Up @@ -30,27 +30,35 @@
This template is initially hidden, and is only displayed after the current user info has been loaded.
}}
{{#showreview}}
<div class="btn-toolbar collapse-buttons">
<div class="btn-group">
<button type="button" class="btn btn-secondary collapse-review-panel">{{#pix}} layout-expand-right, mod_assign, {{#str}} collapsereviewpanel, mod_assign {{/str}} {{/pix}}</button>
<button type="button" class="btn btn-secondary collapse-none active">{{#pix}} layout-default, mod_assign, {{#str}} defaultlayout, mod_assign {{/str}} {{/pix}}</button>
<button type="button" class="btn btn-secondary collapse-grade-panel">{{#pix}} layout-expand-left, mod_assign, {{#str}} collapsegradepanel, mod_assign {{/str}} {{/pix}}</button>
</div>
<div class="d-flex justify-content-between">
<form data-region="grading-actions-form" class="hide flex-grow-1 align-self-center">
<label>{{#str}}sendstudentnotifications, mod_assign{{/str}}
<input type="checkbox" name="sendstudentnotifications"
{{#defaultsendnotifications}}checked="checked"{{/defaultsendnotifications}} />
</label>
{{#helpicon}}
{{>core/help_icon}}
{{/helpicon}}
<button type="submit" class="btn btn-primary" name="savechanges">{{#str}}savechanges{{/str}}</button>
<button type="submit" class="btn btn-primary" name="saveandshownext">{{#str}}saveandnext{{/str}}</button>
<button type="submit" class="btn btn-secondary" name="resetbutton">{{#str}}reset{{/str}}</button>
</form>
{{#showreview}}
<div class="btn-toolbar collapse-buttons">
<div class="btn-group">
<button type="button" class="btn btn-secondary collapse-review-panel" aria-label="{{#str}} collapsereviewpanel, mod_assign {{/str}}" title="{{#str}} collapsereviewpanel, mod_assign {{/str}}">
{{#pix}} layout-expand-right, mod_assign {{/pix}}
</button>
<button type="button" class="btn btn-secondary collapse-none active" aria-label="{{#str}} defaultlayout, mod_assign {{/str}}" title="{{#str}} defaultlayout, mod_assign {{/str}}">
{{#pix}} layout-default, mod_assign {{/pix}}
</button>
<button type="button" class="btn btn-secondary collapse-grade-panel" aria-label="{{#str}} collapsegradepanel, mod_assign {{/str}}" title="{{#str}} collapsegradepanel, mod_assign {{/str}}">
{{#pix}} layout-expand-left, mod_assign {{/pix}}
</button>
</div>
</div>
{{/showreview}}
</div>
{{/showreview}}
<form data-region="grading-actions-form" class="hide">
<label>{{#str}}sendstudentnotifications, mod_assign{{/str}}
<input type="checkbox" name="sendstudentnotifications"
{{#defaultsendnotifications}}checked="checked"{{/defaultsendnotifications}} />
</label>
{{#helpicon}}
{{>core/help_icon}}
{{/helpicon}}
<button type="submit" class="btn btn-primary" name="savechanges">{{#str}}savechanges{{/str}}</button>
<button type="submit" class="btn btn-primary" name="saveandshownext">{{#str}}saveandnext{{/str}}</button>
<button type="submit" class="btn btn-secondary" name="resetbutton">{{#str}}reset{{/str}}</button>
</form>
{{#js}}
require(['mod_assign/grading_actions'], function(GradingActions) {
new GradingActions('[data-region="grade-actions"]');
Expand Down
6 changes: 4 additions & 2 deletions mod/assign/templates/grading_navigation.mustache
View file
Expand Up @@ -51,15 +51,17 @@
<a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}" title="{{name}}">{{name}}</a>

{{#caneditsettings}}
<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1">{{#pix}}t/edit, core,{{#str}}editsettings{{/str}}{{/pix}}</a>
<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1" aria-label="{{#str}}editsettings{{/str}}" title="{{#str}}editsettings{{/str}}">
{{#pix}}t/edit, core{{/pix}}
</a>
{{/caneditsettings}}

<br/>

{{!
Row 3) Assignment grading & link, due date, with tool-tip thing.
}}
<a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}&action={{actiongrading}}" title="{{viewgrading}}">{{viewgrading}}</a>
<a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}&action={{actiongrading}}">{{viewgrading}}</a>

<div role="tooltip" id="tooltip-{{uniqid}}" class="accesshide">
{{#duedate}}
Expand Down
35 changes: 17 additions & 18 deletions mod/assign/templates/grading_navigation_user_selector.mustache
View file
Expand Up @@ -30,11 +30,12 @@
This template uses ajax functionality, so it cannot be shown in the template library.
}}
<a href="#previous" data-action="previous-user">{{{larrow}}}</a>
<span data-region="input-field">
<select data-action="change-user" data-currentuserid="{{currentuserid}}" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}"></select>
</span>
<a href="#next" data-action="next-user">{{{rarrow}}}</a>
<a href="#previous" data-action="previous-user" aria-label="{{#str}} previoususer, mod_assign {{/str}}" title="{{#str}} previoususer, mod_assign {{/str}}">{{{larrow}}}</a>
<span data-region="input-field">
<label for="change-user-select" class="sr-only">{{#str}} changeuser, mod_assign {{/str}}</label>
<select id="change-user-select" data-action="change-user" data-currentuserid="{{currentuserid}}" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}"></select>
</span>
<a href="#next" data-action="next-user" aria-label="{{#str}} nextuser, mod_assign {{/str}}" title="{{#str}} nextuser, mod_assign {{/str}}">{{{rarrow}}}</a>

<br>

Expand All @@ -43,7 +44,17 @@
<span data-region="user-count-summary">{{#str}}xofy, mod_assign, { "x": "{{index}}", "y": "{{count}}" }{{/str}}</span>
</small>
</span>

<a href="#" data-region="user-filters" title="{{#str}}changefilters, mod_assign{{/str}}" aria-expanded="false" aria-controls="filter-configuration-{{uniqid}}">
<span class="accesshide">
{{#filters}}
{{filtername}}
{{/filters}}
{{^filters}}
{{#str}}nofilters, mod_assign{{/str}}
{{/filters}}
</span>
{{#pix}}i/filter{{/pix}}
</a>
<div data-region="configure-filters" id="filter-configuration-{{uniqid}}" class="card card-large p-2">
<form>
<span class="row px-3 py-1">
Expand Down Expand Up @@ -82,15 +93,3 @@
{{/hasmarkingworkflow}}
</form>
</div>

<a href="#" data-region="user-filters" title="{{#str}}changefilters, mod_assign{{/str}}" aria-expanded="false" aria-controls="filter-configuration-{{uniqid}}">
<span class="accesshide">
{{#filters}}
{{filtername}}
{{/filters}}
{{^filters}}
{{#str}}nofilters, mod_assign{{/str}}
{{/filters}}
</span>
{{#pix}}i/filter{{/pix}}
</a>
25 changes: 24 additions & 1 deletion mod/assign/templates/grading_navigation_user_summary.mustache
View file
Expand Up @@ -37,4 +37,27 @@
"profileimageurl": "https://moodle.org/pix/u/f3.png"
}
}}
<h4>{{^blindmarking}}<a href="{{globals.config.wwwroot}}/user/view.php?id={{id}}&course={{courseid}}">{{/blindmarking}}{{#profileimageurl}}<img src="{{profileimageurl}}" class="img-rounded" height="40" role="presentation"/>{{/profileimageurl}} {{fullname}}{{#hasidentity}}<em class='nowrap'><small> {{identity}} </small></em>{{/hasidentity}}{{#duedate}}<em class='nowrap'><small>{{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}</small></em>{{/duedate}}{{^blindmarking}}</a>{{/blindmarking}}</h4>
<h4>
{{^blindmarking}}
<a href="{{globals.config.wwwroot}}/user/view.php?id={{id}}&course={{courseid}}">
{{/blindmarking}}
{{#profileimageurl}}
<img src="{{profileimageurl}}" class="img-rounded" height="40" alt=""/>
{{/profileimageurl}}
{{fullname}}
{{#hasidentity}}
<em class='nowrap'>
<small title="{{identity}}">{{identity}}</small>
</em>
{{/hasidentity}}
{{#duedate}}
<em class='nowrap'>
<small title="{{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}">
{{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}
</small>
</em>
{{/duedate}}
{{^blindmarking}}
</a>
{{/blindmarking}}
</h4>
4 changes: 3 additions & 1 deletion mod/assign/templates/popout_button.mustache
View file
@@ -1 +1,3 @@
<a href="#" data-region="popout-button">{{#pix}}e/fullscreen,core,{{#str}}togglezoom, mod_assign{{/str}}{{/pix}}</a>
<a href="#" data-region="popout-button" aria-label="{{#str}}togglezoom, mod_assign{{/str}}" title="{{#str}}togglezoom, mod_assign{{/str}}">
{{#pix}}e/fullscreen,core{{/pix}}
</a>

0 comments on commit 7bf69ea

Please sign in to comment.