projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6eb6c5f)
MDL-56989 boost: fix template lint issues
authorDan Poltawski <dan@moodle.com>
Wed, 16 Nov 2016 14:39:04 +0000 (14:39 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Nov 2016 14:56:29 +0000 (14:56 +0000)
1) Add example context where missing
2) Don't use an uncessary function in JS

theme/boost/templates/columns1.mustache patch | blob | blame | history
theme/boost/templates/columns2.mustache patch | blob | blame | history
theme/boost/templates/embedded.mustache patch | blob | blame | history
theme/boost/templates/maintenance.mustache patch | blob | blame | history
theme/boost/templates/secure.mustache patch | blob | blame | history

diff --git a/theme/boost/templates/columns1.mustache b/theme/boost/templates/columns1.mustache
index 657d9e1..162abae 100644 (file)
--- a/theme/boost/templates/columns1.mustache
+++ b/theme/boost/templates/columns1.mustache
@@ -27,8 +27,13 @@
     Example context (json):
     {
         "sitename": "Moodle",
-        "output": {"doctype": "<!DOCTYPE html>", "page_title": "Test page", "favicon": "favicon.ico"},
-        "bodyattributes":""
+        "output": {
+            "doctype": "<!DOCTYPE html>",
+            "page_title": "Test page",
+            "favicon": "favicon.ico",
+            "main_content": "<h1>Headings make html validators happier</h1>"
+         },
+         "bodyattributes":""
     }
 }}
 {{{ output.doctype }}}
@@ -64,5 +69,5 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader'], function() {});
+require(['theme_boost/loader']);
 {{/js}}
diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index 6162339..682c3fc 100644 (file)
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -34,9 +34,14 @@
     Example context (json):
     {
         "sitename": "Moodle",
-        "output": {"doctype": "<!DOCTYPE html>", "page_title": "Test page", "favicon": "favicon.ico"},
+        "output": {
+            "doctype": "<!DOCTYPE html>",
+            "page_title": "Test page",
+            "favicon": "favicon.ico",
+            "main_content": "<h1>Headings make html validators happier</h1>"
+         },
         "bodyattributes":"",
-        "sitepreblocks":"BLOCKS HTML",
+        "sidepreblocks": "<h2>Blocks html goes here</h2>",
         "hasblocks":true,
         "navdraweropen":true,
         "regionmainsettingsmenu": "",
@@ -115,6 +120,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader'], function() {});
-require(['theme_boost/drawer'], function(mod) {mod.init();});
+require(['theme_boost/loader']);
+require(['theme_boost/drawer'], function(mod) {
+    mod.init();
+});
 {{/js}}
diff --git a/theme/boost/templates/embedded.mustache b/theme/boost/templates/embedded.mustache
index 5d939ab..e38dab6 100644 (file)
--- a/theme/boost/templates/embedded.mustache
+++ b/theme/boost/templates/embedded.mustache
@@ -1,3 +1,37 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template theme_boost/maintenance
+
+    Boost maintenance layout template.
+
+    Context variables required for this template:
+    * output - The core renderer for the page
+
+    Example context (json):
+    {
+        "output": {
+            "doctype": "<!DOCTYPE html>",
+            "page_title": "Test page",
+            "favicon": "favicon.ico",
+            "main_content": "<h1>Headings make html validators happier</h1>"
+         }
+    }
+}}
 {{{ output.doctype }}}
 <html {{{ output.htmlattributes }}}>
 <head>
@@ -19,5 +53,5 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader'], function() {});
+require(['theme_boost/loader']);
 {{/js}}
diff --git a/theme/boost/templates/maintenance.mustache b/theme/boost/templates/maintenance.mustache
index d642262..608e4af 100644 (file)
--- a/theme/boost/templates/maintenance.mustache
+++ b/theme/boost/templates/maintenance.mustache
@@ -1,3 +1,37 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template theme_boost/maintenance
+
+    Boost maintenance layout template.
+
+    Context variables required for this template:
+    * output - The core renderer for the page
+
+    Example context (json):
+    {
+        "output": {
+            "doctype": "<!DOCTYPE html>",
+            "page_title": "Test page",
+            "favicon": "favicon.ico",
+            "main_content": "<h1>Headings make html validators happier</h1>"
+         }
+    }
+}}
 {{{ output.doctype }}}
 <html {{{ output.htmlattributes }}}>
 <head>
@@ -40,5 +74,5 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader'], function() {});
+require(['theme_boost/loader']);
 {{/js}}
diff --git a/theme/boost/templates/secure.mustache b/theme/boost/templates/secure.mustache
index edd5717..b75d798 100644 (file)
--- a/theme/boost/templates/secure.mustache
+++ b/theme/boost/templates/secure.mustache
@@ -1,3 +1,39 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template theme_boost/secure
+
+    Boost secure layout template.
+
+    Context variables required for this template:
+    * sitename - The name of the site
+    * output - The core renderer for the page
+
+      Example context (json):
+    {
+        "sitename": "Moodle",
+        "output": {
+            "doctype": "<!DOCTYPE html>",
+            "page_title": "Test page",
+            "favicon": "favicon.ico",
+            "main_content": "<h1>Headings make html validators happier</h1>"
+         }
+    }
+}}
 {{{ output.doctype }}}
 <html {{{ output.htmlattributes }}}>
 <head>
@@ -60,5 +96,5 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader'], function() {});
+require(['theme_boost/loader']);
 {{/js}}
Moodle official production repository