Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 14:11:44 +0000 (16:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 14:11:44 +0000 (16:11 +0200)
22 files changed:
admin/tool/lp/templates/course_competency_statistics.mustache
admin/tool/lp/templates/template_statistics.mustache
lib/templates/modal.mustache
message/templates/message_preferences.mustache
message/templates/message_preferences_component.mustache
message/templates/message_preferences_notification_processor.mustache
message/templates/notification_preferences.mustache
message/templates/notification_preferences_component.mustache
message/templates/notification_preferences_component_notification.mustache
message/templates/notification_preferences_processor.mustache
mod/assign/templates/grading_actions.mustache
mod/assign/templates/grading_app.mustache
mod/assign/templates/grading_navigation.mustache
mod/assign/templates/grading_navigation_user_selector.mustache
mod/assign/templates/grading_navigation_user_summary.mustache
mod/assign/templates/grading_panel.mustache
search/templates/result.mustache
theme/boost/templates/core/modal.mustache
theme/boost/templates/core/pix_icon.mustache
theme/boost/templates/mod_assign/grading_actions.mustache
theme/boost/templates/mod_assign/grading_navigation.mustache
theme/boost/templates/mod_assign/grading_navigation_user_selector.mustache

index 437bd53..bb4a267 100644 (file)
 
     Example context (json):
     {
-        competencycount: 4,
-        proficientcompetencycount: 3,
-        proficientcompetencypercentage: 75,
-        proficientcompetencypercentageformatted: 75.0
+        "competencycount": 4,
+        "proficientcompetencycount": 3,
+        "proficientcompetencypercentage": 75,
+        "proficientcompetencypercentageformatted": 75.0
     }
 
 }}
index 91b4512..85b738f 100644 (file)
 
     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
     }
 
 }}
index 7db1407..d8c4b70 100644 (file)
@@ -36,7 +36,7 @@
     {
         "title": "Example modal",
         "body": "Some example content for the body",
-        "footer": "Footer text, right here!",
+        "footer": "Footer text, right here!"
     }
 }}
 
index e1cfb21..43e2ea9 100644 (file)
                                     "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
+                                }
                             }
                         ]
                     }
index 5047b71..1cf3fc6 100644 (file)
                             "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
+                        }
                     }
                 ]
             }
index 8ab1f8d..0e35d4a 100644 (file)
                     "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
+                }
             }
         ]
     }
index 8a82b39..ac4b959 100644 (file)
@@ -40,7 +40,7 @@
                 "processors": [
                     {
                         "onlinehelphtml": "<p>help button HTML</p>",
-                        "offlinehelphtml": "<p>help button HTML</p>",
+                        "offlinehelphtml": "<p>help button HTML</p>"
                     }
                 ],
                 "notifications": [
                                     "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
+                                }
                             }
                         ]
                     }
index 313729b..c220e71 100644 (file)
@@ -36,7 +36,7 @@
         "processors": [
             {
                 "onlinehelphtml": "<p>help button HTML</p>",
-                "offlinehelphtml": "<p>help button HTML</p>",
+                "offlinehelphtml": "<p>help button HTML</p>"
             }
         ],
         "notifications": [
                             "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
+                        }
                     }
                 ]
             }
index ca33fd8..acc39f8 100644 (file)
@@ -50,7 +50,7 @@
                     "displayname": "When I'm offline",
                     "checked": 0,
                     "iconurl": "some url"
-                },
+                }
             }
         ]
     }
index b772f82..b030b51 100644 (file)
@@ -38,7 +38,7 @@
         "name": "popup",
         "hassettings": 1,
         "userid": 3,
-        "contextid": 3,
+        "contextid": 3
     }
 }}
 <th {{^userconfigured}}class="unconfigured"{{/userconfigured}} data-processor-name="{{name}}">
index 28c89f1..5118bc0 100644 (file)
@@ -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">
index 23f192b..60d2ec2 100644 (file)
@@ -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}}">
index 4b107de..bd1abf5 100644 (file)
@@ -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.
 }}
 
index 79835b1..888da9f 100644 (file)
@@ -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>
index 49ee55c..864e05d 100644 (file)
@@ -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"
     }
 }}
index 7ac97df..afc6a9d 100644 (file)
@@ -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 }}
index dc27695..331c7a3 100644 (file)
         "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">
index 0770f59..5b4bd0c 100644 (file)
@@ -36,7 +36,7 @@
     {
         "title": "Example modal",
         "body": "Some example content for the body",
-        "footer": "Footer text, right here!",
+        "footer": "Footer text, right here!"
     }
 }}
 
index 78634da..fd62cd4 100644 (file)
@@ -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"}
         ]
     }
 
index 203ba17..34889dc 100644 (file)
@@ -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}}
index bc769ab..91bb1a5 100644 (file)
@@ -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">
index 6b3c59e..8906fa8 100644 (file)
@@ -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>