From 009d3f90b1881530bd28003abe83cfc3735882be Mon Sep 17 00:00:00 2001
From: Jieiku
Date: Fri, 25 Aug 2023 01:44:50 -0700
Subject: Refactor Documentation, PWA Fix, image shortcodes fix, simplify js
 script loading

---
 templates/shortcodes/img.html      | 2 +-
 templates/shortcodes/imgswap.html  | 4 ++--
 templates/shortcodes/showdata.html | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 templates/shortcodes/showdata.html

(limited to 'templates/shortcodes')

diff --git a/templates/shortcodes/img.html b/templates/shortcodes/img.html
index d599ba0..f5754ce 100644
--- a/templates/shortcodes/img.html
+++ b/templates/shortcodes/img.html
@@ -27,7 +27,7 @@
   {%- endif %}
 
 {%- else %} {# Same Directory Path #}
-  {%- set path = page.path %}
+  {%- 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="/") %}
diff --git a/templates/shortcodes/imgswap.html b/templates/shortcodes/imgswap.html
index 607febb..efcf6e7 100644
--- a/templates/shortcodes/imgswap.html
+++ b/templates/shortcodes/imgswap.html
@@ -28,7 +28,7 @@
     {%- endif %}
 
   {%- else %} {# Same Directory Path #}
-    {%- set path = page.path %}
+    {%- 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="/") %}
@@ -75,7 +75,7 @@
     {%- endif %}
 
   {%- else %} {# Same Directory Path #}
-    {%- set path = page.path %}
+    {%- 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="/") %}
diff --git a/templates/shortcodes/showdata.html b/templates/shortcodes/showdata.html
new file mode 100644
index 0000000..9c14444
--- /dev/null
+++ b/templates/shortcodes/showdata.html
@@ -0,0 +1,8 @@
+{%- if src and key and type %}
+  {%- if src is matching("^http[s]?://") %}
+    {% set data = load_data(url=src, format=type) %}
+  {%- else %}
+    {% set data = load_data(path=src, format=type) %}
+  {%- endif %}
+  {{ data[key] }}
+{%- endif %}
-- 
cgit v1.3.1