Merge branch 'main' of github.com:welpo/tabi

This commit is contained in:
Jeremiah Russell 2025-02-21 14:33:12 +00:00
commit 89ebc6d253
No known key found for this signature in database
GPG key ID: E576B835ACE207E5
50 changed files with 861 additions and 227 deletions

View file

@ -58,7 +58,7 @@
{{ post.date | date(format="%d %b", locale=date_locale) }}
</span>
</div>
<a href="{{ post.permalink }}" title="{{ post.title }}">{{ post.title }}</a>
<a href="{{ post.permalink }}" title="{{ post.title }}">{{ post.title | markdown(inline=true) | safe }}</a>
</li>
{% endfor %}
</ul>

View file

@ -9,6 +9,7 @@
<?xml-stylesheet href="{{ get_url(path='/feed_style.xsl', trailing_slash=false) | safe }}" type="text/xsl"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="{{ lang }}">
<tabi:metadata xmlns:tabi="https://github.com/welpo/tabi">
<tabi:base_url>{{ config.base_url }}</tabi:base_url>
<tabi:separator>
{{ config.extra.separator | default(value="•") }}
</tabi:separator>
@ -71,6 +72,12 @@
{%- if macros_settings::evaluate_setting_priority(setting="hide_from_feed", page=page, default_global_value=false) == "true" -%}
{%- continue -%}
{%- endif -%}
{#- Skip if hide_from_main_feed is true and this is the main feed -#}
{%- if macros_settings::evaluate_setting_priority(setting="hide_from_main_feed", page=page, default_global_value=false) == "true"
and not section
and not term -%}
{%- continue -%}
{%- endif -%}
<entry xml:lang="{{ page.lang }}">
<title>{{ page.title }}</title>
<published>{{ page.date | date(format="%+") }}</published>

View file

@ -108,7 +108,7 @@ Current section extra: {% if current_section %}{{ current_section.extra | json_e
<main>
<article class="h-entry">
<h1 class="p-name article-title">
{{ page.title }}
{{ page.title | markdown(inline=true) | safe }}
</h1>
<a class="u-url u-uid" href="{{ page.permalink | safe }}"></a>
@ -179,7 +179,7 @@ Current section extra: {% if current_section %}{{ current_section.extra | json_e
</ul><ul class="dt-updated meta last-updated"><li>{{ updated_str }}</li>
{#- Show link to remote changes if enabled -#}
{%- if config.extra.remote_repository_url and macros_settings::evaluate_setting_priority(setting="show_remote_changes", page=page, default_global_value=true) == "true" -%}
<li>{%- if previous_visible -%}{{ separator_with_class | safe }}{%- endif -%}<a href="{% include "partials/history_url.html" %}" {{ blank_target }} rel="{{ rel_attributes }}">{{ macros_translate::translate(key="see_changes", default="See changes", language_strings=language_strings) }}<small>&nbsp;<span class="arrow-corner"></span></small></a></li>
<li>{%- if previous_visible -%}{{ separator_with_class | safe }}{%- endif -%}<a class="external" href="{% include "partials/history_url.html" %}" {{ blank_target }} rel="{{ rel_attributes }}">{{ macros_translate::translate(key="see_changes", default="See changes", language_strings=language_strings) }}</a></li>
{%- endif -%}
{% endif %}
</ul>
@ -304,13 +304,13 @@ Current section extra: {% if current_section %}{{ current_section.extra | json_e
<div>
{%- if left_link and left_label and left_title -%}
<a href="{{ left_link | safe }}" aria-label="{{ left_label }}" aria-describedby="left_title"><span class="arrow"></span>&nbsp;{{ left_label }}</a>
<p aria-hidden="true" id="left_title">{{ left_title | truncate(length=100, end="…") }}</p>
<p aria-hidden="true" id="left_title">{{ left_title | truncate(length=100, end="…") | markdown(inline=true) | safe }}</p>
{%- endif -%}
</div>
<div>
{%- if right_link and right_label and right_title -%}
<a href="{{ right_link | safe }}" aria-label="{{ right_label }}" aria-describedby="right_title">{{ right_label }}&nbsp;<span class="arrow"></span></a>
<p aria-hidden="true" id="right_title">{{ right_title | truncate(length=100, end="…") }}</p>
<p aria-hidden="true" id="right_title">{{ right_title | truncate(length=100, end="…") | markdown(inline=true) | safe }}</p>
{%- endif -%}
</div>
</nav>

View file

@ -38,10 +38,10 @@
{% endif %}
<div class="card-info">
<h2 class="card-title">{{ page.title }}</h2>
<h2 class="card-title">{{ page.title | markdown(inline=true) | safe }}</h2>
<div class="card-description">
{% if page.description %}
{{ page.description }}
{{ page.description | markdown(inline=true) | safe }}
{% endif %}
</div>
</div>

View file

@ -62,9 +62,12 @@
<script defer src="{{ get_url(path='js/copyCodeToClipboard.min.js', trailing_slash=false) | safe }}"></script>
{%- endif -%}
{# JavaScript to use the "Show source or path" on code blocks shortcode: https://welpo.github.io/tabi/blog/shortcodes/#show-source-or-path #}
{%- if macros_settings::evaluate_setting_priority(setting="add_src_to_code_block", page=page_s, section=section_s, default_global_value=false) == "true" -%}
<script defer src="{{ get_url(path='js/addSrcToCodeBlock.min.js', trailing_slash=false) | safe }}"></script>
{# JavaScript to make code block names clickable when they are URLs: https://welpo.github.io/tabi/blog/shortcodes/#show-source-or-path #}
{# Note: "add_src_to_code_block" is deprecated in favor of "code_block_name_links". It will be removed in a future release. #}
{# See https://github.com/welpo/tabi/pull/489 #}
{%- if macros_settings::evaluate_setting_priority(setting="code_block_name_links", page=page_s, section=section_s, default_global_value=false) == "true"
or macros_settings::evaluate_setting_priority(setting="add_src_to_code_block", page=page_s, section=section_s, default_global_value=false) == "true" -%}
<script defer src="{{ get_url(path='js/codeBlockNameLinks.min.js', trailing_slash=false) | safe }}"></script>
{%- endif -%}
{# Add backlinks to footnotes #}