diff options
| -rw-r--r-- | lib/generators/website.js | 4 | ||||
| -rw-r--r-- | theme/templates/ebook/layout.html | 12 | ||||
| -rw-r--r-- | theme/templates/website/layout.html | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/lib/generators/website.js b/lib/generators/website.js index fbf0a8d..b884527 100644 --- a/lib/generators/website.js +++ b/lib/generators/website.js @@ -4,8 +4,8 @@ var Q = require("q"); var _ = require("lodash"); var nunjucks = require("nunjucks"); -var AutoEscapeExtension = require("nunjucks-autoescape"); -var FilterExtension = require("nunjucks-filter"); +var AutoEscapeExtension = require("nunjucks-autoescape")(nunjucks); +var FilterExtension = require("nunjucks-filter")(nunjucks); var fs = require("../utils/fs"); var BaseGenerator = require("../generator"); diff --git a/theme/templates/ebook/layout.html b/theme/templates/ebook/layout.html index 1ff85bf..c2501b6 100644 --- a/theme/templates/ebook/layout.html +++ b/theme/templates/ebook/layout.html @@ -1,8 +1,8 @@ <!DOCTYPE HTML> <html lang="{{ language }}" {% block htmlTag %}{% endblock %} {% if options.direction == "rtl" %}dir="rtl"{% endif %}> - {{ htmlSnippet("html:start")|default("")|safe }} + {{ htmlSnippet("html:start")|default("", true)|safe }} <head> - {{ htmlSnippet("head:start")|default("")|safe }} + {{ htmlSnippet("head:start")|default("", true)|safe }} <meta charset="UTF-8"> <title>{% block title %}{% endblock %}</title> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> @@ -11,14 +11,14 @@ {% if options.author %}<meta name="author" content="{{ options.author }}">{% endif %} {% if options.isbn %}<meta name="identifier" content="{{ options.isbn }}" scheme="ISBN">{% endif %} {% block head %}{% endblock %} - {{ htmlSnippet("head:end")|default("")|safe }} + {{ htmlSnippet("head:end")|default("", true)|safe }} </head> <body> - {{ htmlSnippet("body:start")|default("")|safe }} + {{ htmlSnippet("body:start")|default("", true)|safe }} {% block style %}{% endblock %} {% block content %}{% endblock %} {% block javascript %}{% endblock %} - {{ htmlSnippet("body:end")|default("")|safe }} + {{ htmlSnippet("body:end")|default("", true)|safe }} </body> - {{ htmlSnippet("html:end")|default("")|safe }} + {{ htmlSnippet("html:end")|default("", true)|safe }} </html> diff --git a/theme/templates/website/layout.html b/theme/templates/website/layout.html index 9e66799..f3817d9 100644 --- a/theme/templates/website/layout.html +++ b/theme/templates/website/layout.html @@ -1,8 +1,8 @@ <!DOCTYPE HTML> <html lang="{{ language }}" {% if options.direction == "rtl" %}dir="rtl"{% endif %}> - {{ htmlSnippet("html:start")|default("")|safe }} + {{ htmlSnippet("html:start")|default("", true)|safe }} <head> - {{ htmlSnippet("head:start")|default("")|safe }} + {{ htmlSnippet("head:start")|default("", true)|safe }} <meta charset="UTF-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge" /> <title>{% block title %}{% endblock %}</title> @@ -19,13 +19,13 @@ <link rel="shortcut icon" href="{{ staticBase }}/images/favicon.ico" type="image/x-icon"> {% block style %}{% endblock %} {% block head %}{% endblock %} - {{ htmlSnippet("head:end")|default("")|safe }} + {{ htmlSnippet("head:end")|default("", true)|safe }} </head> <body> - {{ htmlSnippet("body:start")|default("")|safe }} + {{ htmlSnippet("body:start")|default("", true)|safe }} {% block content %}{% endblock %} {% block javascript %}{% endblock %} - {{ htmlSnippet("body:end")|default("")|safe }} + {{ htmlSnippet("body:end")|default("", true)|safe }} </body> - {{ htmlSnippet("html:end")|default("")|safe }} + {{ htmlSnippet("html:end")|default("", true)|safe }} </html> |