From 3dd09899ffabe697af0a16cf2c2d04e7239e0f3e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 9 Jun 2015 15:46:40 +0100 Subject: [PATCH 1/3] Fixed import of compress --- wagtail/project_template/project_name/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/project_template/project_name/templates/base.html b/wagtail/project_template/project_name/templates/base.html index 5ddfd5f9a..804c40577 100644 --- a/wagtail/project_template/project_name/templates/base.html +++ b/wagtail/project_template/project_name/templates/base.html @@ -1,4 +1,4 @@ -{% templatetag openblock %} load compress static wagtailuserbar {% templatetag closeblock %} +{% templatetag openblock %} load static wagtailuserbar {% templatetag closeblock %} From 3da4d3a17e0842c24f46813020fcb273fd761d31 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 9 Jun 2015 15:49:49 +0100 Subject: [PATCH 2/3] Escaped template comments --- wagtail/project_template/project_name/templates/base.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wagtail/project_template/project_name/templates/base.html b/wagtail/project_template/project_name/templates/base.html index 804c40577..76c7680ac 100644 --- a/wagtail/project_template/project_name/templates/base.html +++ b/wagtail/project_template/project_name/templates/base.html @@ -12,11 +12,11 @@ - {# Global stylesheets #} + {% templatetag opencomment %} Global stylesheets {% templatetag closecomment %} {% templatetag openblock %} block extra_css {% templatetag closeblock %} - {# Override this in templates to add extra stylesheets #} + {% templatetag opencomment %} Override this in templates to add extra stylesheets {% templatetag closecomment %} {% templatetag openblock %} endblock {% templatetag closeblock %} @@ -25,11 +25,11 @@ {% templatetag openblock %} block content {% templatetag closeblock %}{% templatetag openblock %} endblock {% templatetag closeblock %} - {# Global javascript #} + {% templatetag opencomment %} Global javascript {% templatetag closecomment %} {% templatetag openblock %} block extra_js {% templatetag closeblock %} - {# Override this in templates to add extra javascript #} + {% templatetag opencomment %} Override this in templates to add extra javascript {% templatetag closecomment %} {% templatetag openblock %} endblock {% templatetag closeblock %} From c19e35b2d0961815b0033f2beb10362784bc45f2 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 9 Jun 2015 15:51:07 +0100 Subject: [PATCH 3/3] Fixed position of quote character --- wagtail/project_template/search/templates/search/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/project_template/search/templates/search/search.html b/wagtail/project_template/search/templates/search/search.html index 778d93621..848c3e372 100644 --- a/wagtail/project_template/search/templates/search/search.html +++ b/wagtail/project_template/search/templates/search/search.html @@ -9,7 +9,7 @@

Search

- +