diff options
| author | la-ninpre <leobrekalini@gmail.com> | 2021-08-26 19:07:45 +0300 |
|---|---|---|
| committer | la-ninpre <leobrekalini@gmail.com> | 2021-08-26 19:20:04 +0300 |
| commit | d548d4a900024352a033e2b4523bb7f272b26a6f (patch) | |
| tree | 1d7bd088eeefef367cb5cac026d08a31c01716f7 /_layouts | |
| parent | 7ac5dbeb4f9329dbd75e42c800b8afc8b58d552d (diff) | |
| parent | af529b0371bfe9fa2039fb6bce5deadbb7c0c76b (diff) | |
| download | aaoth.xyz-d548d4a900024352a033e2b4523bb7f272b26a6f.tar.gz aaoth.xyz-d548d4a900024352a033e2b4523bb7f272b26a6f.zip | |
merge branch 'music-projects'
music info is messed up now, but kinda works
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/about-page.html | 15 | ||||
| -rw-r--r-- | _layouts/art-category.html | 2 | ||||
| -rw-r--r-- | _layouts/default.html | 22 | ||||
| -rw-r--r-- | _layouts/music-project.html | 66 | ||||
| -rw-r--r-- | _layouts/music-release.html | 7 | ||||
| -rw-r--r-- | _layouts/post.html | 21 |
6 files changed, 99 insertions, 34 deletions
diff --git a/_layouts/about-page.html b/_layouts/about-page.html index 0a82206..024731c 100644 --- a/_layouts/about-page.html +++ b/_layouts/about-page.html @@ -9,28 +9,19 @@ layout: default <div class="about-links"> <p>other links:</p> <ul> - {% assign sorted_links = site.data.links | sort: "type" %} + {%- assign sorted_links = site.data.links | sort: "type" -%} {% for link in sorted_links %} <li> - <a href="{{ link.link }}"> + <a href="{{ link.link }}" + {%- if link.rel -%}rel="{{ link.rel }}"{%- endif -%}> <img class= "link-icon" - alt="{{ link.type }}" width=32px height=32px src="/assets/img/{{ link.type }}-icon.png"> <div class="link-text">{{ link.name }}</div> </a> </li> {% endfor %} - <li> - <a rel="me" href="https://distrotoot.com/@la_ninpre"> - <img class="link-icon" - alt="mastodon" - width=32px height=32px - src="/assets/img/mastodon-icon.png"> - <div class="link-text">mastodon</div> - </a> - </li> </ul> </div> </div> diff --git a/_layouts/art-category.html b/_layouts/art-category.html index dc8ce12..c1869d7 100644 --- a/_layouts/art-category.html +++ b/_layouts/art-category.html @@ -2,7 +2,7 @@ layout: default --- -<h1>{{ page.title }}</h1> +{% include title-with-backlink.html title=page.title backlink="/art/" %} {{ content }} diff --git a/_layouts/default.html b/_layouts/default.html index fdb18e0..d0f5922 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,20 +1,20 @@ <!doctype html> <html> - <head> - <meta charset="utf-8"> + <head> + <meta charset="utf-8"> <meta lang="en"> <meta http-equiv="Content-Security-Policy" content="default-src 'self'"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>{{ page.title }} - {{ site.title }}</title> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title>{{ page.title }} - {{ site.title }}</title> {% feed_meta %} <link rel="stylesheet" href="/assets/css/style.css"> - <link rel="icon" href="/assets/img/favicon.ico" type="image/x-icon"> - </head> - <body> - {% include navigation.html %} + <link rel="icon" href="/assets/img/favicon.ico" type="image/x-icon"> + </head> + <body> + {% include navigation.html %} <div class="content"> - {{ content }} + {{ content }} </div> - {% include footer.html %} - </body> + {% include footer.html %} + </body> </html> diff --git a/_layouts/music-project.html b/_layouts/music-project.html new file mode 100644 index 0000000..d9382b5 --- /dev/null +++ b/_layouts/music-project.html @@ -0,0 +1,66 @@ +--- +layout: default +--- + +<!-- TODO: add physical release links--> +<!-- TODO: add sound for albums that aren't available on bandcamp --> +<!-- TODO: maybe add search by tag for music projects --> +<!-- TODO: add album art --> + +<div class="music-project"> + + <div class="music-project-titlebar"> + {% include title-with-backlink.html title=page.title backlink="/music/" %} + </div> + + <div class="music-project-sidebar"> + <a href="/art/logos/{{ page.url | split: "/" | last }}-logo.png"> + <img id="logo" + src="/art/logos/thumbs/{{ page.url | split: "/" | last }}-logo_thumb.png" + alt="{{ page.title }} logo"> + </a> + <p>{{ page.start_date | date_to_string }}– + {%- if page.end_date -%} + {{ page.end_date | date_to_string }} + {%- else -%} + … + {%- endif -%} + {%- if page.status -%} +  ({{ page.status }}) + {%- endif -%} + </p> + <p>tags: {{ page.tags | join: ", " }}</p> + </div> + + <div class="music-project-info"> + + {{ page.content | markdownify }} + + </div> + + {%- if page.title == "hälsorisk" %} + {%- assign releases = site.music_releases | + where_exp: "item", "item.r_tag contains 'HSR'" | + group_by_exp: "item", "item.date | date: '%Y'" -%} + {%- else %} + {%- assign releases = site.music_releases | + where: "author", page.title | + group_by_exp: "item", "item.date | date: '%Y'" -%} + {%- endif -%} + {%- assign releases.size = releases | size %} + {% unless releases.size == 0 %} + {%- if page.title == "hälsorisk" %} + {% include music-project-release-by-year.html title="releases" releases=releases print_author=true %} + {% else %} + {% include music-project-release-by-year.html title="releases" releases=releases %} + {% endif %} + {% endunless %} + + {%- assign misc_tracks = site.music_titles | + where_exp: "item", "item.author == page.title and item.r_tag == nil" | + group_by_exp: "item", "item.date | date: '%Y'" -%} + {%- assign misc_tracks.size = misc_tracks | size %} + {% unless misc_tracks.size == 0 %} + {% include music-project-release-by-year.html title="misc tracks" releases=misc_tracks %} + {% endunless %} +</div> diff --git a/_layouts/music-release.html b/_layouts/music-release.html new file mode 100644 index 0000000..0b641b8 --- /dev/null +++ b/_layouts/music-release.html @@ -0,0 +1,7 @@ +--- +layout: default +--- + +<!-- TODO: add album art and maybe change the whole structure --> + +{%- include music-project-release-info.html release=page %} diff --git a/_layouts/post.html b/_layouts/post.html index 30029a8..602cfce 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -4,18 +4,19 @@ layout: default <div class="post-page"> <div class="post-header"> - <h1>{{ page.title }}</h1> - <ul> - <li>{{ page.date | date: "%F" }}</li> + {% include title-with-backlink.html title=page.title backlink="/blog/" %} + <div class="post-header-info"> + <p class="post-date">{{ page.date | date: "%F" }}</p> {% if page.tags.size > 0 %} - <li> | </li> - <li>tags:</li> - {% for tag in page.tags %} - <li><a href="/tags/{{ tag }}">{{ tag }}</a></li> - {% endfor %} + <p>tags:</p> + <ul> + {% for tag in page.tags %} + <li><a href="/tags/{{ tag }}">{{ tag }}</a></li> + {% endfor %} {% endif %} - </ul> + </ul> + </div> <hr> </div> -{{ content }} + {{ content }} </div> |