From a9969735db98ec286063c5772e53ad6411997c6b Mon Sep 17 00:00:00 2001 From: Heitor Pascoal de Bittencourt Date: Mon, 31 Jul 2023 13:27:33 -0300 Subject: [PATCH 01/13] Allow markdown in caption of figures --- templates/shortcodes/figure.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shortcodes/figure.html b/templates/shortcodes/figure.html index b9de271..e014068 100644 --- a/templates/shortcodes/figure.html +++ b/templates/shortcodes/figure.html @@ -2,7 +2,7 @@
{% if caption %} -
{{ caption }}
+
{{ caption | markdown() | safe }}
{% endif %}
{% endif %} From 4ce06e1894a3fea96b689e03bef5fa4098a05f46 Mon Sep 17 00:00:00 2001 From: Antonios Barotsis Date: Wed, 2 Aug 2023 21:49:04 +0300 Subject: [PATCH 02/13] Added the option to only show the description Co-authored-by: Antonios Barotsis Co-authored-by: Bkeinn <60117033+Bkeinn@users.noreply.github.com> --- templates/index.html | 3 ++- templates/macros/post.html | 8 ++++++-- templates/page.html | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/index.html b/templates/index.html index 86cb0cd..280971e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -71,7 +71,8 @@ {%- for page in show_pages %}
{{ post_macros::header(page=page) }} - {{ post_macros::content(page=page, summary=true) }} + + {{ post_macros::content(page=page, summary=true, show_only_description=page.extra.show_only_description | default(value=false)) }}
{% endfor -%} {% else %} + {#- full content -#}
{{ page.content | safe }}
diff --git a/templates/page.html b/templates/page.html index fea56bb..9dea4cc 100644 --- a/templates/page.html +++ b/templates/page.html @@ -7,7 +7,7 @@ {% block content %}
{{ post_macros::header(page=page) }} - {{ post_macros::content(page=page, summary=true, show_only_description=false) }} + {{ post_macros::content(page=page, summary=false, show_only_description=false) }} {{ post_macros::earlier_later(page=page) }}
{% endblock content %} From d22b1e5a9e4f9338aad21bd05e5b7fb7c7d1a1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Romanowski?= Date: Mon, 18 Dec 2023 21:26:15 +0100 Subject: [PATCH 08/13] Mention Markdown support in figure captions --- README.md | 6 +++--- content/welcome-terminimal-theme.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cef9347..586b50c 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Example: Same as `image`, but with a few extra optional arguments: -- **`caption`** +- **`caption`** (supports markdown) - **`caption_position`** (center \[default\] | left | right) - **`caption_style`** @@ -97,8 +97,8 @@ Example: style="width: 25%;", position="right", caption_position="left", - caption="Ferris, the (unofficial) Rust mascot", - caption_style="font-weight: bold; font-style: italic;") }} + caption="**Ferris**, the (unofficial) Rust mascot", + caption_style="font-style: italic;") }} ``` ## OpenGraph diff --git a/content/welcome-terminimal-theme.md b/content/welcome-terminimal-theme.md index 32a356e..d7bda16 100644 --- a/content/welcome-terminimal-theme.md +++ b/content/welcome-terminimal-theme.md @@ -77,7 +77,7 @@ figure(src="http://rustacean.net/assets/rustacean-flat-gesture.png", style="width: 25%;", position="center", caption_position="left", - caption="Ferris, the (unofficial) Rust mascot", + caption="**Ferris**, the (unofficial) Rust mascot", caption_style="font-weight: bold; font-style: italic;") ``` @@ -85,8 +85,8 @@ figure(src="http://rustacean.net/assets/rustacean-flat-gesture.png", style="width: 25%;", position="center", caption_position="left", - caption="Ferris, the (unofficial) Rust mascot", - caption_style="font-weight: bold; font-style: italic;") }} + caption="**Ferris**, the (unofficial) Rust mascot", + caption_style="font-style: italic;") }} --- From bef4cc90204025ba411d31dc591338d0c9760dd3 Mon Sep 17 00:00:00 2001 From: Heitor Pascoal de Bittencourt Date: Tue, 6 Feb 2024 15:31:27 -0300 Subject: [PATCH 09/13] shortcodes: use async and lazy for images. Zola v0.18 added an option to set all images with `decoding=async` and `load=lazy`, but this only applies to `` tags generated from Markdown `![]()` syntax. This patch adds these attributes by default to `figure` and `image` macros. --- templates/shortcodes/figure.html | 2 +- templates/shortcodes/image.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/shortcodes/figure.html b/templates/shortcodes/figure.html index e014068..d841b5c 100644 --- a/templates/shortcodes/figure.html +++ b/templates/shortcodes/figure.html @@ -1,6 +1,6 @@ {% if src %}
- + {% if caption %}
{{ caption | markdown() | safe }}
{% endif %} diff --git a/templates/shortcodes/image.html b/templates/shortcodes/image.html index 091eeb8..7a2f044 100644 --- a/templates/shortcodes/image.html +++ b/templates/shortcodes/image.html @@ -4,5 +4,5 @@ {# ... then prepend the site's base URL to the image's URL. #} {% set src = config.base_url ~ src %} {% endif %} - + {% endif %} From 4be31aa151fe23d963e126466f3b001382a389d6 Mon Sep 17 00:00:00 2001 From: Heitor Pascoal de Bittencourt Date: Tue, 5 Mar 2024 09:29:16 -0300 Subject: [PATCH 10/13] tag page: add / to "all tags" link This is to improve Google indexing pages, for the /tags/ page. In GitHub Pages, the URL /tags does not exist per se, but is a redirect to /tags/. Google Crawler gets confused with 301 HTTP status and does not index it. --- templates/tags/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/tags/single.html b/templates/tags/single.html index 92183b6..19c899b 100644 --- a/templates/tags/single.html +++ b/templates/tags/single.html @@ -12,7 +12,7 @@ ({{ term.pages | length }} post{{ term.pages | length | pluralize }}) - + Show all tags From cf114ec7e2685b002d06f9198d205826f590ea65 Mon Sep 17 00:00:00 2001 From: Lucas Kent Date: Sat, 4 May 2024 12:20:58 +1000 Subject: [PATCH 11/13] Fix postview navigation --- templates/macros/post.html | 50 ++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/templates/macros/post.html b/templates/macros/post.html index c8627c9..5ea20d1 100644 --- a/templates/macros/post.html +++ b/templates/macros/post.html @@ -33,31 +33,33 @@ {% macro earlier_later(page) %} - {%- if config.extra.enable_post_view_navigation and page.lower or page.higher %} -