taxonomy titles are now chosen programatically; footer is now always at the bottom; updated taxonomies and readme;

This commit is contained in:
Robert Clarke 2019-05-08 13:07:26 +01:00
parent 599a6f9af0
commit 0f57726bc4
12 changed files with 43 additions and 28 deletions

View file

@ -1,6 +1,5 @@
{% extends "taxonomy_list.html" %}
{% block content %}
{% set title = "All Authors"%}
{{ super() }}
{% endblock content %}

View file

@ -1,6 +1,5 @@
{% extends "taxonomy_single.html" %}
{% block content %}
{% set title = "Author: " ~ term.name %}
{{ super() }}
{% endblock content %}

View file

@ -1,6 +1,5 @@
{% extends "taxonomy_list.html" %}
{% block content %}
{% set title = "All Categories"%}
{{ super() }}
{% endblock content %}

View file

@ -1,6 +1,5 @@
{% extends "taxonomy_single.html" %}
{% block content %}
{% set title = "Category: " ~ term.name %}
{{ super() }}
{% endblock content %}

View file

@ -59,7 +59,7 @@
<main class="index">
<!-- START HERO TITLE -->
{% if config.extra.zulma_title %}
{{ index_macros::hero(title=config.extra.zulma_title) }}
{{ index_macros::hero(title=config.extra.zulma_title, primary=true) }}
{% endif %}
<!-- END HERO TITLE -->
<div class="container">

View file

@ -1,5 +1,9 @@
{% macro hero(title) %}
<section class="hero is-primary is-bold">
{% macro hero(title, primary) %}
{% set class = "is-bold" %}
{% if primary %}
{% set class = class ~ " hero is-primary" %}
{% endif %}
<section class="{{class}}">
<header>
<div class="hero-body">
<div class="container has-text-centered">
@ -30,7 +34,8 @@
{% if paginator.previous %}
<a class="button is-primary pagination-previous" href="{{ paginator.previous }}">&laquo; Previous</a>
{% else %}
<a class="button is-primary pagination-previous" disabled title="This is the first page">&laquo; Previous</a>
<a class="button is-primary pagination-previous" disabled title="This is the first page">&laquo;
Previous</a>
{% endif %}
<ul class="pagination-list">
<li>Page {{ paginator.current_index }} of {{ paginator.number_pagers }}</li>

View file

@ -1,6 +1,5 @@
{% extends "taxonomy_list.html" %}
{% block content %}
{% set title = "All Tags"%}
{{ super() }}
{% endblock content %}

View file

@ -1,6 +1,5 @@
{% extends "taxonomy_single.html" %}
{% block content %}
{% set title = "Tag: " ~ term.name %}
{{ super() }}
{% endblock content %}

View file

@ -10,7 +10,10 @@
<!-- END NAV -->
<main>
<!-- START HERO TITLE -->
{{ index_macros::hero(title=title) }}
{% if not title %}
{% set title = "All " ~ taxonomy.name | title %}
{% endif %}
{{ index_macros::hero(title=title,primary=false) }}
<!-- END HERO TITLE -->
<!-- START TAXONOMY LIST -->
{{ taxonomy_macros::list(terms=terms) }}

View file

@ -11,7 +11,10 @@
<!-- END NAV -->
<main>
<!-- START HERO TITLE -->
{{ index_macros::hero(title=title) }}
{% if not title %}
{% set title = taxonomy.name ~ ": " ~ term.name | capitalize %}
{% endif %}
{{ index_macros::hero(title=title,primary=false) }}
<!-- END HERO TITLE -->
<div class="container">
<!-- START ARTICLE FEED -->