mirror of
https://github.com/welpo/tabi.git
synced 2026-03-14 03:57:20 +01:00
Merge 8c24c2bab5 into 3896c1597c
This commit is contained in:
commit
0c603d6a42
5 changed files with 35 additions and 10 deletions
|
|
@ -100,11 +100,20 @@
|
|||
{% if config.extra.full_content_in_feed %}
|
||||
<content type="html">{{ page.content }}</content>
|
||||
{% endif -%}
|
||||
{% if page.description -%}
|
||||
<summary type="html">{{ page.description }}</summary>
|
||||
{% elif page.summary -%}
|
||||
<summary type="html">{{ page.summary | striptags | trim_end_matches(pat=".") | safe }}…</summary>
|
||||
{% endif -%}
|
||||
{% if page.description or page.summary or config.extra.auto_generate_post_summary %}
|
||||
<summary type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">
|
||||
{% if page.description -%}
|
||||
<p>{{ page.description | markdown(inline=true) | safe }}</p>
|
||||
{% endif %}
|
||||
{% if page.summary -%}
|
||||
<p>{{ page.summary | striptags | trim_end_matches(pat=".") | safe }}…</p>
|
||||
{% elif config.extra.auto_generate_post_summary %}
|
||||
<p>{{ page.content | striptags | truncate(length=config.extra.auto_generated_summary_length) | safe }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</summary>
|
||||
{% endif %}
|
||||
</entry>
|
||||
{%- endfor %}
|
||||
</feed>
|
||||
|
|
|
|||
|
|
@ -164,9 +164,12 @@
|
|||
|
||||
<div class="description">
|
||||
{% if post.description %}
|
||||
<p>{{ post.description | markdown(inline=true) | safe }}</p>
|
||||
{% elif post.summary %}
|
||||
<p>{{ post.summary | markdown(inline=true) | trim_end_matches(pat=".") | safe }}…</p>
|
||||
<p>{{ post.description | markdown(inline=true) | safe }}</p>
|
||||
{% endif %}
|
||||
{% if post.summary %}
|
||||
<p>{{ post.summary | striptags | trim_end_matches(pat=".") | safe }}…</p>
|
||||
{% elif config.extra.auto_generate_post_summary %}
|
||||
<p>{{ post.content | striptags | truncate(length=config.extra.auto_generated_summary_length) | safe }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
<a class="readmore" href="{{ post.permalink }}">{{ macros_translate::translate(key="read_more", default="Read more", language_strings=language_strings) }} <span class="arrow">→</span></a>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue