if share-img not provided, use cover-img or thumbnail. Also make sure all images work with both relative and absolute paths

This commit is contained in:
Dean Attali 2020-07-07 05:14:01 +00:00
parent 88464eb569
commit b2b6922a8f
5 changed files with 35 additions and 22 deletions

View file

@ -80,15 +80,30 @@
<link rel="canonical" href="{{ page.url | absolute_url | strip_index }}">
{% endif %}
{% if page.share-img %}
<meta property="og:image" content="{{ page.share-img | absolute_url }}">
{% elsif site.avatar %}
<meta property="og:image" content="{{ site.avatar | absolute_url }}">
{%- capture shareimg -%}
{% if page.share-img %}
{{ page.share-img }}
{% elsif page.cover-img %}
{% if page.cover-img.first %}
{{ page.cover-img[0].first.first }}
{% else %}
{{ page.cover-img }}
{% endif %}
{% elsif page.thumbnail-img %}
{{ page.thumbnail-img }}
{% elsif site.avatar %}
{{ site.avatar }}
{% endif %}
{% endcapture %}
{% assign shareimg=shareimg | strip %}
{% if shareimg != "" %}
<meta property="og:image" content="{{ shareimg | absolute_url }}">
{% endif %}
<!-- Twitter summary cards -->
{% if page.share-img %}
{% if shareimg != "" %}
<meta name="twitter:card" content="summary_large_image">
{% else %}
<meta name="twitter:card" content="summary">
@ -112,10 +127,8 @@
<meta name="twitter:description" content="{{ page.content | strip_html | xml_escape | truncatewords: 50 }}">
{% endif %}
{% if page.share-img %}
<meta name="twitter:image" content="{{ page.share-img | absolute_url }}">
{% elsif site.avatar %}
<meta name="twitter:image" content="{{ site.avatar | absolute_url }}">
{% if shareimg != "" %}
<meta name="twitter:image" content="{{ shareimg | absolute_url }}">
{% endif %}
{% if site.matomo %}

View file

@ -10,10 +10,10 @@
{% assign imgnum = forloop.index %}
{% for imginfo in bigimg %}
{% if imginfo[0] %}
data-img-src-{{ imgnum }}="{{ imginfo[0] | relative_url }}"
data-img-src-{{ imgnum }}="{{ imginfo[0] | absolute_url }}"
data-img-desc-{{ imgnum }}="{{ imginfo[1] }}"
{% else %}
data-img-src-{{ imgnum }}="{{ imginfo | relative_url }}"
data-img-src-{{ imgnum }}="{{ imginfo | absolute_url }}"
{% endif %}
{% endfor %}
{% endfor %}