From 5c224d8afff30f4f63cee6b755ff0a8f01234214 Mon Sep 17 00:00:00 2001 From: JamesRamm Date: Fri, 23 Mar 2018 22:08:34 +0100 Subject: [PATCH] Fixes #96 and drops django 1.9 --- .../products/templates/products/product.html | 38 +++++++++++++++++++ .../templates/products/product_index.html | 21 ++++++++++ setup.py | 2 +- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 longclaw/project_template/products/templates/products/product.html create mode 100644 longclaw/project_template/products/templates/products/product_index.html diff --git a/longclaw/project_template/products/templates/products/product.html b/longclaw/project_template/products/templates/products/product.html new file mode 100644 index 0000000..bdc20ac --- /dev/null +++ b/longclaw/project_template/products/templates/products/product.html @@ -0,0 +1,38 @@ +{% templatetag openblock %} extends "base.html" {% templatetag closeblock %} + +{% templatetag openblock %} load wagtailcore_tags wagtailimages_tags {% templatetag closeblock %} + +{% templatetag openblock %} block body_class {% templatetag closeblock %} template-productpage {% templatetag openblock %}endblock{% templatetag closeblock %} + +{% templatetag openblock %} block content {% templatetag closeblock %} +
+
+ {% templatetag openblock %} if page.images {% templatetag closeblock %} + {% templatetag openblock %} for item in page.images.all {% templatetag closeblock %} +
+ {% templatetag openblock %} image item.image fill-320x240 {% templatetag closeblock %} +

{% templatetag openvariable %} item.caption {% templatetag closevariable %}

+
+ {% templatetag openblock %} endfor {% templatetag closeblock %} + {% templatetag openblock %} else {% templatetag closeblock %} + + {% templatetag openblock %} endif {% templatetag closeblock %} +
+ + +
+ {% templatetag openblock %} if page.tags.all.count {% templatetag closeblock %} +
+

Tags

+ {% templatetag openblock %} for tag in page.tags.all {% templatetag closeblock %} + + {% templatetag openblock %} endfor {% templatetag closeblock %} +
+ {% templatetag openblock %} endif {% templatetag closeblock %} + +

Return

+ +{% templatetag openblock %} endblock {% templatetag closeblock %} diff --git a/longclaw/project_template/products/templates/products/product_index.html b/longclaw/project_template/products/templates/products/product_index.html new file mode 100644 index 0000000..ce47611 --- /dev/null +++ b/longclaw/project_template/products/templates/products/product_index.html @@ -0,0 +1,21 @@ +{% templatetag openblock %} extends "base.html" {% templatetag closeblock %} + +{% templatetag openblock %} load wagtailcore_tags wagtailimages_tags {% templatetag closeblock %} + +{% templatetag openblock %} block body_class {% templatetag closeblock %}template-productindex{% templatetag openblock %} endblock {% templatetag closeblock %} + +{% templatetag openblock %} block content {% templatetag closeblock %} +

{% templatetag openvariable %} page.title {% templatetag closevariable %}

+
+{% templatetag openblock %} for post in page.get_children {% templatetag closeblock %} + {% templatetag openblock %} with post=post.specific {% templatetag closeblock %} +
+
+

{% templatetag openvariable %} post.title {% templatetag closevariable %}

+

{% templatetag openvariable %} post.description|richtext {% templatetag closevariable %}

+
+
+ {% templatetag openblock %} endwith {% templatetag closeblock %} +{% templatetag openblock %} endfor {% templatetag closeblock %} +
+{% templatetag openblock %} endblock {% templatetag closeblock %} diff --git a/setup.py b/setup.py index 7eae266..616a0e7 100755 --- a/setup.py +++ b/setup.py @@ -87,7 +87,7 @@ setup( ], include_package_data=True, install_requires=[ - 'django>=1.9', + 'django>=1.10', 'wagtail>1.12,<2.0', 'django-countries>=4.3', 'django-extensions>=1.7.5',