diff --git a/_includes/head.html b/_includes/head.html index a6fc255..839af65 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -20,7 +20,7 @@ {% unless src contains '://' %} {%- capture img_url -%} - {% include img-url.html src=src img_path=page.img_path %} + {% include img-url.html src=src img_path=page.img_path absolute=true %} {%- endcapture -%} {%- capture old_url -%}{{ src | absolute_url }}{%- endcapture -%} @@ -31,15 +31,20 @@ {% elsif site.social_preview_image %} {%- capture img_url -%} - {% include img-url.html src=site.social_preview_image %} + {% include img-url.html src=site.social_preview_image absolute=true %} {%- endcapture -%} {%- capture og_image -%} {%- endcapture -%} - {% assign old_meta_clip = ' + + {%- endcapture -%} + + {% assign old_meta_clip = '' %} + {% assign new_meta_clip = og_image | append: twitter_image %} {% assign seo_tags = seo_tags | replace: old_meta_clip, new_meta_clip %} {% endif %} @@ -85,7 +90,7 @@ {% endif %} - + diff --git a/_includes/img-url.html b/_includes/img-url.html index 44a80af..c08e8b9 100644 --- a/_includes/img-url.html +++ b/_includes/img-url.html @@ -2,8 +2,9 @@ Generate image final URL based on `site.img_cdn`, `page.img_path` Arguments: - src - basic image path, required - img_path - relative path of image, optional + src - required, basic image path + img_path - optional, relative path of image + absolute - optional, boolean, if true, generate absolute URL Return: image URL @@ -14,7 +15,7 @@ {%- if url -%} {% unless url contains ':' %} {%- comment -%} CND URL {%- endcomment -%} - {% assign prefix = site.img_cdn | default: '' | relative_url %} + {% assign prefix = site.img_cdn | default: '' %} {%- comment -%} Add page image path prefix {%- endcomment -%} {% assign url = include.img_path | default: '' | append: '/' | append: url %} @@ -26,6 +27,12 @@ | replace: '//', '/' | replace: ':', ':/' %} + + {% if include.absolute %} + {% assign url = url | absolute_url %} + {% else %} + {% assign url = url | relative_url %} + {% endif %} {% endunless %} {%- endif -%}