chore: Merge latest changes from the main branch

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) %}
 

templates/partials/footer.html

@@ -2,17 +2,11 @@
 
 {%- 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` -#}
-{%- set generate_feed = config.generate_feeds | default(value=config.generate_feed) -%}
-{%- set feed_url = config.feed_filenames[0] | default(value=(config.feed_filename)) -%}
-{%- set should_show_feed = generate_feed and config.extra.feed_icon and feed_url -%}
+{%- set feed_url = feed_utils::get_feed_url() -%}
+{%- set should_show_feed = feed_utils::should_show_footer_feed_icon() -%}
 
 {%- set should_show_footer_icons = should_show_feed or config.extra.socials or config.extra.email -%}
 

templates/partials/hcard.html

@@ -0,0 +1,75 @@
+{%- set hcard = config.extra.hcard -%}
+
+{% set full_name = config.author %}
+{% if hcard.full_name %}
+  {% set full_name = hcard.full_name %}
+{% endif %}
+
+{%- set homepage = config.base_url -%}
+{% if hcard.homepage %}
+  {%- set homepage = hcard.homepage -%}
+{% endif %}
+
+{% if hcard.enable %}
+<div class="h-card hidden">
+  <div>
+    {%- if hcard.avatar -%}
+    <img
+      class="u-photo"
+      src="{{ get_url(path=hcard.avatar) }}"
+      width="200"
+      height="200"
+      alt="{{ full_name }}"
+    />
+    {%- endif -%}
+
+    <span class="p-name" rel="me">{{ full_name }}</span>
+
+    {% if hcard.p_nickname %}
+    ( <span class="p-nickname">{{ hcard.p_nickname }}</span> )
+    {% endif %}
+  </div>
+
+  {% if hcard.biography %}
+  <p class="p-note">{{ hcard.biography }}</p>
+  {% endif %}
+
+  {# links #}
+  <div>
+    {%- if hcard.with_mail and config.extra.email and not config.extra.encode_plaintext_email -%}
+    <span>
+      <a class="u-email" href="mailto:{{ config.extra.email | safe }}">email</a>
+    </span> -
+    {%- endif -%}
+
+    <span>
+      <a class="u-url u-id" href="{{ homepage }}">homepage</a>
+    </span> -
+
+    {%- if hcard.with_social_links and config.extra.socials %}
+      {% for social in config.extra.socials %}
+      <span>
+        <a class="p-url" rel="me" href="{{ social.url | safe }}">{{ social.name }}</a>
+      </span> -
+      {% endfor %}
+    {% endif %}
+  </div>
+
+  {# additional properties #}
+  {% set dl_started = false %}
+  {% for key, value in hcard %}
+    {% if key not in ['enable', 'with_mail', 'with_social_links', 'homepage', 'full_name', 'avatar', 'biography', 'p_nickname'] %}
+      {% if not dl_started %}
+        <dl>
+        {% set_global dl_started = true %}
+      {% endif %}
+      <dt>{{ key | replace(from="p_", to="") | replace(from="u_", to="") | replace(from="dt_", to="") | replace(from="_", to=" ") | capitalize }}</dt>
+      <dd class="{{ key | replace(from="_", to="-") }}">{{ value }}</dd>
+    {% endif %}
+  {% endfor %}
+  {% if dl_started %}
+    </dl>
+  {% endif %}
+
+  </div>
+{% endif %}

templates/partials/title.html

@@ -1,4 +1,7 @@
 {#- Setup -#}
+{% if not config.title %}
+{{ throw(message="ERROR: No `title` set in `config.toml`. tabi requires a title to function.") }}
+{% endif %}
 {%- set prefix = config.title | safe -%}
 {%- set custom_separator = config.extra.separator | default(value="•") -%}
 {%- set separator = " " ~ custom_separator ~ " " -%}