diff options
author | Volpeon <git@volpeon.ink> | 2022-06-16 13:42:26 +0200 |
---|---|---|
committer | Volpeon <git@volpeon.ink> | 2022-06-16 13:42:26 +0200 |
commit | aa4c54317b51dc14ba65d2e091b701ae6640ee80 (patch) | |
tree | 1b78a533299bc1d39e4c2eef611396a241e685c7 | |
parent | Update (diff) | |
download | volpeon.ink-aa4c54317b51dc14ba65d2e091b701ae6640ee80.tar.gz volpeon.ink-aa4c54317b51dc14ba65d2e091b701ae6640ee80.tar.bz2 volpeon.ink-aa4c54317b51dc14ba65d2e091b701ae6640ee80.zip |
WIP: Adding metadata
20 files changed, 186 insertions, 135 deletions
diff --git a/content/art/doodles/2021-lazy-firefox/index.md b/content/art/doodles/2021-lazy-firefox/index.md index 876065b..987dabe 100644 --- a/content/art/doodles/2021-lazy-firefox/index.md +++ b/content/art/doodles/2021-lazy-firefox/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Lazy Firefox | 2 | schema_type: VisualArtwork |
3 | date: 2021-10-16 | 3 | title: Lazy Firefox |
4 | thumbnail: png | 4 | date: 2021-10-16 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/art/drawings/2021-cute-ava/index.md b/content/art/drawings/2021-cute-ava/index.md index d61fef8..c2648ba 100644 --- a/content/art/drawings/2021-cute-ava/index.md +++ b/content/art/drawings/2021-cute-ava/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Cute Avatar | 2 | schema_type: VisualArtwork |
3 | date: 2021-03-01 | 3 | title: Cute Avatar |
4 | thumbnail: png | 4 | date: 2021-03-01 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/art/drawings/2021-eeveelutions/index.md b/content/art/drawings/2021-eeveelutions/index.md index eed478b..c291d74 100644 --- a/content/art/drawings/2021-eeveelutions/index.md +++ b/content/art/drawings/2021-eeveelutions/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Eeveelutions | 2 | schema_type: VisualArtwork |
3 | date: 2021-08-19 | 3 | title: Eeveelutions |
4 | thumbnail: png | 4 | date: 2021-08-19 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/art/drawings/2021-lycanroc-ava/index.md b/content/art/drawings/2021-lycanroc-ava/index.md index 45a5261..08c80e4 100644 --- a/content/art/drawings/2021-lycanroc-ava/index.md +++ b/content/art/drawings/2021-lycanroc-ava/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Lycanroc Avatar | 2 | schema_type: VisualArtwork |
3 | date: 2021-10-19 | 3 | title: Lycanroc Avatar |
4 | thumbnail: png | 4 | date: 2021-10-19 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/art/drawings/2021-refsheet/index.md b/content/art/drawings/2021-refsheet/index.md index 2680f2c..8d85c86 100644 --- a/content/art/drawings/2021-refsheet/index.md +++ b/content/art/drawings/2021-refsheet/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Reference Sheet Views | 2 | schema_type: VisualArtwork |
3 | date: 2021-10-06 | 3 | title: Reference Sheet Views |
4 | thumbnail: png | 4 | date: 2021-10-06 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/art/drawings/2021-spooky-ava-1/index.md b/content/art/drawings/2021-spooky-ava-1/index.md index da5c88e..12cdd89 100644 --- a/content/art/drawings/2021-spooky-ava-1/index.md +++ b/content/art/drawings/2021-spooky-ava-1/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: \"Spooky\" Avatar | 2 | schema_type: VisualArtwork |
3 | date: 2021-10-07 | 3 | title: \"Spooky\" Avatar |
4 | thumbnail: png | 4 | date: 2021-10-07 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/art/drawings/2021-spooky-ava-2/index.md b/content/art/drawings/2021-spooky-ava-2/index.md index 23c9e46..349d318 100644 --- a/content/art/drawings/2021-spooky-ava-2/index.md +++ b/content/art/drawings/2021-spooky-ava-2/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Spooky Avatar | 2 | schema_type: VisualArtwork |
3 | date: 2021-10-14 | 3 | title: Spooky Avatar |
4 | thumbnail: png | 4 | date: 2021-10-14 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/art/drawings/2022-autumn-fox/index.md b/content/art/drawings/2022-autumn-fox/index.md index 9dcea6a..52eadd8 100644 --- a/content/art/drawings/2022-autumn-fox/index.md +++ b/content/art/drawings/2022-autumn-fox/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Autumn Fox | 2 | schema_type: VisualArtwork |
3 | date: 2022-02-25 | 3 | title: Autumn Fox |
4 | thumbnail: png | 4 | date: 2022-02-25 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | First attempt at cel shading. | 8 | First attempt at cel shading. |
diff --git a/content/notebook/scrap/design-test.md b/content/notebook/scrap/design-test.md index 2a272c3..844bdd1 100644 --- a/content/notebook/scrap/design-test.md +++ b/content/notebook/scrap/design-test.md | |||
@@ -1,14 +1,21 @@ | |||
1 | --- | 1 | --- |
2 | title: Markdown Test Page | 2 | schema_type: DigitalDocument |
3 | title: Markdown Test Page | ||
3 | last_update: 2022-06-16 | 4 | last_update: 2022-06-16 |
4 | --- | 5 | --- |
5 | 6 | ||
6 | - [Headings](#headings) | 7 | - [Headings](#headings) |
8 | - [Heading one](#heading-one) | ||
9 | - [Heading two](#heading-two) | ||
10 | - [Heading three](#heading-three) | ||
11 | - [Heading four](#heading-four) | ||
12 | - [Heading five](#heading-five) | ||
13 | - [Heading six](#heading-six) | ||
7 | - [Paragraphs](#paragraphs) | 14 | - [Paragraphs](#paragraphs) |
8 | - [Blockquotes](#blockquotes) | 15 | - [Blockquotes](#blockquotes) |
9 | - [Lists](#lists) | 16 | - [Lists](#lists) |
10 | - [Ordered List](#ordered-list) | 17 | - [Ordered List](#ordered-list) |
11 | - [Unordered List](#unordered-list) | 18 | - [Unordered List](#unordered-list) |
12 | - [Horizontal rule](#horizontal-rule) | 19 | - [Horizontal rule](#horizontal-rule) |
13 | - [Table](#table) | 20 | - [Table](#table) |
14 | - [Code](#code) | 21 | - [Code](#code) |
diff --git a/content/projects/emojis/blobfox/index.md b/content/projects/emojis/blobfox/index.md index a79e0de..a0258c9 100644 --- a/content/projects/emojis/blobfox/index.md +++ b/content/projects/emojis/blobfox/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: Blobfox | 2 | schema_type: VisualArtwork |
3 | date: 2020-09-04 | 3 | title: Blobfox |
4 | thumbnail: jpg | 4 | date: 2020-09-04 |
5 | thumbnail: jpg | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/projects/emojis/bunhd/index.md b/content/projects/emojis/bunhd/index.md index eb3b648..7932009 100644 --- a/content/projects/emojis/bunhd/index.md +++ b/content/projects/emojis/bunhd/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: BunHD | 2 | schema_type: VisualArtwork |
3 | date: 2019-09-30 | 3 | title: BunHD |
4 | thumbnail: png | 4 | date: 2019-09-30 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/content/projects/emojis/vlpn/index.md b/content/projects/emojis/vlpn/index.md index dcd6c8b..915b0b0 100644 --- a/content/projects/emojis/vlpn/index.md +++ b/content/projects/emojis/vlpn/index.md | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | --- |
2 | title: vlpn | 2 | schema_type: VisualArtwork |
3 | date: 2021-07-23 | 3 | title: vlpn |
4 | thumbnail: png | 4 | date: 2021-07-23 |
5 | thumbnail: png | ||
5 | --- | 6 | --- |
6 | 7 | ||
7 | ::: figure | 8 | ::: figure |
diff --git a/scripts/metadata_filter.lua b/scripts/metadata_filter.lua index b78c480..3fc6c66 100644 --- a/scripts/metadata_filter.lua +++ b/scripts/metadata_filter.lua | |||
@@ -189,6 +189,7 @@ function d1_page_to_list_item(meta, p) | |||
189 | subtitle = p.subtitle, | 189 | subtitle = p.subtitle, |
190 | date = p.date, | 190 | date = p.date, |
191 | last_update = p.last_update, | 191 | last_update = p.last_update, |
192 | schema_type = p.schema_type, | ||
192 | position = p.position, | 193 | position = p.position, |
193 | url = p.url, | 194 | url = p.url, |
194 | slug = p.slug, | 195 | slug = p.slug, |
@@ -206,6 +207,7 @@ function d2_page_to_list_item(meta, cat, p, set_cat_title) | |||
206 | category = set_cat_title and cat.title, | 207 | category = set_cat_title and cat.title, |
207 | date = p.date, | 208 | date = p.date, |
208 | last_update = p.last_update, | 209 | last_update = p.last_update, |
210 | schema_type = p.schema_type, | ||
209 | position = p.position, | 211 | position = p.position, |
210 | url = p.url, | 212 | url = p.url, |
211 | slug = p.slug, | 213 | slug = p.slug, |
@@ -226,6 +228,7 @@ function cat_to_list_cat(cat, allItems) | |||
226 | description = (cat.description and pandoc.MetaBlocks(pandoc.Para(cat.description))) or | 228 | description = (cat.description and pandoc.MetaBlocks(pandoc.Para(cat.description))) or |
227 | (not cat.no_description and cat.content), | 229 | (not cat.no_description and cat.content), |
228 | last_update = cat.last_update, | 230 | last_update = cat.last_update, |
231 | schema_type = cat.schema_type, | ||
229 | url = cat.url, | 232 | url = cat.url, |
230 | slug = cat.slug, | 233 | slug = cat.slug, |
231 | layout = cat.list_layout, | 234 | layout = cat.list_layout, |
@@ -279,6 +282,7 @@ function process(global, meta) | |||
279 | meta.url = resolve_url(global.site.url, global.file_out, meta.url or meta.file_out) | 282 | meta.url = resolve_url(global.site.url, global.file_out, meta.url or meta.file_out) |
280 | meta.title = (meta.title and pandoc.utils.stringify(meta.title)) or "" | 283 | meta.title = (meta.title and pandoc.utils.stringify(meta.title)) or "" |
281 | meta.slug = slug(meta.title) | 284 | meta.slug = slug(meta.title) |
285 | meta.schema_type = (meta.schema_type and pandoc.utils.stringify(meta.schema_type)) or "CreativeWork" | ||
282 | if meta.list_order then meta.list_order = pandoc.utils.stringify(meta.list_order) end | 286 | if meta.list_order then meta.list_order = pandoc.utils.stringify(meta.list_order) end |
283 | meta.list_layout = meta.list_layout and prep_layout(meta.list_layout) | 287 | meta.list_layout = meta.list_layout and prep_layout(meta.list_layout) |
284 | if meta.list_limit then meta.list_limit = tonumber(pandoc.utils.stringify(meta.list_limit)) end | 288 | if meta.list_limit then meta.list_limit = tonumber(pandoc.utils.stringify(meta.list_limit)) end |
diff --git a/templates/base.html b/templates/base.html index 49355b7..cfc40a4 100644 --- a/templates/base.html +++ b/templates/base.html | |||
@@ -14,14 +14,20 @@ | |||
14 | 14 | ||
15 | $for(author)$ | 15 | $for(author)$ |
16 | <meta name="author" content="$it.name$$if(it.email)$ <$it.email$>$endif$" /> | 16 | <meta name="author" content="$it.name$$if(it.email)$ <$it.email$>$endif$" /> |
17 | <meta property="article:author" content="$it.name$$if(it.email)$ <$it.email$>$endif$" /> | ||
17 | $endfor$ | 18 | $endfor$ |
18 | $if(date-meta)$ | 19 | $if(date-meta)$ |
19 | <meta name="dcterms.date" content="$date-meta$" /> | 20 | <meta name="dcterms.date" content="$date-meta$" /> |
21 | <meta property="article:modified_time" content="$date-meta$" /> | ||
20 | $endif$ | 22 | $endif$ |
21 | $if(keywords)$ | 23 | $if(keywords)$ |
22 | <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> | 24 | <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> |
23 | $endif$ | 25 | $endif$ |
24 | 26 | ||
27 | <meta property="og:title" content="$title$" /> | ||
28 | <meta property="og:site_name" content="$site.title$" /> | ||
29 | <meta property="og:url" content="$url.full$" /> | ||
30 | |||
25 | $if(feed)$ | 31 | $if(feed)$ |
26 | <link href="$feed.url.rel$" type="application/atom+xml" rel="alternate" title="$if(namespace.root.is_index)$$else$$title$ – $endif$$site.title$" /> | 32 | <link href="$feed.url.rel$" type="application/atom+xml" rel="alternate" title="$if(namespace.root.is_index)$$else$$title$ – $endif$$site.title$" /> |
27 | $endif$ | 33 | $endif$ |
@@ -46,33 +52,31 @@ | |||
46 | <link rel="stylesheet" href="/style.css?$style_hash$" /> | 52 | <link rel="stylesheet" href="/style.css?$style_hash$" /> |
47 | </head> | 53 | </head> |
48 | 54 | ||
49 | <body> | 55 | <body itemscope itemtype="https://schema.org/WebPage"> |
50 | <nav class="c-header" label="Mainmenu"> | 56 | <nav class="c-header" label="Mainmenu"> |
51 | <a class="c-header__item c-header__item--icon" href="/" title="$site.title$"> | 57 | <a class="c-header__item c-header__item--icon" href="/" title="$site.title$" itemprop="isPartOf" itemscope itemtype="https://schema.org/WebSite" itemid="$site.url$"> |
52 | <svg class="c-header__icon" width="1em" height="1em" aria-label="Logo"> | 58 | <svg class="c-header__icon" width="1em" height="1em" aria-label="Logo"> |
53 | <use href="/symbols.svg#logo"></use> | 59 | <use href="/symbols.svg#logo"></use> |
54 | </svg> | 60 | </svg> |
55 | </a> | 61 | </a> |
56 | $for(menus.main.items)$ | 62 | $for(menus.main.items)$ |
57 | $if(it.active)$ | 63 | $if(it.active)$ |
58 | <a class="c-header__item" href="$it.url$"> | 64 | <a class="c-header__item" href="$it.url$" itemprop="hasPart" itemscope itemtype="https://schema.org/SiteNavigationElement"> |
59 | $it.label$ | 65 | $it.label$ |
60 | </a> | 66 | </a> |
61 | $endif$ | 67 | $endif$ |
62 | $endfor$ | 68 | $endfor$ |
63 | </nav> | 69 | </nav> |
64 | 70 | ||
65 | <main> | 71 | $if(layout.is_categorized_list)$ |
66 | $if(layout.is_categorized_list)$ | ||
67 | ${layouts/categorized_list()} | 72 | ${layouts/categorized_list()} |
68 | $elseif(layout.is_list)$ | 73 | $elseif(layout.is_list)$ |
69 | ${layouts/list()} | 74 | ${layouts/list()} |
70 | $elseif(layout.is_redirect)$ | 75 | $elseif(layout.is_redirect)$ |
71 | ${layouts/redirect()} | 76 | ${layouts/redirect()} |
72 | $else$ | 77 | $else$ |
73 | ${layouts/page()} | 78 | ${layouts/page()} |
74 | $endif$ | 79 | $endif$ |
75 | </main> | ||
76 | 80 | ||
77 | <footer class="c-footer"> | 81 | <footer class="c-footer"> |
78 | <div class="l-container l-container--pad-y u-pb-0" aria-hidden="true"> | 82 | <div class="l-container l-container--pad-y u-pb-0" aria-hidden="true"> |
diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html index 7667615..101f759 100644 --- a/templates/layouts/categorized_list.html +++ b/templates/layouts/categorized_list.html | |||
@@ -1,55 +1,59 @@ | |||
1 | <div class="l-container l-container--pad-x l-container--pad-y l-container--narrow"> | 1 | <main itemprop="mainPart" itemscope itemtype="https://schema.org/DataFeed" itemid="$url.full$"> |
2 | <header class="s-colored-links"> | 2 | <div class="l-container l-container--pad-x l-container--pad-y l-container--narrow h-feed"> |
3 | <h1 class="o-heading o-heading--xxl u-mt-0"><span class="o-heading__primary">$title$</span></h1> | 3 | <header class="s-colored-links"> |
4 | <h1 class="o-heading o-heading--xxl u-mt-0 p-name" itemprop="name headline"> | ||
5 | <span class="o-heading__primary">$title$</span> | ||
6 | </h1> | ||
4 | 7 | ||
5 | $body$ | 8 | $body$ |
6 | </header> | 9 | </header> |
7 | 10 | ||
8 | $if(notoc)$$else$ | 11 | $if(notoc)$$else$ |
9 | <nav class="c-hnav s-invisible-links" aria-label="Sections"> | 12 | <nav class="c-hnav s-invisible-links" aria-label="Sections"> |
10 | <h2 class="u-mt-0">Jump to</h2> | 13 | <h2 class="u-mt-0">Jump to</h2> |
11 | $for(list)$ | 14 | $for(list)$ |
12 | <a class="c-hnav__item" href="#$it.slug$">$it.title$</a> | 15 | <a class="c-hnav__item" href="#$it.slug$">$it.title$</a> |
13 | $endfor$ | 16 | $endfor$ |
14 | </nav> | 17 | </nav> |
15 | $endif$ | 18 | $endif$ |
16 | 19 | ||
17 | <div class="l-card-list"> | 20 | <div class="l-card-list"> |
18 | $for(list)$ | 21 | $for(list)$ |
19 | <section> | 22 | <section class="h-entry h-feed" itemprop="dataFeedElement" itemscope itemtype="https://schema.org/DataFeed"> |
20 | <header class="l-card-list__header"> | 23 | <header class="l-card-list__header"> |
21 | <h2 class="s-invisible-links u-mt-0" id="$it.slug$"> | 24 | <h2 class="s-invisible-links u-mt-0 p-name" id="$it.slug$" itemprop="name headline"> |
22 | $if(it.url)$ | 25 | $if(it.url)$ |
23 | <a href="$it.url.rel$">$it.title$</a> | 26 | <a href="$it.url.rel$">$it.title$</a> |
27 | $else$ | ||
28 | $it.title$ | ||
29 | $endif$ | ||
30 | </h2> | ||
31 | $if(it.description)$ | ||
32 | <div class="s-small s-colored-links">$it.description$</div> | ||
33 | $endif$ | ||
34 | </header> | ||
35 | <div class="l-card-list__cards l-card-list__cards--$it.layout.id$"> | ||
36 | $if(it.layout.is_grid-2)$ | ||
37 | $it.items:partials/grid_card()$ | ||
38 | $elseif(it.layout.is_grid-3)$ | ||
39 | $it.items:partials/grid_card()$ | ||
40 | $elseif(it.layout.is_gallery-2)$ | ||
41 | $it.items:partials/gallery_card()$ | ||
42 | $elseif(it.layout.is_gallery-3)$ | ||
43 | $it.items:partials/gallery_card()$ | ||
24 | $else$ | 44 | $else$ |
25 | $it.title$ | 45 | $it.items:partials/list_card()$ |
26 | $endif$ | 46 | $endif$ |
27 | </h2> | 47 | </div> |
28 | $if(it.description)$ | 48 | $if(it.omitted)$ |
29 | <div class="s-small s-colored-links">$it.description$</div> | 49 | <footer class="l-card-list__footer"> |
30 | $endif$ | 50 | <a class="l-media__block o-badge o-badge--200" href="$it.url.rel$" aria-label="$it.omitted$ more items in '$it.title$'"> |
31 | </header> | 51 | $it.omitted$ more items <span class="u-ml-10">→</span> |
32 | <div class="l-card-list__cards l-card-list__cards--$it.layout.id$"> | 52 | </a> |
33 | $if(it.layout.is_grid-2)$ | 53 | </footer> |
34 | $it.items:partials/grid_card()$ | ||
35 | $elseif(it.layout.is_grid-3)$ | ||
36 | $it.items:partials/grid_card()$ | ||
37 | $elseif(it.layout.is_gallery-2)$ | ||
38 | $it.items:partials/gallery_card()$ | ||
39 | $elseif(it.layout.is_gallery-3)$ | ||
40 | $it.items:partials/gallery_card()$ | ||
41 | $else$ | ||
42 | $it.items:partials/list_card()$ | ||
43 | $endif$ | 54 | $endif$ |
44 | </div> | 55 | </section> |
45 | $if(it.omitted)$ | 56 | $endfor$ |
46 | <footer class="l-card-list__footer"> | 57 | </div> |
47 | <a class="l-media__block o-badge o-badge--200" href="$it.url.rel$" aria-label="$it.omitted$ more items in '$it.title$'"> | ||
48 | $it.omitted$ more items <span class="u-ml-10">→</span> | ||
49 | </a> | ||
50 | </footer> | ||
51 | $endif$ | ||
52 | </section> | ||
53 | $endfor$ | ||
54 | </div> | 58 | </div> |
55 | </div> | 59 | </main> |
diff --git a/templates/layouts/list.html b/templates/layouts/list.html index ebbc2d4..105c7f5 100644 --- a/templates/layouts/list.html +++ b/templates/layouts/list.html | |||
@@ -1,23 +1,27 @@ | |||
1 | <div class="l-container l-container--pad-x l-container--pad-y l-container--narrow"> | 1 | <main itemprop="mainPart" itemscope itemtype="https://schema.org/DataFeed" itemid="$url.full$"> |
2 | <header class="s-colored-links"> | 2 | <div class="l-container l-container--pad-x l-container--pad-y l-container--narrow"> |
3 | <h1 class="o-heading o-heading--xxl u-mt-0"><span class="o-heading__primary">$title$</span></h1> | 3 | <header class="s-colored-links"> |
4 | <h1 class="o-heading o-heading--xxl u-mt-0 p-name" itemprop="name headline"> | ||
5 | <span class="o-heading__primary">$title$</span> | ||
6 | </h1> | ||
4 | 7 | ||
5 | $body$ | 8 | $body$ |
6 | </header> | 9 | </header> |
7 | 10 | ||
8 | <div class="l-card-list"> | 11 | <div class="l-card-list"> |
9 | <div class="l-card-list__cards l-card-list__cards--$list_layout.id$"> | 12 | <div class="l-card-list__cards l-card-list__cards--$list_layout.id$"> |
10 | $if(list_layout.is_grid-2)$ | 13 | $if(list_layout.is_grid-2)$ |
11 | $list:partials/grid_card()$ | 14 | $list:partials/grid_card()$ |
12 | $elseif(list_layout.is_grid-3)$ | 15 | $elseif(list_layout.is_grid-3)$ |
13 | $list:partials/grid_card()$ | 16 | $list:partials/grid_card()$ |
14 | $elseif(list_layout.is_gallery-2)$ | 17 | $elseif(list_layout.is_gallery-2)$ |
15 | $list:partials/gallery_card()$ | 18 | $list:partials/gallery_card()$ |
16 | $elseif(list_layout.is_gallery-3)$ | 19 | $elseif(list_layout.is_gallery-3)$ |
17 | $list:partials/gallery_card()$ | 20 | $list:partials/gallery_card()$ |
18 | $else$ | 21 | $else$ |
19 | $list:partials/list_card()$ | 22 | $list:partials/list_card()$ |
20 | $endif$ | 23 | $endif$ |
24 | </div> | ||
21 | </div> | 25 | </div> |
22 | </div> | 26 | </div> |
23 | </div> | 27 | </main> |
diff --git a/templates/layouts/page.html b/templates/layouts/page.html index 75ea3be..f64e50b 100644 --- a/templates/layouts/page.html +++ b/templates/layouts/page.html | |||
@@ -1,11 +1,17 @@ | |||
1 | <article class="l-container l-container--pad-x l-container--pad-y l-container--narrow s-body s-colored-links s-headings s-blockquotes s-code s-lists s-tables $if(intro)$s-intro$endif$"> | 1 | <main itemprop="hasPart" itemscope itemtype="https://schema.org/$it.schema_type$" itemid="$url.full$"> |
2 | $if(date)$ | 2 | <article class="l-container l-container--pad-x l-container--pad-y l-container--narrow h-entry"> |
3 | <div class="o-badge s-body__meta u-mb-125"> | 3 | $if(date)$ |
4 | $date.long$ | 4 | <div class="o-badge s-body__meta u-mb-125 dt-updated"> |
5 | </div> | 5 | $date.long$ |
6 | $endif$ | 6 | </div> |
7 | $endif$ | ||
7 | 8 | ||
8 | <h1 class="u-mt-0"><span class="s-headings__primary">$title$</span></h1> | 9 | <h1 class="o-heading o-heading--xxl u-mt-0 p-name" itemprop="name headline"> |
10 | <span class="s-headings__primary">$title$</span> | ||
11 | </h1> | ||
9 | 12 | ||
13 | <div class="s-body s-colored-links s-headings s-blockquotes s-code s-lists s-tables e-content" itemprop="articleBody"> | ||
10 | $body$ | 14 | $body$ |
11 | </article> | 15 | </div> |
16 | </article> | ||
17 | </main> | ||
diff --git a/templates/partials/gallery_card.html b/templates/partials/gallery_card.html index c0925fc..edc54b4 100644 --- a/templates/partials/gallery_card.html +++ b/templates/partials/gallery_card.html | |||
@@ -1,6 +1,9 @@ | |||
1 | $if(it.url)$ | 1 | $if(it.url)$ |
2 | $if(it.thumbnail)$ | 2 | $if(it.thumbnail)$ |
3 | <a href="$it.url.rel$" class="l-card-list__card c-card"> | 3 | <a href="$it.url.rel$" class="l-card-list__card c-card h-entry" itemprop="dataFeedElement" itemscope itemtype="https://schema.org/$it.schema_type$"> |
4 | <link class="u-url" itemprop="url" href="$it.url.full$" /> | ||
5 | <link itemprop="thumbnailUrl" href="$it.thumbnail.full$" /> | ||
6 | |||
4 | <div class="c-card__row l-media l-media--flush"> | 7 | <div class="c-card__row l-media l-media--flush"> |
5 | <div class="c-card__thumbnail"> | 8 | <div class="c-card__thumbnail"> |
6 | <img | 9 | <img |
@@ -22,13 +25,13 @@ $if(it.thumbnail)$ | |||
22 | $endif$ | 25 | $endif$ |
23 | <div class="l-media__block l-media__block--main"> | 26 | <div class="l-media__block l-media__block--main"> |
24 | $if(it.subtitle)$ | 27 | $if(it.subtitle)$ |
25 | <strong class="u-d-block u-elp">$it.title$</strong> | 28 | <strong class="u-d-block u-elp" itemprop="name headline">$it.title$</strong> |
26 | <small class="u-d-block u-elp">$it.subtitle$</small> | 29 | <small class="u-d-block u-elp p-name">$it.subtitle$</small> |
27 | $elseif(it.category)$ | 30 | $elseif(it.category)$ |
28 | <small class="u-d-block u-elp">$it.category$</small> | 31 | <small class="u-d-block u-elp">$it.category$</small> |
29 | <strong class="u-d-block u-elp">$it.title$</strong> | 32 | <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong> |
30 | $elseif(it.date)$ | 33 | $elseif(it.date)$ |
31 | <time datetime="$it.date.yyyy_mm_dd$"> | 34 | <time datetime="$it.date.yyyy_mm_dd$" itemprop="dateCreated"> |
32 | <small class="u-d-none@sm-hi"> | 35 | <small class="u-d-none@sm-hi"> |
33 | $it.date.short$ | 36 | $it.date.short$ |
34 | </small> | 37 | </small> |
@@ -36,9 +39,11 @@ $if(it.thumbnail)$ | |||
36 | $it.date.long$ | 39 | $it.date.long$ |
37 | </small> | 40 | </small> |
38 | </time> | 41 | </time> |
39 | <strong class="u-d-block u-elp">$it.title$</strong> | 42 | <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong> |
40 | $else$ | 43 | $else$ |
41 | $it.title$ | 44 | <span class="p-name" itemprop="name headline"> |
45 | $it.title$ | ||
46 | </span> | ||
42 | $endif$ | 47 | $endif$ |
43 | </div> | 48 | </div> |
44 | $if(it.post_icon)$ | 49 | $if(it.post_icon)$ |
diff --git a/templates/partials/grid_card.html b/templates/partials/grid_card.html index c5924e1..afbea1f 100644 --- a/templates/partials/grid_card.html +++ b/templates/partials/grid_card.html | |||
@@ -1,5 +1,7 @@ | |||
1 | $if(it.url)$ | 1 | $if(it.url)$ |
2 | <a href="$it.url.rel$" class="l-card-list__card c-card"> | 2 | <a href="$it.url.rel$" class="l-card-list__card c-card h-entry" itemprop="dataFeedElement" itemscope itemtype="https://schema.org/$it.schema_type$"> |
3 | <link class="u-url" itemprop="url" href="$it.url.full$" /> | ||
4 | |||
3 | <div class="c-card__row l-media"> | 5 | <div class="c-card__row l-media"> |
4 | $if(it.indicator)$ | 6 | $if(it.indicator)$ |
5 | <div class="c-card__indicator l-media__block"></div> | 7 | <div class="c-card__indicator l-media__block"></div> |
@@ -11,13 +13,13 @@ $if(it.url)$ | |||
11 | $endif$ | 13 | $endif$ |
12 | <div class="l-media__block l-media__block--main"> | 14 | <div class="l-media__block l-media__block--main"> |
13 | $if(it.subtitle)$ | 15 | $if(it.subtitle)$ |
14 | <strong class="u-d-block u-elp">$it.title$</strong> | 16 | <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong> |
15 | <small class="u-d-block u-elp">$it.subtitle$</small> | 17 | <small class="u-d-block u-elp">$it.subtitle$</small> |
16 | $elseif(it.category)$ | 18 | $elseif(it.category)$ |
17 | <small class="u-d-block u-elp">$it.category$</small> | 19 | <small class="u-d-block u-elp">$it.category$</small> |
18 | <strong class="u-d-block u-elp">$it.title$</strong> | 20 | <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong> |
19 | $elseif(it.date)$ | 21 | $elseif(it.date)$ |
20 | <time datetime="$it.date.yyyy_mm_dd$"> | 22 | <time datetime="$it.date.yyyy_mm_dd$" itemprop="dateCreated"> |
21 | <small class="u-d-none@sm-hi"> | 23 | <small class="u-d-none@sm-hi"> |
22 | $it.date.short$ | 24 | $it.date.short$ |
23 | </small> | 25 | </small> |
@@ -25,9 +27,11 @@ $if(it.url)$ | |||
25 | $it.date.long$ | 27 | $it.date.long$ |
26 | </small> | 28 | </small> |
27 | </time> | 29 | </time> |
28 | <strong class="u-d-block u-elp">$it.title$</strong> | 30 | <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong> |
29 | $else$ | 31 | $else$ |
30 | $it.title$ | 32 | <span class="p-name" itemprop="name headline"> |
33 | $it.title$ | ||
34 | </span> | ||
31 | $endif$ | 35 | $endif$ |
32 | </div> | 36 | </div> |
33 | $if(it.post_icon)$ | 37 | $if(it.post_icon)$ |
diff --git a/templates/partials/list_card.html b/templates/partials/list_card.html index 438659c..3f2b956 100644 --- a/templates/partials/list_card.html +++ b/templates/partials/list_card.html | |||
@@ -1,5 +1,7 @@ | |||
1 | $if(it.url)$ | 1 | $if(it.url)$ |
2 | <a href="$it.url.rel$" class="l-card-list__card c-card"> | 2 | <a href="$it.url.rel$" class="l-card-list__card c-card h-entry" itemprop="dataFeedElement" itemscope itemtype="https://schema.org/$it.schema_type$"> |
3 | <link class="u-url" itemprop="url" href="$it.url.full$" /> | ||
4 | |||
3 | <div class="c-card__row l-media"> | 5 | <div class="c-card__row l-media"> |
4 | $if(it.indicator)$ | 6 | $if(it.indicator)$ |
5 | <div class="c-card__indicator l-media__block"></div> | 7 | <div class="c-card__indicator l-media__block"></div> |
@@ -9,7 +11,7 @@ $if(it.url)$ | |||
9 | <use href="/icons.svg#$it.icon$"></use> | 11 | <use href="/icons.svg#$it.icon$"></use> |
10 | </svg> | 12 | </svg> |
11 | $endif$ | 13 | $endif$ |
12 | <div class="l-media__block l-media__block--main"> | 14 | <div class="l-media__block l-media__block--main p-name" itemprop="name headline"> |
13 | $it.title$ | 15 | $it.title$ |
14 | </div> | 16 | </div> |
15 | $if(it.subtitle)$ | 17 | $if(it.subtitle)$ |
@@ -25,7 +27,7 @@ $if(it.url)$ | |||
25 | </small> | 27 | </small> |
26 | </div> | 28 | </div> |
27 | $elseif(it.date)$ | 29 | $elseif(it.date)$ |
28 | <time datetime="$it.date.yyyy_mm_dd$" class="l-media__block u-fs0"> | 30 | <time datetime="$it.date.yyyy_mm_dd$" class="l-media__block u-fs0" itemprop="dateCreated"> |
29 | <small class="u-d-none@sm-hi"> | 31 | <small class="u-d-none@sm-hi"> |
30 | $it.date.short$ | 32 | $it.date.short$ |
31 | </small> | 33 | </small> |