From ec2aa74d36670d74c153aa0022ab22e79502a061 Mon Sep 17 00:00:00 2001
From: David Luevano Alvarado <david@luevano.xyz>
Date: Tue, 2 May 2023 01:33:25 -0600
Subject: update to new version of pyssg
---
plt/art/index.html | 2 +-
plt/art/page.html | 8 ++++----
plt/art/page_list.html | 12 ++++++------
plt/art/page_list_entry.html | 4 ++--
plt/art/tag.html | 2 +-
plt/base.html | 13 ++++++-------
plt/blog/page.html | 10 +++++-----
plt/blog/page_list.html | 8 ++++----
plt/highlightjs.html | 6 +++---
9 files changed, 32 insertions(+), 33 deletions(-)
(limited to 'plt')
diff --git a/plt/art/index.html b/plt/art/index.html
index 87c083d..45c1907 100644
--- a/plt/art/index.html
+++ b/plt/art/index.html
@@ -45,7 +45,7 @@
{{tag_list.print(all_tags, "art-tags")}}
{%import "art/page_list.html" as page_list%}
- {{page_list.print(all_pages)}}
+ {{page_list.print(all_pages, config)}}
{%endblock body_content%}
{%block body_footer%}
diff --git a/plt/art/page.html b/plt/art/page.html
index 837422e..4506e27 100644
--- a/plt/art/page.html
+++ b/plt/art/page.html
@@ -42,11 +42,11 @@
{%block body_content%}
<h1>{{page.title}}</h1>
- <a class="zoom-in" href="{{page.image_url}}" alt="See raw.">
+ <a class="zoom-in" href="{{config['url']['static']}}/{{page.meta['image_url'][0]}}" alt="See raw.">
{%if page.summary is not none%}
- <img src="{{page.image_url}}" alt="{{page.summary}}">
+ <img src="{{config['url']['static']}}/{{page.meta['image_url'][0]}}" alt="{{page.summary}}">
{%else%}
- <img src="{{page.image_url}}">
+ <img src="{{config['url']['static']}}/{{page.meta['image_url'][0]}}">
{%endif%}
</a>
@@ -58,7 +58,7 @@
<hr>
<div class="art-info">
<p>By {{', '.join(page.author)}}</p>
- <p>Posted: {{page.cdate}}</p>
+ <p>Posted: {{page.cdate('date')}}</p>
{%import "tag_list.html" as tag_list%}
{{tag_list.print(page.tags, "art-tags")}}
</div>
diff --git a/plt/art/page_list.html b/plt/art/page_list.html
index c634bcf..2a51d25 100644
--- a/plt/art/page_list.html
+++ b/plt/art/page_list.html
@@ -1,21 +1,21 @@
-{%macro print(pages)%}
+{%macro print(pages, config)%}
{%import "art/page_list_entry.html" as art_entry%}
<div class="art-grid">
{%for p in pages%}
{%if p.meta['tall'] is defined%}
{%if p.meta['wide'] is defined%}
- {{art_entry.print(p, 'tall wide')}}
+ {{art_entry.print(p, config, 'tall wide')}}
{%else%}
- {{art_entry.print(p, 'tall')}}
+ {{art_entry.print(p, config, 'tall')}}
{%endif%}
{%elif p.meta['wide'] is defined%}
{%if p.meta['tall'] is defined%}
- {{art_entry.print(p, 'tall wide')}}
+ {{art_entry.print(p, config, 'tall wide')}}
{%else%}
- {{art_entry.print(p, 'tall')}}
+ {{art_entry.print(p, config, 'tall')}}
{%endif%}
{%else%}
- {{art_entry.print(p)}}
+ {{art_entry.print(p, config)}}
{%endif%}
{%endfor%}
</div>
diff --git a/plt/art/page_list_entry.html b/plt/art/page_list_entry.html
index 1790025..0dea100 100644
--- a/plt/art/page_list_entry.html
+++ b/plt/art/page_list_entry.html
@@ -1,5 +1,5 @@
-{%macro print(page, class='')%}
+{%macro print(page, config, class='')%}
<a class="zoom-in {{class}}" href="{{page.url}}" alt="{{page.title}}">
- <img src="{{page.image_url}}" alt="{{page.title}}">
+ <img src="{{config['url']['static']}}/{{page.meta['image_url'][0]}}" alt="{{page.title}}">
</a>
{%endmacro%}
diff --git a/plt/art/tag.html b/plt/art/tag.html
index 8881998..aa1c0b9 100644
--- a/plt/art/tag.html
+++ b/plt/art/tag.html
@@ -38,7 +38,7 @@
<h1>Art filtered by {{tag[0]}}</h1>
{%import "art/page_list.html" as page_list%}
- {{page_list.print(tag_pages)}}
+ {{page_list.print(tag_pages, config)}}
{%endblock body_content%}
diff --git a/plt/base.html b/plt/base.html
index d5cb77b..5548ec9 100644
--- a/plt/base.html
+++ b/plt/base.html
@@ -2,20 +2,19 @@
<html class="theme-dark" lang="{%block html_lang%}{%endblock html_lang%}"
prefix="og: https://ogp.me/ns#">
<head>
- <base href="{{config['url']['static']}}">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="icon" href="images/icons/favicon.ico">
+ <link rel="icon" href="{{config['url']['static']}}/images/icons/favicon.ico">
{%block head_title%}{%endblock head_title%}
{%block head_description%}{%endblock head_description%}
{%block head_rss%}{%endblock head_rss%}
<!-- general style -->
- <link rel="stylesheet" type="text/css" href="css/style.css">
- <link rel="stylesheet" type="text/css" href="fork-awesome/css/fork-awesome.min.css">
- <link rel="stylesheet" type="text/css" href="font-awesome/css/all.min.css">
+ <link rel="stylesheet" type="text/css" href="{{config['url']['static']}}/css/style.css">
+ <link rel="stylesheet" type="text/css" href="{{config['url']['static']}}/fork-awesome/css/fork-awesome.min.css">
+ <link rel="stylesheet" type="text/css" href="{{config['url']['static']}}/font-awesome/css/all.min.css">
<!-- theme related -->
- <script type="text/javascript" src="scripts/theme.js"></script>
- <link id="theme-css" rel="stylesheet" type="text/css" href="css/theme.css">
+ <script type="text/javascript" src="{{config['url']['static']}}/scripts/theme.js"></script>
+ <link id="theme-css" rel="stylesheet" type="text/css" href="{{config['url']['static']}}/css/theme.css">
<!-- extra -->
{%block head_extra%}{%endblock head_extra%}
<!-- og meta -->
diff --git a/plt/blog/page.html b/plt/blog/page.html
index 71b4cfe..40a98e2 100644
--- a/plt/blog/page.html
+++ b/plt/blog/page.html
@@ -22,12 +22,12 @@
{%block head_extra%}
{%import "highlightjs.html" as hljs%}
-{{hljs.print()}}
+{{hljs.print(config)}}
{%endblock head_extra%}
{%block gdscript_hl%}
<!-- Specific to GDScript -->
-<script type="text/javascript" src="hl/languages/gdscript.min.js"></script>
+<script type="text/javascript" src="{{config['url']['static']}}/hl/languages/gdscript.min.js"></script>
{%endblock gdscript_hl%}
{%block head_og%}
@@ -60,9 +60,9 @@
<hr>
<div class="article-info">
<p>By {{', '.join(page.author)}}</p>
- <p>Created: {{page.cdate}}</p>
- {%if page.mdate is not none%}
- <p>Modified: {{page.mdate}}</p>
+ <p>Created: {{page.cdate('date')}}</p>
+ {%if page.mdatetime is not none%}
+ <p>Modified: {{page.mdate('date')}}</p>
{%endif%}
{%import "tag_list.html" as tag_list%}
{{tag_list.print(page.tags, "article-tags")}}
diff --git a/plt/blog/page_list.html b/plt/blog/page_list.html
index b818884..33201f8 100644
--- a/plt/blog/page_list.html
+++ b/plt/blog/page_list.html
@@ -3,13 +3,13 @@
<ul class="page-list">
{%for p in pages%}
{%if loop.previtem%}
- {%if loop.previtem.cdate_list_sep != p.cdate_list_sep%}
- <h3>{{p.cdate_list_sep}}</h3>
+ {%if loop.previtem.cdate('list_sep_date') != p.cdate('list_sep_date')%}
+ <h3>{{p.cdate('list_sep_date')}}</h3>
{%endif%}
{%else%}
- <h3>{{p.cdate_list_sep}}</h3>
+ <h3>{{p.cdate('list_sep_date')}}</h3>
{%endif%}
- <li>{{p.cdate_list}} - <a href="{{p.url}}">{{p.title}}</a></li>
+ <li>{{p.cdate('list_date')}} - <a href="{{p.url}}">{{p.title}}</a></li>
{%endfor%}
</ul>
{%endmacro%}
diff --git a/plt/highlightjs.html b/plt/highlightjs.html
index 0a1ded3..d44f3e8 100644
--- a/plt/highlightjs.html
+++ b/plt/highlightjs.html
@@ -1,9 +1,9 @@
-{%macro print()%}
+{%macro print(config)%}
<!-- highlight support for code blocks -->
-<script type="text/javascript" src="hl/highlight.min.js"></script>
+<script type="text/javascript" src="{{config['url']['static']}}/hl/highlight.min.js"></script>
{%block gdscript_hl%}{%endblock gdscript_hl%}
<script type="text/javascript">
hljs.initHighlightingOnLoad();
</script>
-<link id="code-theme-css" rel="stylesheet" type="text/css" href="hl/styles/nord.min.css">
+<link id="code-theme-css" rel="stylesheet" type="text/css" href="{{config['url']['static']}}/hl/styles/nord.min.css">
{%endmacro%}
\ No newline at end of file
--
cgit v1.2.3-70-g09d2