Skip to content
Permalink
Browse files

Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle

  • Loading branch information...
stronk7 committed Oct 26, 2016
2 parents 2300b95 + f07cb88 commit 6f01090159ad0eb1d62e1521dc7e4086650b9da4
@@ -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
}

}}
@@ -36,7 +36,7 @@
{
"title": "Example modal",
"body": "Some example content for the body",
"footer": "Footer text, right here!",
"footer": "Footer text, right here!"
}
}}

@@ -52,14 +52,14 @@
"name": "loggedin",
"displayname": "When I'm logged in",
"checked": 0,
"disableall": 0,
"disableall": 0
},
"loggedoff": {
"name": "loggedoff",
"displayname": "When I'm offline",
"checked": 0,
"disableall": 0,
},
"disableall": 0
}
}
]
}
@@ -46,14 +46,14 @@
"name": "loggedin",
"displayname": "When I'm logged in",
"checked": 0,
"disableall": 0,
"disableall": 0
},
"loggedoff": {
"name": "loggedoff",
"displayname": "When I'm offline",
"checked": 0,
"disableall": 0,
},
"disableall": 0
}
}
]
}
@@ -46,14 +46,14 @@
"name": "loggedin",
"displayname": "When I'm logged in",
"checked": 0,
"disableall": 0,
"disableall": 0
},
"loggedoff": {
"name": "loggedoff",
"displayname": "When I'm offline",
"checked": 0,
"disableall": 0,
},
"disableall": 0
}
}
]
}
@@ -40,7 +40,7 @@
"processors": [
{
"onlinehelphtml": "<p>help button HTML</p>",
"offlinehelphtml": "<p>help button HTML</p>",
"offlinehelphtml": "<p>help button HTML</p>"
}
],
"notifications": [
@@ -57,14 +57,14 @@
"name": "loggedin",
"displayname": "When I'm logged in",
"checked": 0,
"disableall": 0,
"disableall": 0
},
"loggedoff": {
"name": "loggedoff",
"displayname": "When I'm offline",
"checked": 0,
"disableall": 0,
},
"disableall": 0
}
}
]
}
@@ -36,7 +36,7 @@
"processors": [
{
"onlinehelphtml": "<p>help button HTML</p>",
"offlinehelphtml": "<p>help button HTML</p>",
"offlinehelphtml": "<p>help button HTML</p>"
}
],
"notifications": [
@@ -53,14 +53,14 @@
"name": "loggedin",
"displayname": "When I'm logged in",
"checked": 0,
"disableall": 0,
"disableall": 0
},
"loggedoff": {
"name": "loggedoff",
"displayname": "When I'm offline",
"checked": 0,
"disableall": 0,
},
"disableall": 0
}
}
]
}
@@ -50,7 +50,7 @@
"displayname": "When I'm offline",
"checked": 0,
"iconurl": "some url"
},
}
}
]
}
@@ -38,7 +38,7 @@
"name": "popup",
"hassettings": 1,
"userid": 3,
"contextid": 3,
"contextid": 3
}
}}
<th {{^userconfigured}}class="unconfigured"{{/userconfigured}} data-processor-name="{{name}}">
@@ -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": "t@example.org, T"
"identity": "t@example.org, 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 }}
@@ -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">
@@ -36,7 +36,7 @@
{
"title": "Example modal",
"body": "Some example content for the body",
"footer": "Footer text, right here!",
"footer": "Footer text, right here!"
}
}}

@@ -33,7 +33,8 @@
Example context (json):
{
"attributes": [
{ "name": "src", "value": "http://moodle.com/wp-content/themes/moodle/images/logo-hat2.png" },
{"name": "src", "value": "http://moodle.com/wp-content/themes/moodle/images/logo-hat2.png"},
{"name": "alt", "value": "Alt text for icon"}
]
}

@@ -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.
}}
{{#showreview}}
@@ -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 class="container-fluid">
@@ -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>

0 comments on commit 6f01090

Please sign in to comment.
You can’t perform that action at this time.