diff --git a/README.md b/README.md index a84cbb2..ceec3e2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Contributors Forks - + Last commit
diff --git a/static/social_icons/itchio.svg b/static/social_icons/itchio.svg new file mode 100644 index 0000000..4a4ac25 --- /dev/null +++ b/static/social_icons/itchio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index d3d0cc1..6933a48 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,6 +6,7 @@ {% import "macros/table_of_contents.html" as macros_toc %} {% import "macros/translate.html" as macros_translate %} {% import "macros/series_page.html" as macros_series_page %} +{% import "macros/target_attribute.html" as macros_target_attribute %} {# Load the internationalisation data for the current language from the .toml files in the user's '/i18n' folder, falling back to the theme's. diff --git a/templates/macros/target_attribute.html b/templates/macros/target_attribute.html new file mode 100644 index 0000000..2da5b9d --- /dev/null +++ b/templates/macros/target_attribute.html @@ -0,0 +1,11 @@ +{% macro target_attribute(new_tab) %} + +{%- set blank_target = "" -%} + +{%- if new_tab -%} + {%- set blank_target = "target=_blank" -%} +{%- endif -%} + +{{ blank_target }} + +{% endmacro target_attribute %} diff --git a/templates/page.html b/templates/page.html index 7099297..8ed6816 100644 --- a/templates/page.html +++ b/templates/page.html @@ -5,11 +5,7 @@ {%- set rel_attributes = macros_rel_attributes::rel_attributes() | trim -%} -{%- if config.markdown.external_links_target_blank -%} - {%- set blank_target = "target=_blank" -%} -{%- else -%} - {%- set blank_target = "" -%} -{%- endif -%} +{%- set blank_target = macros_target_attribute::target_attribute(new_tab=config.markdown.external_links_target_blank) -%} {# Debugging #} {# 
diff --git a/templates/partials/cards_pages.html b/templates/partials/cards_pages.html
index 0486829..89bdabc 100644
--- a/templates/partials/cards_pages.html
+++ b/templates/partials/cards_pages.html
@@ -7,11 +7,7 @@
             {% break %}
         {% endif %}
         {# Determine which URL to use, default is page.permalink #}
-        {%- if page.extra.link_to and config.markdown.external_links_target_blank -%}
-            {%- set blank_target = "target=_blank" -%}
-        {%- else -%}
-            {%- set blank_target = "" -%}
-        {%- endif -%}
+        {%- set blank_target = macros_target_attribute::target_attribute(new_tab=config.markdown.external_links_target_blank and page.extra.link_to) -%}
 
         {% set target_url = page.extra.link_to | default(value=page.permalink) %}
 
diff --git a/templates/partials/footer.html b/templates/partials/footer.html
index 9d89e1d..9e984ed 100644
--- a/templates/partials/footer.html
+++ b/templates/partials/footer.html
@@ -2,11 +2,7 @@
 
 {%- set rel_attributes = macros_rel_attributes::rel_attributes() | trim -%}
 
-{%- if config.markdown.external_links_target_blank -%}
-    {%- set blank_target = "target=_blank" -%}
-{%- else -%}
-    {%- set blank_target = "" -%}
-{%- endif -%}
+{%- set blank_target = macros_target_attribute::target_attribute(new_tab=config.markdown.external_links_target_blank) -%}
 
 {#- Feed icon -#}
 {#- Zola 0.19.0 uses `generate_feeds`. Prior versions use `generate_feed` -#}