Merge branch 'MDL-56945-master' of git://github.com/zig-moodle/moodle

This commit is contained in:
Jun Pataleta 2018-01-02 10:09:45 +08:00
commit dc61d1bea0
3 changed files with 23 additions and 12 deletions

View file

@ -121,6 +121,9 @@ class grading_app implements templatable, renderable {
} }
} }
$export->actiongrading = 'grading';
$export->viewgrading = get_string('viewgrading', 'mod_assign');
$export->showreview = $showreview; $export->showreview = $showreview;
$time = time(); $time = time();

View file

@ -46,13 +46,21 @@
<a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{{coursename}}}">{{{coursename}}}</a><br/> <a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{{coursename}}}">{{{coursename}}}</a><br/>
{{! {{!
Row 2) Assignment name & link. Row 2) Assignment name & link, & edit settings.
}} }}
<a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}" title="{{name}}">{{name}}</a> <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>
{{/caneditsettings}}
<br/>
{{! {{!
Row 3) Edit settings, due date, with tool-tip thing. 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>
<div role="tooltip" id="tooltip-{{uniqid}}" class="accesshide"> <div role="tooltip" id="tooltip-{{uniqid}}" class="accesshide">
{{#duedate}} {{#duedate}}
{{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}} {{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}
@ -67,10 +75,6 @@
{{/duedate}} {{/duedate}}
</div> </div>
<br/>
{{#caneditsettings}}
<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1">{{#pix}}t/edit, core,{{#str}}editsettings{{/str}}{{/pix}}</a>
{{/caneditsettings}}
</span> </span>
</div> </div>

View file

@ -46,13 +46,21 @@
<a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{{coursename}}}">{{{coursename}}}</a><br/> <a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{{coursename}}}">{{{coursename}}}</a><br/>
{{! {{!
Row 2) Assignment name & link. Row 2) Assignment name & link, & edit settings.
}} }}
<a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}" title="{{name}}">{{name}}</a> <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>
{{/caneditsettings}}
<br/>
{{! {{!
Row 3) Edit settings, due date, with tool-tip thing. 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>
<div role="tooltip" id="tooltip-{{uniqid}}" class="accesshide"> <div role="tooltip" id="tooltip-{{uniqid}}" class="accesshide">
{{#duedate}} {{#duedate}}
{{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}} {{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}
@ -67,10 +75,6 @@
{{/duedate}} {{/duedate}}
</div> </div>
<br/>
{{#caneditsettings}}
<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1">{{#pix}}t/edit, core,{{#str}}editsettings{{/str}}{{/pix}}</a>
{{/caneditsettings}}
</span> </span>
</div> </div>