From 9dcaf807a98362a708136284534ee343dd3f2742 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Thu, 19 Aug 2021 00:22:00 +0300 Subject: add info about music projects much of stuff included here is subject to change. --- _layouts/music-project.html | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 _layouts/music-project.html (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html new file mode 100644 index 0000000..b21b269 --- /dev/null +++ b/_layouts/music-project.html @@ -0,0 +1,70 @@ +--- +layout: default +--- + + + + + + +
+ +
+

{{ page.title }}

+ +

{{ page.start_date | date_to_string }}– + {%- if page.end_date -%} + {{ page.end_date | date_to_string }} + {%- else -%} + … + {%- endif -%} + {%- if page.status -%} +  ({{ page.status }}) + {%- endif -%} +

+

tags: {{ page.tags | join: ", " }}

+
+ +
+ + {{ page.content | markdownify }} + +
+

releases

+ + {%- assign releases = site.music_releases | where: "author", page.title + | group_by_exp: "item", "item.date | date: '%Y'" -%} + {% for item in releases %} +

{{ item.name }}

+ {%- for release in item.items -%} +
+

+ {{ release.title }} ({{ release.type }}) + {%- if release.bandcamp -%} + + listen on bandcamp + + {%- endif -%} +

+ +

released {{ release.date | date_to_string }} + | {{ release.style }} +

+ + {{ release.content }} + +
+ {%- endfor -%} + {%- endfor -%} +
+
+
-- cgit v1.2.3 From 5dade15bc9063352cd711bec0b7220924d2fd13d Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Thu, 19 Aug 2021 00:31:00 +0300 Subject: add todo notice --- _layouts/music-project.html | 1 + 1 file changed, 1 insertion(+) (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index b21b269..155dd04 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -6,6 +6,7 @@ layout: default +
-- cgit v1.2.3 From a7a43fa5e99ebda7905604306ec2cf0b03c425f7 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Fri, 20 Aug 2021 22:39:54 +0300 Subject: make music project list page look like art menu also snippet that makes art menu is now separated as mixin (very powerful thing, btw). --- _layouts/music-project.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index 155dd04..5b32455 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -6,7 +6,6 @@ layout: default -
@@ -16,7 +15,7 @@ layout: default {%- if page.logo -%} src="{{ page.logo }}" {%- else -%} - src="/assets/img/{{ page.title }}-logo.png" + src="/art/logos/thumbs/{{ page.url | split: "/" | last }}-logo_thumb.png" {%- endif -%} alt="{{ page.title }} logo">

{{ page.start_date | date_to_string }}– @@ -36,17 +35,18 @@ layout: default {{ page.content | markdownify }} -

+

releases

- {%- assign releases = site.music_releases | where: "author", page.title - | group_by_exp: "item", "item.date | date: '%Y'" -%} + {%- assign releases = site.music_releases | where: "author", + page.title | group_by_exp: "item", "item.date | date: '%Y'" -%} {% for item in releases %}

{{ item.name }}

{%- for release in item.items -%} -
+

- {{ release.title }} ({{ release.type }}) + {{ release.title }} + ({{ release.type }}) {%- if release.bandcamp -%} -- cgit v1.2.3 From d7118a8b627e1f5c7d7ebde49b5f52c364b37b32 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Sat, 21 Aug 2021 22:41:01 +0300 Subject: tweak logo image scaling and fix logo urls in project page --- _layouts/music-project.html | 4 ---- 1 file changed, 4 deletions(-) (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index 5b32455..7ab64aa 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -12,11 +12,7 @@ layout: default -- cgit v1.2.3 From 49021944e3b4881486ae27cd48acf9196a0b6ed7 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Mon, 23 Aug 2021 20:08:29 +0300 Subject: refactor post layout add go back link to the heading instead of list use div.post-header-info (list was not right) --- _layouts/post.html | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to '_layouts') 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
-

{{ page.title }}

-
    -
  • {{ page.date | date: "%F" }}
  • + {% include title-with-backlink.html title=page.title backlink="/blog/" %} +
    + {% if page.tags.size > 0 %} -
  • |
  • -
  • tags:
  • - {% for tag in page.tags %} -
  • {{ tag }}
  • - {% endfor %} +

    tags:

    +
      + {% for tag in page.tags %} +
    • {{ tag }}
    • + {% endfor %} {% endif %} -
    +
+

-{{ content }} + {{ content }}

-- cgit v1.2.3 From 07948640ab78b6a0cc97a6968ecea1ee36e9a680 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Mon, 23 Aug 2021 20:11:11 +0300 Subject: add title with backlink to art-category page --- _layouts/art-category.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_layouts') 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 --- -

{{ page.title }}

+{% include title-with-backlink.html title=page.title backlink="/art/" %} {{ content }} -- cgit v1.2.3 From e3fa69262e3dbf65f92580f3600540393308587d Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Mon, 23 Aug 2021 20:11:32 +0300 Subject: tweak music project page also fix header that was wrong. add styles for titles with backlink. & other changes (see diff, i'm lazy) --- _layouts/music-project.html | 72 +++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 29 deletions(-) (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index 7ab64aa..fdf1f0c 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -4,16 +4,21 @@ layout: default - +
+
+ {% include title-with-backlink.html title=page.title backlink="/music/" %} +
+
-

{{ page.title }}

- + + +

{{ page.start_date | date_to_string }}– {%- if page.end_date -%} {{ page.end_date | date_to_string }} @@ -31,37 +36,46 @@ layout: default {{ page.content | markdownify }} +

+ + {%- assign releases = site.music_releases | where: "author", + page.title | group_by_exp: "item", "item.date | date: '%Y'" -%} + {%- assign releases_size = releases | size %} + {%- if releases_size > 0 -%}

releases

- {%- assign releases = site.music_releases | where: "author", - page.title | group_by_exp: "item", "item.date | date: '%Y'" -%} {% for item in releases %} -

{{ item.name }}

- {%- for release in item.items -%} -
-

- {{ release.title }} - ({{ release.type }}) - {%- if release.bandcamp -%} - - listen on bandcamp - - {%- endif -%} -

+
+

{{ item.name }}

+ {%- for release in item.items -%} +
+

{{ release.title }} + + ({{ release.type }}) + {%- if release.bandcamp -%} + + listen on bandcamp + + {%- endif -%} +

-

released {{ release.date | date_to_string }} - | {{ release.style }} -

+

released {{ release.date | date_to_string }} + / {{ release.style }} +

- {{ release.content }} + {{ release.content }} -
- {%- endfor -%} +
+ {%- endfor -%} +
{%- endfor -%}
-
+ {%- endif -%}
-- cgit v1.2.3 From 26156bc9b19fe02a6679f741c9d936aad18a2e85 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Thu, 26 Aug 2021 13:22:51 +0300 Subject: add track info and templates --- _layouts/music-project.html | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index fdf1f0c..b07f4b8 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -70,6 +70,32 @@ layout: default / {{ release.style }}

+ {%- unless release.type == "track" -%} +
tracklist
+
+ {%- assign release_tracks = site.music_titles | + where: "r_tag", release.r_tag | sort: "num" -%} +
    + {% for track in release_tracks %} +
  1. + {% if release.author == track.author %} + {{ track.title }} + {% else %} + {% assign t_a_has_url = site.music_projects | find: "title", track.author %} + {% if t_a_has_url %} + + {{ track.author }} + {% else %} + {{ track.author }} + {% endif %} + — {{ track.title }} + {% endif %} +
  2. + {% endfor %} +
+
+ {%- endunless -%} + {{ release.content }}
-- cgit v1.2.3 From a6d8d6fbd058f1f53a00eee8ba4f609496ad7c67 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Thu, 26 Aug 2021 14:25:38 +0300 Subject: make releases that are of type 'track' actual tracks and modify the music-project layout to display those orphan tracks. --- _layouts/music-project.html | 83 ++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 58 deletions(-) (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index b07f4b8..7e3044f 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -3,7 +3,6 @@ layout: default --- - @@ -38,70 +37,38 @@ layout: default
- {%- assign releases = site.music_releases | where: "author", - page.title | group_by_exp: "item", "item.date | date: '%Y'" -%} - {%- assign releases_size = releases | size %} - {%- if releases_size > 0 -%} + {%- assign releases = site.music_releases | + where: "author", page.title | + group_by_exp: "item", "item.date | date: '%Y'" -%} + {%- assign releases.size = releases | size %} + {% unless releases.size == 0 %}

releases

- {% for item in releases %} + {% for year_group in releases %}
+ id="{{ year_group.name }}">

{{ item.name }}

- {%- for release in item.items -%} -
-

{{ release.title }} - - ({{ release.type }}) - {%- if release.bandcamp -%} - - listen on bandcamp - - {%- endif -%} -

- -

released {{ release.date | date_to_string }} - / {{ release.style }} -

- - {%- unless release.type == "track" -%} -
tracklist
-
- {%- assign release_tracks = site.music_titles | - where: "r_tag", release.r_tag | sort: "num" -%} -
    - {% for track in release_tracks %} -
  1. - {% if release.author == track.author %} - {{ track.title }} - {% else %} - {% assign t_a_has_url = site.music_projects | find: "title", track.author %} - {% if t_a_has_url %} - - {{ track.author }} - {% else %} - {{ track.author }} - {% endif %} - — {{ track.title }} - {% endif %} -
  2. - {% endfor %} -
-
- {%- endunless -%} - - {{ release.content }} - -
+ id="{{ year_group.name }}">{{ year_group.name }} + {%- for release in year_group.items -%} + {% include music-project-release-info.html release=release %} {%- endfor -%}
{%- endfor -%}
- {%- endif -%} + {% endunless %} + + {%- assign misc_tracks = site.music_titles | + where_exp: "item", "item.author == page.title and item.r_tag == nil" | + sort: "date" -%} + {%- assign misc_tracks.size = misc_tracks | size %} + {% unless misc_tracks.size == 0 %} +
+

misc tracks

+ + {% for track in misc_tracks %} + {% include music-project-release-info.html release=track %} + {%- endfor %} +
+ {% endunless %}
-- cgit v1.2.3 From 2c5b3efe8a2a48d420c703cf99cb8e42e0c29e15 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Thu, 26 Aug 2021 14:36:19 +0300 Subject: restructure music project includes --- _layouts/music-project.html | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index 7e3044f..c43f540 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -42,33 +42,15 @@ layout: default group_by_exp: "item", "item.date | date: '%Y'" -%} {%- assign releases.size = releases | size %} {% unless releases.size == 0 %} -
-

releases

- - {% for year_group in releases %} -
-

{{ year_group.name }}

- {%- for release in year_group.items -%} - {% include music-project-release-info.html release=release %} - {%- endfor -%} -
- {%- endfor -%} -
+ {% include music-project-release-by-year.html title="releases" releases=releases %} {% endunless %} {%- assign misc_tracks = site.music_titles | where_exp: "item", "item.author == page.title and item.r_tag == nil" | - sort: "date" -%} + sort: "date" | + group_by_exp: "item", "item.date | date: '%Y'" -%} {%- assign misc_tracks.size = misc_tracks | size %} {% unless misc_tracks.size == 0 %} -
-

misc tracks

- - {% for track in misc_tracks %} - {% include music-project-release-info.html release=track %} - {%- endfor %} -
+ {% include music-project-release-by-year.html title="misc tracks" releases=misc_tracks %} {% endunless %}
-- cgit v1.2.3 From 6d16d76f9bc446f99ff4416dbec4d2aed82e04f4 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Thu, 26 Aug 2021 18:48:18 +0300 Subject: add releases permalinks and page layout --- _layouts/music-project.html | 20 +++++++++++++++----- _layouts/music-release.html | 7 +++++++ 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 _layouts/music-release.html (limited to '_layouts') diff --git a/_layouts/music-project.html b/_layouts/music-project.html index c43f540..d9382b5 100644 --- a/_layouts/music-project.html +++ b/_layouts/music-project.html @@ -5,6 +5,7 @@ layout: default +
@@ -37,17 +38,26 @@ layout: default
- {%- assign releases = site.music_releases | - where: "author", page.title | - group_by_exp: "item", "item.date | date: '%Y'" -%} + {%- 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 %} - {% include music-project-release-by-year.html title="releases" releases=releases %} + {%- 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" | - sort: "date" | group_by_exp: "item", "item.date | date: '%Y'" -%} {%- assign misc_tracks.size = misc_tracks | size %} {% unless misc_tracks.size == 0 %} 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 +--- + + + +{%- include music-project-release-info.html release=page %} -- cgit v1.2.3 From af529b0371bfe9fa2039fb6bce5deadbb7c0c76b Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Thu, 26 Aug 2021 18:50:04 +0300 Subject: convert tabs to spaces --- _layouts/default.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to '_layouts') 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 @@ - - + + - - {{ page.title }} - {{ site.title }} + + {{ page.title }} - {{ site.title }} {% feed_meta %} - - - - {% include navigation.html %} + + + + {% include navigation.html %}
- {{ content }} + {{ content }}
- {% include footer.html %} - + {% include footer.html %} + -- cgit v1.2.3