From 08f406c44c861a914c8b63fab454250f8a4c4b36 Mon Sep 17 00:00:00 2001
From: Jieiku
Date: Wed, 20 Sep 2023 00:25:21 -0700
Subject: refactor nav, blocks, macros, templates. fix image shortcodes

---
 templates/shortcodes/imgswap.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'templates/shortcodes/imgswap.html')

diff --git a/templates/shortcodes/imgswap.html b/templates/shortcodes/imgswap.html
index efcf6e7..80a3b74 100644
--- a/templates/shortcodes/imgswap.html
+++ b/templates/shortcodes/imgswap.html
@@ -2,15 +2,16 @@
   {%- set img = main_src | split(pat="/") | last %}
   {%- set dirtest = main_src | trim_start_matches(pat="./") %}
   {%- if dirtest is containing("/") %} {%- set reldir = true %} {%- endif %}
+  {%- if page.path %}{%- set pagepath = page.path %}{%- elif section.path %}{%- set pagepath = section.path %}{%- endif %}
 
   {%- if main_src is starting_with("./") and reldir %} {# Relative Path #}
     {%- set path = main_src | trim_start_matches(pat="./") | split(pat="/") | slice(end=-1) | join(sep="/") | trim_start_matches(pat="/") %}
     {%- set path = path ~ "/" %}
     {%- if not w or not h %}
       {%- if lang != config.default_language %}
-        {%- set metapath = page.path ~ path ~ img | replace(from=page.path | truncate(length=4, end=""), to="/") %}
+        {%- set metapath = pagepath ~ path ~ img | replace(from=pagepath | truncate(length=4, end=""), to="/") %}
       {%- else %}
-        {%- set metapath = page.path ~ path ~ img %}
+        {%- set metapath = pagepath ~ path ~ img %}
       {%- endif %}
       {%- set meta = get_image_metadata(path=metapath) %}
       {%- set w = meta.width %}
@@ -31,9 +32,9 @@
     {%- set path = "" %}
     {%- if not w or not h %}
       {%- if lang != config.default_language %}
-        {%- set metapath = page.path ~ img | replace(from=page.path | truncate(length=4, end=""), to="/") %}
+        {%- set metapath = pagepath ~ img | replace(from=pagepath | truncate(length=4, end=""), to="/") %}
       {%- else %}
-        {%- set metapath = page.path ~ img %}
+        {%- set metapath = pagepath ~ img %}
       {%- endif %}
       {%- set meta = get_image_metadata(path=metapath) %}
       {%- set w = meta.width %}
@@ -55,9 +56,9 @@
     {%- set path = path ~ "/" %}
     {%- if not w or not h %}
       {%- if lang != config.default_language %}
-        {%- set metapath = page.path ~ path ~ img | replace(from=page.path | truncate(length=4, end=""), to="/") %}
+        {%- set metapath = pagepath ~ path ~ img | replace(from=pagepath | truncate(length=4, end=""), to="/") %}
       {%- else %}
-        {%- set metapath = page.path ~ path ~ img %}
+        {%- set metapath = pagepath ~ path ~ img %}
       {%- endif %}
       {%- set meta = get_image_metadata(path=metapath) %}
       {%- set w = meta.width %}
@@ -78,9 +79,9 @@
     {%- set path = "" %}
     {%- if not w or not h %}
       {%- if lang != config.default_language %}
-        {%- set metapath = page.path ~ img | replace(from=page.path | truncate(length=4, end=""), to="/") %}
+        {%- set metapath = pagepath ~ img | replace(from=pagepath | truncate(length=4, end=""), to="/") %}
       {%- else %}
-        {%- set metapath = page.path ~ img %}
+        {%- set metapath = pagepath ~ img %}
       {%- endif %}
       {%- set meta = get_image_metadata(path=metapath) %}
       {%- set w = meta.width %}
-- 
cgit v1.3.1