Merge branch 'MDL-56448-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE

This commit is contained in:
Eloy Lafuente (stronk7)
2016-10-26 17:06:21 +02:00
9 changed files with 14 additions and 19 deletions
@@ -32,10 +32,10 @@
Example context (json):
{
competencycount: 4,
proficientcompetencycount: 3,
proficientcompetencypercentage: 75,
proficientcompetencypercentageformatted: 75.0
"competencycount": 4,
"proficientcompetencycount": 3,
"proficientcompetencypercentage": 75,
"proficientcompetencypercentageformatted": 75.0
}
}}
@@ -32,12 +32,12 @@
Example context (json):
{
linkedcompetencycount: 4,
competencycount: 8,
linkedcompetencypercentage: 50,
plancount: 40,
completedplancount: 30,
completedplanpercentage: 75,
"linkedcompetencycount": 4,
"competencycount": 8,
"linkedcompetencypercentage": 50,
"plancount": 40,
"completedplancount": 30,
"completedplanpercentage": 75
}
}}
@@ -28,7 +28,6 @@
Context variables required for this template:
* see mod/assign/classes/output/grading_app.php
Example context (json):
This template is initially hidden, and is only displayed after the current user info has been loaded.
}}
<form data-region="grading-actions-form" class="hide">
@@ -28,7 +28,6 @@
Context variables required for this template:
* see mod/assign/classes/output/grading_app.php
Example context (json):
This template includes ajax functionality, so it cannot be shown in the template library.
}}
<div data-region="grading-navigation-panel" data-first-userid="{{userid}}" data-courseid="{{courseid}}" data-showuseridentity="{{showuseridentity}}">
@@ -28,7 +28,6 @@
Context variables required for this template:
* see mod/assign/classes/output/grading_app.php
Example context (json):
This template includes ajax functionality, so it cannot be shown in the template library.
}}
@@ -28,7 +28,6 @@
Context variables required for this template:
* see mod/assign/classes/output/grading_app.php
Example context (json):
This template uses ajax functionality, so it cannot be shown in the template library.
}}
<a href="#previous" data-action="previous-user">{{{larrow}}}</a>
@@ -33,7 +33,7 @@
"id": "5",
"fullname": "Mr T",
"hasidentity": true,
"identity": "[email protected], T"
"identity": "[email protected], T",
"profileimageurl": "https://moodle.org/pix/u/f3.png"
}
}}
@@ -28,7 +28,6 @@
Context variables required for this template:
* None
Example context (json):
This template loads it's content via ajax, so it cannot be shown in the template library.
}}
{{> mod_assign/loading }}
+3 -3
View File
@@ -49,15 +49,15 @@
"title": "Example title",
"docurl": "https://example.com/mod/example/view.php?id=4",
"content": "I am content",
"contexturl": "https://example.com/mod/example/view.php?id=2"
"contexturl": "https://example.com/mod/example/view.php?id=2",
"userurl": "https://example.com/user/profile.php?id=3",
"userfullname": "Example User Full Name",
"multiplefiles": true,
"filenames":
{
[
"file1.txt",
"file2.txt"
}
]
}
}}
<div class="result">