From 9a2768ae7fea307e9a85abd9b12a1196c8eff688 Mon Sep 17 00:00:00 2001 From: sakrecoer Date: Mon, 6 Jul 2020 12:11:07 +0200 Subject: [PATCH] revrt defaults for layout to work --- _config.yml | 20 ------ _layouts/post.html | 163 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 135 insertions(+), 48 deletions(-) diff --git a/_config.yml b/_config.yml index b72017c8..7546f99a 100644 --- a/_config.yml +++ b/_config.yml @@ -96,7 +96,6 @@ defaults: - scope: path: "" type: "posts" - category: "release" values: layout: "post" lang: en @@ -112,25 +111,6 @@ defaults: height: 720 resize_style: cover uploads_dir: "/images" - - scope: - path: "" - type: "posts" - category: "ramblings" - values: - layout: "page" - lang: en - permalink: /:title/ - _options: - image: - width: 1024 - height: 720 - resize_style: cover - uploads_dir: "/images" - content: - width: 720 - height: 720 - resize_style: cover - uploads_dir: "/images" # --------- # Translate diff --git a/_layouts/post.html b/_layouts/post.html index 08906fb6..8527a367 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,6 +1,6 @@ --- -lang: en --- +{% if page.category == 'release' %}
- {% if page.category == 'release' %} + {% for album in site.albums %} {% if page.album == album.slug %} @@ -94,7 +94,7 @@ lang: en
{{ track.common.track.no }}.
-
{{ track.common.title }}
+
{{ track.common.title }}
{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}
@@ -112,36 +112,36 @@ lang: en
-
-
- {% for track in album.tracks %} -
- - {{ track.common.title }} - -
-

{{ track.common.title }}

-

- {{ track.common.genre }} -
{{ track.common.year }}

-
    -
  • Play
    • -
-
-
- {% endfor %} +{% for track in album.tracks %} +
+
+

{{ track.common.title }}

+

+ {% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }} +
{{ track.common.genre }} +
{{ track.common.year }}

- {% include streamer.html %} - + +
+
+ {{ track.common.title }}
+ +{% endfor %} + +{% include streamer.html %} {% break %} {% endif %} {% endfor %} -{% endif %} -{% if page.collection == 'posts' %} + +
@@ -178,7 +178,7 @@ lang: en
-{% endif %} + {% include footer.html %}
@@ -212,7 +212,7 @@ lang: en "track": {{ track.common.track.no }}, "name": "{{ track.common.title }}", "length": "{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}", - "file": "/assets/albums/{{ track.albumSlug }}/{{ track.trackSlug }}" + "file": "https://media.basspistol.com/panix/{{ track.albumSlug }}/{{ track.trackSlug }}" }{% unless forloop.last %},{% endunless %}{% endfor %}{% break %} {% endif %}{% endfor %}], trackCount = tracks.length, npAction = $('#npAction'), @@ -288,4 +288,111 @@ lang: en {% include cookie-consent.html %} - \ No newline at end of file + +{% else %} + + + + + +{% seo title=false %} + +{% include seo.html %} +{% include relBase.html %} + + + + + + + + + + + + + +
+ + + + +
+
+ +
+ +
+ {% if page.url != '/cookies/' %} + {% if page.url != '/webcreds/' %} + {% include author.html %} + {% endif %}{% endif %} + +
+ {{ content }} + +
+
+
+
+
+
+
+
+ + +
+ + +
+ +
+

{{ site.data.translations[page.lang].post-nav}}

+
+
+
+ {% if page.previous.url and page.lang == page.previous.lang %} +

 {{page.previous.title}}

+

{{ page.previous.description }}

+ {% endif %} +
+
+ {% if page.next.url and page.lang == page.next.lang %} +

 {{page.next.title}}

+

{{ page.next.description }}

+ {% endif %} +
+
+ +
+
+ +
+
+
+ +{% include footer.html %} + +
+{% include navigation.html %} +{% include scripts.html %} +{% include cookie-consent.html %} + + +{% endif %} \ No newline at end of file