From 64c96f5122d9250d4a7394d9a1a5cb003fd4d396 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Tue, 9 Feb 2016 22:03:18 +0100 Subject: [PATCH] [enh] move to template inheritance to avoid redudency --- prosopopee/templates/base.html | 35 ++++++++++++++++ prosopopee/templates/index.html | 73 +++++++++++---------------------- prosopopee/templates/page.html | 58 ++++++++------------------ 3 files changed, 76 insertions(+), 90 deletions(-) create mode 100644 prosopopee/templates/base.html diff --git a/prosopopee/templates/base.html b/prosopopee/templates/base.html new file mode 100644 index 0000000..06cef16 --- /dev/null +++ b/prosopopee/templates/base.html @@ -0,0 +1,35 @@ + + + + + + + {% block css %} + {% endblock %} + + + + {{ settings.title }} + + + + +
+ +

{{ settings.title }}

+ {% if settings.sub_title -%}

{{ settings.sub_title }}

{% endif -%} +
+ {% if settings.menu -%} + {% include 'menu.html' %} + {% endif -%} +
+ + + {% block content %} + {% endblock %} + + + + diff --git a/prosopopee/templates/index.html b/prosopopee/templates/index.html index 5d13d7f..a94247e 100644 --- a/prosopopee/templates/index.html +++ b/prosopopee/templates/index.html @@ -1,53 +1,26 @@ - - - - - - +{% extends "base.html" %} - - - {{ settings.title }} - - - - -
- -

{{ settings.title }}

- {% if settings.sub_title -%}

{{ settings.sub_title }}

{% endif -%} -
- {% if settings.menu -%} - {% include 'menu.html' %} - {% endif -%} +{% block content %} +
+ {% for galleries_line in galleries|reverse|batch(3)|reverse %} +
+ {% for gallery in galleries_line|reverse %}
+ +
+

{{ gallery.title }}

+ {% if gallery.sub_title %}

{{ gallery.sub_title }}

{% endif %} + {% if gallery.date %}
{{ gallery.date.strftime("%d %B %Y") }}
{% endif %} +
+ + {% set cover = Image(gallery.cover) %} + {{ cover.copy() }} +
+
{% endfor %}
+ {% endfor %} +
- -
- {% for galleries_line in galleries|reverse|batch(3)|reverse %} -
- {% for gallery in galleries_line|reverse %}
- -
-

{{ gallery.title }}

- {% if gallery.sub_title %}

{{ gallery.sub_title }}

{% endif %} - {% if gallery.date %}
{{ gallery.date.strftime("%d %B %Y") }}
{% endif %} -
- - {% set cover = Image(gallery.cover) %} - {{ cover.copy() }} -
-
{% endfor %} -
- {% endfor %} -
- -

.

- - - - +

.

+{% endblock %} diff --git a/prosopopee/templates/page.html b/prosopopee/templates/page.html index 25d6762..87b5354 100644 --- a/prosopopee/templates/page.html +++ b/prosopopee/templates/page.html @@ -1,48 +1,26 @@ - - - - - - - +{% extends "base.html" %} - - - {{ settings.title }} - +{% block css %} + +{% endblock %} - - -
- -

{{ settings.title }}

- {% if settings.sub_title -%}

{{ settings.sub_title }}

{% endif -%} -
- {% if settings.menu -%} - {% include 'menu.html' %} - {% endif -%} -
-
-

{{ pages.title }}

-
+{% block content %} +
+

{{ pages.title }}

+
{% for section in pages.sections %} {% include "sections/" + section.type + ".html" %} {% endfor %} -
-
- - - -
- - +
+
+ + + +
- - - + +{% endblock %}