diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/index.html | 6 | ||||
| -rw-r--r-- | templates/macros/macros.html | 16 | ||||
| -rw-r--r-- | templates/page.html | 16 |
3 files changed, 29 insertions, 9 deletions
diff --git a/templates/index.html b/templates/index.html index 6d3bfe0..422ad22 100644 --- a/templates/index.html +++ b/templates/index.html @@ -28,10 +28,10 @@ <div> {%- for page in paginator.pages %} <article> - <h1><a href="{{ page.permalink | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ page.title }}</a></h1> + {{- macros::title_index(page=page) }} {%- if config.extra.meta_index.position %} {%- if config.extra.meta_index.position == "top" or config.extra.meta_index.position == "both" %} - {{- macros::title_index(page=page) }} + {{- macros::meta_index(page=page) }} {%- endif %}{%- endif %} <p class="sum"> {%- if page.summary %} @@ -46,7 +46,7 @@ </p> {%- if config.extra.meta_index.position %} {%- if config.extra.meta_index.position == "bottom" or config.extra.meta_index.position == "both" %} - {{- macros::title_index(page=page) }} + {{- macros::meta_index(page=page) }} {%- endif %} {%- endif %} </article> diff --git a/templates/macros/macros.html b/templates/macros/macros.html index c5d7a22..6d86916 100644 --- a/templates/macros/macros.html +++ b/templates/macros/macros.html @@ -1,4 +1,8 @@ -{%- macro title(page) %} +{%- macro title_post(page) %} + <h1><a href="{{ page.permalink | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ page.title }}</a></h1> +{%- endmacro title_post %} + +{%- macro meta_post(page) %} <span{%- if config.extra.meta_post.size %} class="{{ config.extra.meta_post.size }}"{% endif %}> {#- Author #} @@ -36,10 +40,14 @@ {#- Tags #} {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #<a href="{{ get_taxonomy_url(kind='tags', name=tag) | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ tag }}</a> {% endfor -%}{%- endif %}</span> -{%- endmacro title %} - +{%- endmacro meta_post %} {%- macro title_index(page) %} + <h1>{% if config.extra.title_size_index %}<span class="{{ config.extra.title_size_index }}">{% endif %}<a href="{{ page.permalink | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ page.title }}</a>{% if config.extra.title_size_index %}</span>{% endif %}</h1> +{%- endmacro title_index %} + + +{%- macro meta_index(page) %} <span{%- if config.extra.meta_index.size %} class="{{ config.extra.meta_index.size }}"{% endif %}> {#- Author #} @@ -77,7 +85,7 @@ {#- Tags #} {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #<a href="{{ get_taxonomy_url(kind='tags', name=tag) | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ tag }}</a> {% endfor -%}{%- endif %}</span> -{%- endmacro title %} +{%- endmacro meta_index %} diff --git a/templates/page.html b/templates/page.html index cfea5ea..b0fbf83 100644 --- a/templates/page.html +++ b/templates/page.html @@ -32,9 +32,20 @@ {%- block content %} <article> - <h1><a href="{{ page.permalink | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ page.title }}</a></h1> - {{- macros::title(page=page) }} + {{- macros::title_post(page=page) }} + + {%- if config.extra.meta_post.position %} + {%- if config.extra.meta_post.position == "top" or config.extra.meta_post.position == "both" %} + {{- macros::meta_post(page=page) }} + {%- endif %}{%- endif %} + {{ page.content | safe }} + + {%- if config.extra.meta_post.position %} + {%- if config.extra.meta_post.position == "bottom" or config.extra.meta_post.position == "both" %} + {{- macros::meta_post(page=page) }} + {%- endif %}{%- endif %} + {%- block page_footer %} {{- macros::footer(page=page) }} {%- endblock page_footer %} @@ -63,6 +74,7 @@ </div> {%- endif %} {%- endblock toc %} + {%- endblock content %} {%- block gotop %} |