summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolpeon <git@volpeon.ink>2022-08-23 14:07:20 +0200
committerVolpeon <git@volpeon.ink>2022-08-23 14:07:20 +0200
commit7c655a95058aa753355251eb78b83d31d44972ab (patch)
tree9024a3d991727d1f10f99d62497bdd5228e01640
parentUpdate (diff)
downloadvolpeon.ink-7c655a95058aa753355251eb78b83d31d44972ab.tar.gz
volpeon.ink-7c655a95058aa753355251eb78b83d31d44972ab.tar.bz2
volpeon.ink-7c655a95058aa753355251eb78b83d31d44972ab.zip
Better navigation of related content
Diffstat
-rw-r--r--scripts/lib/common.lua34
-rw-r--r--scripts/metadata.lua13
-rw-r--r--scripts/page.lua11
-rw-r--r--templates/partials/gallery_card.html52
-rw-r--r--templates/partials/grid_card.html76
-rw-r--r--templates/partials/list_card.html16
-rw-r--r--templates/partials/related.html17
7 files changed, 114 insertions, 105 deletions
diff --git a/scripts/lib/common.lua b/scripts/lib/common.lua
index ee7c6aa..d3c6c44 100644
--- a/scripts/lib/common.lua
+++ b/scripts/lib/common.lua
@@ -1,15 +1,4 @@
1function dump(o) 1local utils = require 'pandoc.utils'
2 if type(o) == 'table' then
3 local s = '{ '
4 for k, v in pairs(o) do
5 if type(k) ~= 'number' then k = '"' .. k .. '"' end
6 s = s .. '[' .. k .. '] = ' .. dump(v) .. ','
7 end
8 return s .. '} '
9 else
10 return tostring(o)
11 end
12end
13 2
14function string.split(str, sep) 3function string.split(str, sep)
15 sep = sep or '%s' 4 sep = sep or '%s'
@@ -82,6 +71,25 @@ function pandoc.List:shuffle()
82 return self 71 return self
83end 72end
84 73
74function dump(o)
75 if type(o) == 'table' then
76 local s = '{ '
77 for k, v in pairs(o) do
78 if type(k) ~= 'number' then k = '"' .. k .. '"' end
79 s = s .. '[' .. k .. '] = ' .. dump(v) .. ','
80 end
81 return s .. '} '
82 else
83 return tostring(o)
84 end
85end
86
87function prep_layout(layout)
88 layout = utils.stringify(layout)
89 return { id = layout, ["is_" .. layout] = true }
90end
91
85return { 92return {
86 dump = dump 93 dump = dump,
94 prep_layout = prep_layout
87} 95}
diff --git a/scripts/metadata.lua b/scripts/metadata.lua
index 9c8a964..843ed3c 100644
--- a/scripts/metadata.lua
+++ b/scripts/metadata.lua
@@ -42,11 +42,6 @@ function resolve_layout(depth)
42 return layout 42 return layout
43end 43end
44 44
45function prep_layout(layout)
46 layout = utils.stringify(layout)
47 return { id = layout, ["is_" .. layout] = true }
48end
49
50function prep_namespace(namespace) 45function prep_namespace(namespace)
51 namespace = utils.stringify(namespace) 46 namespace = utils.stringify(namespace)
52 47
@@ -138,11 +133,11 @@ function process_base(build, meta)
138 meta.title = meta.title and utils.stringify(meta.title) or "" 133 meta.title = meta.title and utils.stringify(meta.title) or ""
139 meta.slug = slug(meta.title) 134 meta.slug = slug(meta.title)
140 meta.schema_type = meta.schema_type or "CreativeWork" 135 meta.schema_type = meta.schema_type or "CreativeWork"
141 meta.list_layout = prep_layout(meta.list_layout or "list") 136 meta.list_layout = common.prep_layout(meta.list_layout or "list")
142 meta.list_order = meta.list_order and utils.stringify(meta.list_order) 137 meta.list_order = meta.list_order and utils.stringify(meta.list_order)
143 meta.position = meta.position and tonumber(utils.stringify(meta.position)) 138 meta.position = meta.position and tonumber(utils.stringify(meta.position))
144 meta.thumbnail = meta.thumbnail and make_absolute("thumbnail." .. utils.stringify(meta.thumbnail), meta.file_out) 139 meta.thumbnail = meta.thumbnail and make_absolute("thumbnail." .. utils.stringify(meta.thumbnail), meta.file_out)
145 meta.layout = prep_layout(meta.layout or (meta.redirect and "redirect") or resolve_layout(meta.depth)) 140 meta.layout = common.prep_layout(meta.layout or (meta.redirect and "redirect") or resolve_layout(meta.depth))
146 141
147 meta.show_date = meta.parent and meta.parent.list_order == "date_desc" 142 meta.show_date = meta.parent and meta.parent.list_order == "date_desc"
148 meta.category = meta.parent and meta.parent.title 143 meta.category = meta.parent and meta.parent.title
@@ -179,8 +174,8 @@ function find_pos(meta)
179 174
180 if index == nil then return end 175 if index == nil then return end
181 176
182 meta.prev = index >= 2 and pages[index - 1] or nil 177 meta.prev = index <= #pages - 1 and pages[index + 1] or nil
183 meta.next = index <= #pages - 1 and pages[index + 1] or nil 178 meta.next = index >= 2 and pages[index - 1] or nil
184end 179end
185 180
186function Meta(meta) 181function Meta(meta)
diff --git a/scripts/page.lua b/scripts/page.lua
index 7378bfc..48eef6e 100644
--- a/scripts/page.lua
+++ b/scripts/page.lua
@@ -144,11 +144,20 @@ function generate_related(meta)
144 meta.prev = meta.prev and d1_page_to_list_item(deref(meta.prev)) 144 meta.prev = meta.prev and d1_page_to_list_item(deref(meta.prev))
145 meta.next = meta.next and d1_page_to_list_item(deref(meta.next)) 145 meta.next = meta.next and d1_page_to_list_item(deref(meta.next))
146 146
147 if meta.prev then meta.prev.is_prev = true end
148 if meta.next then meta.next.is_next = true end
149
147 if not meta.prev and not meta.next then return nil end 150 if not meta.prev and not meta.next then return nil end
148 151
152 local layout = meta.parent.list_layout
153 local layout_id = utils.stringify(layout.id)
154 if layout_id ~= "grid-2" and layout_id ~= "gallery-2" then
155 layout = common.prep_layout("grid-2")
156 end
157
149 return { 158 return {
150 url = meta.parent.url, 159 url = meta.parent.url,
151 layout = meta.parent.list_layout, 160 layout = layout,
152 prev = meta.prev, 161 prev = meta.prev,
153 next = meta.next 162 next = meta.next
154 } 163 }
diff --git a/templates/partials/gallery_card.html b/templates/partials/gallery_card.html
index 38daa0e..6802faa 100644
--- a/templates/partials/gallery_card.html
+++ b/templates/partials/gallery_card.html
@@ -19,30 +19,47 @@
19 /> 19 />
20 </div> 20 </div>
21 </div> 21 </div>
22
22 <div class="c-card__row l-media c-card__row--hidden"> 23 <div class="c-card__row l-media c-card__row--hidden">
23 $if(it.indicator)$ 24 $if(it.indicator)$
24 <div class="c-card__indicator l-media__block"></div> 25 <div class="c-card__indicator l-media__block"></div>
25 $endif$ 26 $endif$
26 $if(it.icon)$ 27 $if(it.is_prev)$
28 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
29 <use href="$assets.icons_svg$#arrow-left"></use>
30 </svg>
31 $elseif(it.is_next)$
32 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
33 <use href="$assets.icons_svg$#blank"></use>
34 </svg>
35 $elseif(it.icon)$
27 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true"> 36 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
28 <use href="$assets.icons_svg$#$it.icon$"></use> 37 <use href="$assets.icons_svg$#$it.icon$"></use>
29 </svg> 38 </svg>
30 $endif$ 39 $endif$
31 <div class="l-media__block l-media__block--main"> 40 <div class="l-media__block l-media__block--main">
32 $if(it.subtitle)$ 41 $if(it.is_prev)$
42 <small class="u-d-block">Previous</small>
43 <div>
44 <strong class="p-name" itemprop="name headline">$it.title$</strong>
45 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
46 </div>
47 $elseif(it.is_next)$
48 <small class="u-d-block">Next</small>
49 <div>
50 <strong class="p-name" itemprop="name headline">$it.title$</strong>
51 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
52 </div>
53 $elseif(it.subtitle)$
33 <div> 54 <div>
34 <strong class="p-name" itemprop="name headline">$it.title$</strong> 55 <strong class="p-name" itemprop="name headline">$it.title$</strong>
35 $if(it.draft)$ 56 $if(it.draft)$
36 <span class="o-badge u-ml-100">Draft</span> 57 <span class="o-badge u-ml-100">Draft</span>
37 $endif$ 58 $endif$
38 </div> 59 </div>
39 <small class="u-d-block"> 60 <small class="u-d-block">$it.subtitle$</small>
40 $it.subtitle$
41 </small>
42 $elseif(it.category)$ 61 $elseif(it.category)$
43 <small class="u-d-block"> 62 <small class="u-d-block">$it.category$</small>
44 $it.category$
45 </small>
46 <div> 63 <div>
47 <strong class="p-name" itemprop="name headline"> 64 <strong class="p-name" itemprop="name headline">
48 $it.title$ 65 $it.title$
@@ -59,20 +76,19 @@
59 </small> 76 </small>
60 <div> 77 <div>
61 <strong class="p-name" itemprop="name headline">$it.title$</strong> 78 <strong class="p-name" itemprop="name headline">$it.title$</strong>
62 $if(it.draft)$ 79 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
63 <span class="o-badge u-ml-100">Draft</span>
64 $endif$
65 </div> 80 </div>
66 $else$ 81 $else$
67 <span class="p-name" itemprop="name headline"> 82 <span class="p-name" itemprop="name headline">$it.title$</span>
68 $it.title$ 83 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
69 </span>
70 $if(it.draft)$
71 <span class="o-badge u-ml-100">Draft</span>
72 $endif$
73 $endif$ 84 $endif$
74 </div> 85 </div>
75 $if(it.post_icon)$ 86 $if(it.is_next)$
87 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
88 <use href="$assets.icons_svg$#arrow-right"></use>
89 </svg>
90 $elseif(it.is_prev)$
91 $elseif(it.post_icon)$
76 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true"> 92 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
77 <use href="$assets.icons_svg$#$it.post_icon$"></use> 93 <use href="$assets.icons_svg$#$it.post_icon$"></use>
78 </svg> 94 </svg>
diff --git a/templates/partials/grid_card.html b/templates/partials/grid_card.html
index 9a0b06e..e75fa51 100644
--- a/templates/partials/grid_card.html
+++ b/templates/partials/grid_card.html
@@ -9,38 +9,45 @@
9 $endif$ 9 $endif$
10> 10>
11 <div class="c-card__row l-media"> 11 <div class="c-card__row l-media">
12 $if(it.indicator)$ 12 $if(it.is_prev)$
13 <div class="c-card__indicator l-media__block"></div> 13 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
14 $endif$ 14 <use href="$assets.icons_svg$#arrow-left"></use>
15 $if(it.icon)$ 15 </svg>
16 $elseif(it.is_next)$
17 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
18 <use href="$assets.icons_svg$#blank"></use>
19 </svg>
20 $elseif(it.icon)$
16 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true"> 21 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
17 <use href="$assets.icons_svg$#$it.icon$"></use> 22 <use href="$assets.icons_svg$#$it.icon$"></use>
18 </svg> 23 </svg>
24 $elseif(it.indicator)$
25 <div class="c-card__indicator l-media__block"></div>
19 $endif$ 26 $endif$
20 <div class="l-media__block l-media__block--main"> 27 <div class="l-media__block l-media__block--main">
21 $if(it.subtitle)$ 28 $if(it.is_prev)$
29 <small class="u-d-block">Previous</small>
22 <div> 30 <div>
23 <strong class="p-name" itemprop="name headline"> 31 <strong class="p-name" itemprop="name headline">$it.title$</strong>
24 $it.title$ 32 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
25 </strong>
26 $if(it.draft)$
27 <span class="o-badge u-ml-100">Draft</span>
28 $endif$
29 </div> 33 </div>
30 <small class="u-d-block"> 34 $elseif(it.is_next)$
31 $it.subtitle$ 35 <small class="u-d-block">Next</small>
32 </small> 36 <div>
37 <strong class="p-name" itemprop="name headline">$it.title$</strong>
38 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
39 </div>
40 $elseif(it.subtitle)$
41 <div>
42 <strong class="p-name" itemprop="name headline">$it.title$</strong>
43 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
44 </div>
45 <small class="u-d-block">$it.subtitle$</small>
33 $elseif(it.category)$ 46 $elseif(it.category)$
34 <small class="u-d-block"> 47 <small class="u-d-block">$it.category$</small>
35 $it.category$
36 </small>
37 <div> 48 <div>
38 <strong class="p-name" itemprop="name headline"> 49 <strong class="p-name" itemprop="name headline">$it.title$</strong>
39 $it.title$ 50 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
40 </strong>
41 $if(it.draft)$
42 <span class="o-badge u-ml-100">Draft</span>
43 $endif$
44 </div> 51 </div>
45 $elseif(it.show_date)$ 52 $elseif(it.show_date)$
46 <small class="u-d-block"> 53 <small class="u-d-block">
@@ -49,23 +56,20 @@
49 </time> 56 </time>
50 </small> 57 </small>
51 <div> 58 <div>
52 <strong class="p-name" itemprop="name headline"> 59 <strong class="p-name" itemprop="name headline">$it.title$</strong>
53 $it.title$ 60 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
54 </strong>
55 $if(it.draft)$
56 <span class="o-badge u-ml-100">Draft</span>
57 $endif$
58 </div> 61 </div>
59 $else$ 62 $else$
60 <span class="p-name" itemprop="name headline"> 63 <span class="p-name" itemprop="name headline">$it.title$</span>
61 $it.title$ 64 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
62 </span>
63 $if(it.draft)$
64 <span class="o-badge u-ml-100">Draft</span>
65 $endif$
66 $endif$ 65 $endif$
67 </div> 66 </div>
68 $if(it.post_icon)$ 67 $if(it.is_next)$
68 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
69 <use href="$assets.icons_svg$#arrow-right"></use>
70 </svg>
71 $elseif(it.is_prev)$
72 $elseif(it.post_icon)$
69 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true"> 73 <svg class="l-media__block o-icon" width="1em" height="1em" aria-hidden="true">
70 <use href="$assets.icons_svg$#$it.post_icon$"></use> 74 <use href="$assets.icons_svg$#$it.post_icon$"></use>
71 </svg> 75 </svg>
diff --git a/templates/partials/list_card.html b/templates/partials/list_card.html
index e12f62f..713919a 100644
--- a/templates/partials/list_card.html
+++ b/templates/partials/list_card.html
@@ -18,21 +18,13 @@
18 </svg> 18 </svg>
19 $endif$ 19 $endif$
20 <div class="l-media__block l-media__block--main"> 20 <div class="l-media__block l-media__block--main">
21 <span class="p-name" itemprop="name headline"> 21 <span class="p-name" itemprop="name headline">$it.title$</span>
22 $it.title$ 22 $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
23 </span>
24 $if(it.draft)$
25 <span class="o-badge u-ml-100">Draft</span>
26 $endif$
27 </div> 23 </div>
28 $if(it.subtitle)$ 24 $if(it.subtitle)$
29 <small class="l-media__block u-d-none@sm-lo"> 25 <small class="l-media__block u-d-none@sm-lo">$it.subtitle$</small>
30 $it.subtitle$
31 </small>
32 $elseif(it.category)$ 26 $elseif(it.category)$
33 <small class="l-media__block u-d-none@sm-lo"> 27 <small class="l-media__block u-d-none@sm-lo">$it.category$</small>
34 $it.category$
35 </small>
36 $elseif(it.show_date)$ 28 $elseif(it.show_date)$
37 <small class="l-media__block u-d-none@sm-lo"> 29 <small class="l-media__block u-d-none@sm-lo">
38 <time datetime="$it.last_update.yyyy_mm_dd$" class="dt-updated" itemprop="dateModified"> 30 <time datetime="$it.last_update.yyyy_mm_dd$" class="dt-updated" itemprop="dateModified">
diff --git a/templates/partials/related.html b/templates/partials/related.html
index 7d29c7a..3097866 100644
--- a/templates/partials/related.html
+++ b/templates/partials/related.html
@@ -16,24 +16,9 @@ $if(related)$
16 $if(related.layout.is_grid-2)$ 16 $if(related.layout.is_grid-2)$
17 $related.prev:partials/grid_card()$ 17 $related.prev:partials/grid_card()$
18 $related.next:partials/grid_card()$ 18 $related.next:partials/grid_card()$
19 $elseif(related.layout.is_grid-3)$ 19 $else$
20 $related.prev:partials/grid_card()$
21 $related.next:partials/grid_card()$
22 $elseif(related.layout.is_gallery-2)$
23 $related.prev:partials/gallery_card()$
24 $related.next:partials/gallery_card()$
25 $elseif(related.layout.is_gallery-3)$
26 $related.prev:partials/gallery_card()$ 20 $related.prev:partials/gallery_card()$
27 $related.next:partials/gallery_card()$ 21 $related.next:partials/gallery_card()$
28 $else$
29 <div class="u-d-contents u-d-none@sm-lo">
30 $related.prev:partials/list_card()$
31 $related.next:partials/list_card()$
32 </div>
33 <div class="u-d-contents u-d-none@sm-hi">
34 $related.prev:partials/grid_card()$
35 $related.next:partials/grid_card()$
36 </div>
37 $endif$ 22 $endif$
38 </div> 23 </div>
39 </div> 24 </div>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-25 06:27:26 +0000