diff --git a/_includes/footer.html b/_includes/footer.html index 8714c218..dcd25162 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -8,18 +8,22 @@
pax:nion Logo
diff --git a/_includes/navigation.html b/_includes/navigation.html index d1c591c4..540f9848 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -9,8 +9,7 @@
diff --git a/_includes/streamer.html b/_includes/streamer.html index 54e83b3f..8a4aef1d 100644 --- a/_includes/streamer.html +++ b/_includes/streamer.html @@ -1,9 +1,9 @@ -
+
{% if page.collection == 'posts' %} - + {% if page.category == 'release' %} {% if page.stores[0].name != nil %} -

Buy this record

+

Buy this release

{% for shop in page.stores %} {% if shop.download == true %} @@ -12,7 +12,7 @@ {% endfor %}
-

Stream

+

 

{% for shop in page.stores %} @@ -23,18 +23,10 @@ {% endfor %}
- {% endif %} - -{% elsif page.collection == 'tracks' or page.collection == 'albums' %} - - {% if page.collection == 'albums' %} -

This release  can't be bought

-

But other releases are available here:

{% else %} -

This track can't be bought

-

But other tracks are available here:

- {% endif %} +

This release can't be bought

+

But you can find others here:

{% for shop in site.data.stores %} {% if shop.download == true %} @@ -42,7 +34,140 @@ {% endif %} {% endfor %}
+

 

+ +
+ {% for shop in site.data.stores %} + {% if shop.download != true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+ {% endif %} + {% endif %} + +{% elsif page.collection == 'tracks' %} + + {% for post in site.posts %} + {% if post.album == page.albumSlug %} + {% if post.stores[0].name != nil %} + +

Buy this Track

+
+ {% for shop in post.stores %} + {% if shop.download == true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+ +

 

+
+ + {% for shop in post.stores %} + {% if shop.download != true %} + + {{ shop.name }} + {% endif %} + {% endfor %} +
+ + + + {% endif %} + {% else %} + +

This track can't be bought

+

But you can find others here:

+
+ {% for shop in site.data.stores %} + {% if shop.download == true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+

 

+ +
+ {% for shop in site.data.stores %} + {% if shop.download != true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+ {% endif %}{% break %} + {% endfor %} + +{% elsif page.collection == 'albums' %} + + +{% for post in site.posts %} +{% if post.album == page.slug %} +{% if post.stores[0].name != nil %} + +

Buy this album

+
+ {% for shop in post.stores %} + {% if shop.download == true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+ +

 

+
+ + {% for shop in post.stores %} + {% if shop.download != true %} + + {{ shop.name }} + {% endif %} + {% endfor %} +
+ +{% endif %} +{% else %} + +

This album can't be bought

+

But you can find others here:

+
+ {% for shop in site.data.stores %} + {% if shop.download == true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+

 

+ +
+ {% for shop in site.data.stores %} + {% if shop.download != true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+{% endif %}{% break %} +{% endfor %} +{% else %} +

Support {{ site.name }}

+

Pay for music here:

+
+ {% for shop in site.data.stores %} + {% if shop.download == true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
+

 

+ +
+ {% for shop in site.data.stores %} + {% if shop.download != true %} + {{ shop.name }} + {% endif %} + {% endfor %} +
{% endif %}
\ No newline at end of file diff --git a/_layouts/album.html b/_layouts/album.html index 1fbf44e6..281453a8 100644 --- a/_layouts/album.html +++ b/_layouts/album.html @@ -38,7 +38,7 @@ lang: en
- {{ page.title }} + {{ page.title }}
diff --git a/_layouts/default.html b/_layouts/default.html index 5378b668..c26a025e 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,5 +1,4 @@ --- -lang: en ---
- {% if page.category == 'release' %} + {% for album in site.albums %} {% if page.album == album.slug %} @@ -94,7 +94,7 @@ lang: en
{{ track.common.track.no }}.
- +
{% 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
-
- @@ -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 diff --git a/_layouts/track.html b/_layouts/track.html index e3140df5..6e0949d6 100644 --- a/_layouts/track.html +++ b/_layouts/track.html @@ -55,13 +55,13 @@ layout: default
{% endif %} - +{% include streamer.html %}
- {% include streamer.html %} +
@@ -90,6 +90,7 @@ layout: default
+