From c78a3f2301caa3dc4c03d3b2a75f4f003e5863d0 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 18 Apr 2023 14:53:30 +0200 Subject: Reformat templates --- templates/404.html | 4 +-- templates/base.html | 2 +- templates/favicon.html | 2 +- templates/footer.html | 2 +- templates/index.html | 6 ++-- templates/nav.html | 14 ++++----- templates/page.html | 48 +++++++++++++++--------------- templates/section.html | 66 +++++++++++++++++++++--------------------- templates/taxonomy_list.html | 20 ++++++------- templates/taxonomy_single.html | 52 ++++++++++++++++----------------- 10 files changed, 108 insertions(+), 108 deletions(-) diff --git a/templates/404.html b/templates/404.html index bfb6e35..15fd75c 100644 --- a/templates/404.html +++ b/templates/404.html @@ -3,6 +3,6 @@ {% block title %}404{% endblock %} {% block main %} -

404

-

ʕノ•ᴥ•ʔノ ︵ ┻━┻

+

404

+

ʕノ•ᴥ•ʔノ ︵ ┻━┻

{% endblock %} diff --git a/templates/base.html b/templates/base.html index 80d1e73..00fcd43 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,7 @@ {%- if config.generate_feed %} {% block rss -%} - {% endblock -%} + {%- endblock -%} {%- endif %} {% include "style.html" ignore missing -%} {% include "custom_head.html" ignore missing -%} diff --git a/templates/favicon.html b/templates/favicon.html index 51d9fbd..cfa2959 100644 --- a/templates/favicon.html +++ b/templates/favicon.html @@ -1,3 +1,3 @@ {% if config.extra.favicon %} -{%- endif %} +{%- endif -%} diff --git a/templates/footer.html b/templates/footer.html index 97d6b89..d0db8c7 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,3 +1,3 @@ {% if not config.extra.hide_made_with_line %} -Made with Zola ʕ•ᴥ•ʔ Bear + Made with Zola ʕ•ᴥ•ʔ Bear {% endif %} diff --git a/templates/index.html b/templates/index.html index 31710be..519bf5f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block main %} - - {{ section.content | safe }} - + + {{ section.content | safe }} + {% endblock %} diff --git a/templates/nav.html b/templates/nav.html index b0cf643..4dd0e63 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -1,10 +1,10 @@ Home {%- if config.extra.main_menu %} -{%- for item in config.extra.main_menu %} -{%- if item.url is matching("https?://") %} -{{ item.name }} -{%- else %} -{{ item.name }} -{%- endif %} -{%- endfor %} + {%- for item in config.extra.main_menu %} + {%- if item.url is matching("https?://") %} + {{ item.name }} + {%- else %} + {{ item.name }} + {%- endif %} + {%- endfor %} {%- endif %} diff --git a/templates/page.html b/templates/page.html index 6651d15..12f0603 100644 --- a/templates/page.html +++ b/templates/page.html @@ -5,29 +5,29 @@ {% endblock %} {% block main %} -{%- if not page.extra.menu %} -

{{ page.title }}

-{%- if page.date %} -

- - - -

-{%- endif %} -{%- endif %} - - {{ page.content | safe }} - -

- {%- if page.taxonomies %} - {%- for name, taxon in page.taxonomies %} - {{ name | capitalize }}: - {%- for item in taxon %} - #{{ item }} - {%- endfor %} - {%- endfor %} + {%- if not page.extra.menu %} +

{{ page.title }}

+ {%- if page.date %} +

+ + + +

+ {%- endif %} {%- endif %} -

+ + {{ page.content | safe }} + +

+ {%- if page.taxonomies %} + {%- for name, taxon in page.taxonomies %} + {{ name | capitalize }}: + {%- for item in taxon %} + #{{ item }} + {%- endfor %} + {%- endfor %} + {%- endif %} +

{% endblock %} diff --git a/templates/section.html b/templates/section.html index c0808f8..ed9fd77 100644 --- a/templates/section.html +++ b/templates/section.html @@ -1,38 +1,38 @@ {% extends "base.html" %} {% block main %} - - {%- if taxonomy.term %} -

Filtering for "{{ section.title }}"

- - Remove filter - - {%- endif %} - - -
- {% set tags = get_taxonomy(kind="tags") %} - {% for post in tags.items %} - #{{ post.name }}  + + {%- if taxonomy.term %} +

Filtering for "{{ section.title }}"

+ + Remove filter + + {%- endif %} +
    + {% for page in section.pages %} +
  • + + + + + + {{ page.title }} +
    • + {% else %} +
  • + No posts yet +
    • {% endfor %} -
- - + + +
+ {% set tags = get_taxonomy(kind="tags") %} + {% for post in tags.items %} + #{{ post.name }}  + {% endfor %} +
+ + {% endblock %} diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html index 876087c..ef28c58 100644 --- a/templates/taxonomy_list.html +++ b/templates/taxonomy_list.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block main %} - - -
- {% set tags = get_taxonomy(kind="tags") %} - {% for post in tags.items %} - #{{ post.name }}  - {% endfor %} -
- - + + +
+ {% set tags = get_taxonomy(kind="tags") %} + {% for post in tags.items %} + #{{ post.name }}  + {% endfor %} +
+ + {% endblock %} diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html index fb65874..460679d 100644 --- a/templates/taxonomy_single.html +++ b/templates/taxonomy_single.html @@ -1,30 +1,30 @@ {% extends "base.html" %} {% block main %} - - {%- if taxonomy.term %} -

Filtering for "{{ term.name }}"

- - Remove filter - - {%- endif %} - - + + {%- if taxonomy.term %} +

Filtering for "{{ term.name }}"

+ + Remove filter + + {%- endif %} + + {% endblock %} -- cgit 1.4.1