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

2025-01-31 12:45:04 +01:00 · 2016-10-26 16:11:44 +02:00 · 2016-10-26 16:11:44 +02:00 · 6f01090159
commit 6f01090159
parent 2300b95dbf f07cb88c57
22 changed files with 37 additions and 44 deletions
--- a/admin/tool/lp/templates/course_competency_statistics.mustache
+++ b/admin/tool/lp/templates/course_competency_statistics.mustache
@ -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
    }

 }}
--- a/admin/tool/lp/templates/template_statistics.mustache
+++ b/admin/tool/lp/templates/template_statistics.mustache
@ -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
    }

 }}
--- a/lib/templates/modal.mustache
+++ b/lib/templates/modal.mustache
@ -36,7 +36,7 @@
    {
        "title": "Example modal",
        "body": "Some example content for the body",
-        "footer": "Footer text, right here!",
+        "footer": "Footer text, right here!"
    }
 }}

--- a/message/templates/message_preferences.mustache
+++ b/message/templates/message_preferences.mustache
@ -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
+                                }
                            }
                        ]
                    }
--- a/message/templates/message_preferences_component.mustache
+++ b/message/templates/message_preferences_component.mustache
@ -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
+                        }
                    }
                ]
            }
--- a/message/templates/message_preferences_notification_processor.mustache
+++ b/message/templates/message_preferences_notification_processor.mustache
@ -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
+                }
            }
        ]
    }
--- a/message/templates/notification_preferences.mustache
+++ b/message/templates/notification_preferences.mustache
@ -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
+                                }
                            }
                        ]
                    }
--- a/message/templates/notification_preferences_component.mustache
+++ b/message/templates/notification_preferences_component.mustache
@ -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
+                        }
                    }
                ]
            }
--- a/message/templates/notification_preferences_component_notification.mustache
+++ b/message/templates/notification_preferences_component_notification.mustache
@ -50,7 +50,7 @@
                    "displayname": "When I'm offline",
                    "checked": 0,
                    "iconurl": "some url"
-                },
+                }
            }
        ]
    }
--- a/message/templates/notification_preferences_processor.mustache
+++ b/message/templates/notification_preferences_processor.mustache
@ -38,7 +38,7 @@
        "name": "popup",
        "hassettings": 1,
        "userid": 3,
-        "contextid": 3,
+        "contextid": 3
    }
 }}
 <th {{^userconfigured}}class="unconfigured"{{/userconfigured}} data-processor-name="{{name}}">
--- a/mod/assign/templates/grading_actions.mustache
+++ b/mod/assign/templates/grading_actions.mustache
@ -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">
--- a/mod/assign/templates/grading_app.mustache
+++ b/mod/assign/templates/grading_app.mustache
@ -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}}">
--- a/mod/assign/templates/grading_navigation.mustache
+++ b/mod/assign/templates/grading_navigation.mustache
@ -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.
 }}

--- a/mod/assign/templates/grading_navigation_user_selector.mustache
+++ b/mod/assign/templates/grading_navigation_user_selector.mustache
@ -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>
--- a/mod/assign/templates/grading_navigation_user_summary.mustache
+++ b/mod/assign/templates/grading_navigation_user_summary.mustache
@ -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"
    }
 }}
--- a/mod/assign/templates/grading_panel.mustache
+++ b/mod/assign/templates/grading_panel.mustache
@ -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 }}
--- a/search/templates/result.mustache
+++ b/search/templates/result.mustache
@ -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">
--- a/theme/boost/templates/core/modal.mustache
+++ b/theme/boost/templates/core/modal.mustache
@ -36,7 +36,7 @@
    {
        "title": "Example modal",
        "body": "Some example content for the body",
-        "footer": "Footer text, right here!",
+        "footer": "Footer text, right here!"
    }
 }}

--- a/theme/boost/templates/core/pix_icon.mustache
+++ b/theme/boost/templates/core/pix_icon.mustache
@ -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"}
        ]
    }

--- a/theme/boost/templates/mod_assign/grading_actions.mustache
+++ b/theme/boost/templates/mod_assign/grading_actions.mustache
@ -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}}
--- a/theme/boost/templates/mod_assign/grading_navigation.mustache
+++ b/theme/boost/templates/mod_assign/grading_navigation.mustache
@ -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">
--- a/theme/boost/templates/mod_assign/grading_navigation_user_selector.mustache
+++ b/theme/boost/templates/mod_assign/grading_navigation_user_selector.mustache
@ -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>