diff --git a/404.html b/404.html index e26a8aa0..dcb72d7e 100644 --- a/404.html +++ b/404.html @@ -20,7 +20,7 @@ image: /images/kaur-kristjan-cppf4w5pb1c-unsplash.jpg - +
@@ -36,7 +36,7 @@ image: /images/kaur-kristjan-cppf4w5pb1c-unsplash.jpg

{{ page.title }}

{{ page.description }}

diff --git a/Gemfile.lock b/Gemfile.lock index 18fdd722..a81343de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,15 +4,15 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.8) - em-websocket (0.5.2) + concurrent-ruby (1.1.6) + em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.15.0) + ffi (1.12.2) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (1.8.9) + i18n (1.8.2) concurrent-ruby (~> 1.0) jekyll (4.0.0) addressable (~> 2.4) @@ -40,26 +40,24 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.1) - rexml + kramdown (2.1.0) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.0) + listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) - posix-spawn (0.3.15) - public_suffix (4.0.6) - rb-fsevent (0.10.4) + posix-spawn (0.3.13) + public_suffix (4.0.4) + rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.4) - rouge (3.26.0) + rouge (3.18.0) safe_yaml (1.0.5) - sassc (2.4.0) + sassc (2.2.1) ffi (~> 1.9) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) diff --git a/_config.yml b/_config.yml index 5a4b8ad3..7546f99a 100644 --- a/_config.yml +++ b/_config.yml @@ -10,26 +10,20 @@ url : https://paxnion.basspistol.com banner: /siteicon.png icon: /siteicon.png logo: /siteicon.png -mediaurl: https://media.basspistol.com/panix author: name: pax:nion - mail: info+paxnion@basspistol.com publisher: name: Basspistol domain: basspistol.com - mail: info+paxnion@basspistol.com + mail: info@basspistol.com plugins: - jekyll-sitemap - jekyll-seo-tag - jekyll-last-modified-at -## Matomo -matomo_site_id: '3' -matomo_container: 'fHO88MfH' - # GEO @@ -52,8 +46,8 @@ collections: permalink: pretty categories: - - releases - - ramblings + - release + - rambling exclude: - changelog.md diff --git a/_includes/analytics.js b/_includes/analytics.js index 3194c767..07c8f4c5 100644 --- a/_includes/analytics.js +++ b/_includes/analytics.js @@ -2,39 +2,32 @@ //* Matomo *// -var _paq = window._paq = window._paq || []; -_paq.push(['setDocumentTitle', '404/URL = ' + encodeURIComponent(document.location.pathname+document.location.search) + '/From = ' + encodeURIComponent(document.referrer)]); -_paq.push(["setCookieDomain", "*.basspistol.com"]); -_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); -_paq.push(["enableCrossDomainLinking"]); -_paq.push(['trackPageView']); -_paq.push(['enableLinkTracking']); -(function() { - var u="https://terminalnetwork.matomo.cloud/"; - _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); -})(); + var _paq = window._paq || []; + /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ + _paq.push(['setDocumentTitle', '404/URL = ' + encodeURIComponent(document.location.pathname+document.location.search) + '/From = ' + encodeURIComponent(document.referrer)]); + _paq.push(['disableCookies']); + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="https://terminalnetwork.matomo.cloud/"; + _paq.push(['setTrackerUrl', u+'matomo.php']); + _paq.push(['setSiteId', '14']); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); + })(); + //* End Matomo *// + + {% else %} +//* Matomo Tag Manager *// - -var _paq = window._paq = window._paq || []; -_paq.push(["setDocumentTitle", document.domain + "/" + document.title]); -_paq.push(["setCookieDomain", "*.basspistol.com"]); -_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); -_paq.push(["enableCrossDomainLinking"]); -_paq.push(['trackPageView']); -_paq.push(['enableLinkTracking']); -(function() { - var u="https://terminalnetwork.matomo.cloud/"; - _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); + var _mtm = _mtm || []; + _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'}); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); -})(); + g.type='text/javascript'; g.async=true; g.defer=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/container_aJ0T3vZ5.js'; s.parentNode.insertBefore(g,s); +//* End Matomo Tag Manager *// {% endif %} diff --git a/_includes/footer.html b/_includes/footer.html index 226e8f2d..dcd25162 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,7 +4,7 @@

{{ site.title }}

{{ site.description }} -
{{ site.author.mail }}

+
{{ site.author.email }}

-
{{ site.title }} Logo
+
pax:nion Logo

©{{ site.time | date: '%Y' }} {{ site.publisher.name }} | Credits | Cookies & Privacy

diff --git a/_includes/matomo.js b/_includes/matomo.js index 696067c4..864052ed 100644 --- a/_includes/matomo.js +++ b/_includes/matomo.js @@ -1,45 +1,13 @@ -{% if page.url == '/404/' %} - -//* Matomo *// - -var _paq = window._paq = window._paq || []; +var _paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ -_paq.push(['setDocumentTitle', '404/URL = ' + encodeURIComponent(document.location.pathname+document.location.search) + '/From = ' + encodeURIComponent(document.referrer)]); -_paq.push(["setCookieDomain", "*.basspistol.com"]); -_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); -_paq.push(["enableCrossDomainLinking"]); -_paq.push(["disableCookies"]); -_paq.push(['trackPageView']); -_paq.push(['enableLinkTracking']); -(function() { - var u="https://terminalnetwork.matomo.cloud/"; - _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); -})(); -//* End Matomo *// - -{% else %} - -//* Matomo *// - -var _paq = window._paq = window._paq || []; _paq.push(["setDocumentTitle", document.domain + "/" + document.title]); -_paq.push(["setCookieDomain", "*.basspistol.com"]); -_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); -_paq.push(["enableCrossDomainLinking"]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="https://terminalnetwork.matomo.cloud/"; _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); + _paq.push(['setSiteId', '14']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); + g.type='text/javascript'; g.async=true; g.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); })(); - -//* End Matomo *// - -{% endif %} \ No newline at end of file diff --git a/_includes/navigation.html b/_includes/navigation.html index 7fd7f21f..540f9848 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,6 +1,6 @@ diff --git a/_includes/seo.html b/_includes/seo.html index 3235bc37..d89f06cd 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -1,30 +1,3 @@ - - - {% if page.collection == 'tracks' %} @@ -33,7 +6,7 @@ - + @@ -66,17 +39,17 @@ - + - + - - + + {% elsif page.collection == 'albums' %} @@ -88,7 +61,7 @@ - + @@ -121,18 +94,18 @@ -{% for track in page.tracks %} +{% for track in page.tracks %} {% endfor %} - + - - + + {% else %} @@ -142,7 +115,7 @@ - + @@ -184,33 +157,5 @@ - - - - - - -{% endif %} - - - \ No newline at end of file + +{% endif %} \ No newline at end of file diff --git a/_includes/streamer.html b/_includes/streamer.html index 4e5c8098..8a4aef1d 100644 --- a/_includes/streamer.html +++ b/_includes/streamer.html @@ -1,205 +1,173 @@ - +
{% if page.collection == 'posts' %} -{% if page.category == 'releases' %} -{% if page.check_this_if_cannot_be_bought == false %} -
-

Get this release

-
- {% for shop in page.stores %} - {% if shop.download == true %} - {{ shop.name }} - {% endif %} - {% endfor %} -
+ {% if page.category == 'release' %} + {% if page.stores[0].name != nil %} -

Stream it, follow, like and subscribe!

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

This release can't be obtained

-

Stream, follow, like and subscribe!

-
- {% 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 %} -{% else %} -{% if page.check_this_if_cannot_be_bought == false %} -
-

Get this release

+

Buy this release

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

Stream it, follow, like and subscribe!

+

 

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

This release 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 %} + {% 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 %} +
+ -{% for post in site.posts %} -{% if post.album == page.albumSlug %} -{% if post.check_this_if_cannot_be_bought == false %} -

Get this track

-
- {% for shop in post.stores %} - {% if shop.download == true %} - {{ shop.name }} {% 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 %} -
- -

Stream it, follow, like and subscribe!

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

This track can't be obtained

-

Stream, follow, like and subscribe!

-
- {% 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 %} -
-{% break %} - -{% endif %} -{% endif %} -{% endfor %} -
{% elsif page.collection == 'albums' %} -
+ {% for post in site.posts %} {% if post.album == page.slug %} -{% if post.check_this_if_cannot_be_bought == false %} +{% if post.stores[0].name != nil %} -

Get this album

+

Buy this album

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

Stream it, follow, like and subscribe!

+

 

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

This album can't be obtained

-

Stream, follow, like and subscribe!

+

This album can't be bought

+

But you can find others here:

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

 

+

 

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

Support {{ site.title }}

-

Stream, follow, like and subscribe!

+

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 %}
-

 

+

 

-{% 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 89d5fb66..f139f31c 100644 --- a/_layouts/album.html +++ b/_layouts/album.html @@ -10,7 +10,7 @@ lang: en - + {% include seo.html %} {% include relBase.html %} @@ -21,7 +21,7 @@ lang: en - +
@@ -29,18 +29,16 @@ lang: en @@ -66,7 +64,7 @@ lang: en
-
{% assign onetracker = page.tracks | size %} {% if onetracker > 1 %} @@ -96,20 +94,17 @@ lang: en
{{ track.common.track.no }}.
-
{{ track.common.title }}
-
{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }}
+
{{ 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 }}
{% endfor %}
-
- {% for post in site.posts %} - {% if post.album == page.slug %} - {{ post.content }} - {% endif %} - {% endfor %} +
+ {{ content }} +

{{ page.credits }}

@@ -119,12 +114,12 @@ lang: en -{% include streamer.html %} +

Track list

-

Use thses pages to share one song in particular

+

Use thses pages to share one song in particulare

@@ -137,7 +132,7 @@ lang: en

{{ track.common.title }}

- {% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }} + {% 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 }}

@@ -146,13 +141,13 @@ lang: en
- {{ track.common.title }} + {{ track.common.title }}
{% endfor %} - +{% include streamer.html %}
@@ -224,7 +219,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": "{{ site.mediaurl }}/{{ track.albumSlug }}/{{ track.trackSlug }}" + "file": "https://media.basspistol.com/panix/{{ track.albumSlug }}/{{ track.trackSlug }}" }{% unless forloop.last %},{% endunless %}{% endfor %}], trackCount = tracks.length, npAction = $('#npAction'), diff --git a/_layouts/default.html b/_layouts/default.html index 9a81ba7c..50d8d8cd 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -8,9 +8,10 @@ --> + {% include seo.html %} {% include relBase.html %} - + @@ -20,7 +21,7 @@ - +
diff --git a/_layouts/post.html b/_layouts/post.html index 90413fe1..8359f7b7 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,6 +1,6 @@ --- --- -{% if page.category == 'releases' %} +{% if page.category == 'release' %}
@@ -28,12 +29,12 @@
-
+
{{ content }} +

{{ page.credits }}

- -{% include streamer.html %} {% for track in album.tracks %} @@ -120,7 +120,7 @@

{{ track.common.title }}

- {% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }} + {% 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 }}

@@ -129,12 +129,13 @@
- {{ track.common.title }} + {{ track.common.title }}
{% endfor %} +{% include streamer.html %} {% break %} {% endif %} {% endfor %} @@ -211,7 +212,7 @@ "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": "{{ site.mediaurl }}/{{ 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'), @@ -299,6 +300,7 @@ + {% include seo.html %} {% include relBase.html %} @@ -311,20 +313,17 @@ - +
-
diff --git a/feed.xml b/feed.xml index e44722bb..b787481d 100644 --- a/feed.xml +++ b/feed.xml @@ -7,7 +7,7 @@ layout: nil xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"> - {{ site.title | xml_escape }} + {{ site.name | xml_escape }} {% if site.description %}{{ site.description | xml_escape }}{% endif %} {{ site.feed_update_period | default: "daily" | xml_escape }} {{ site.feed_update_frequency | default: 1 | xml_escape }} diff --git a/index.html b/index.html index b82609eb..58f9bbde 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@ date: 2018-12-11 00:00:00 -
+

Ready for the output?

@@ -39,10 +39,10 @@ image: /images/guillaume-techer-jm9p0mdpo6a-unsplash.jpg

{{ album.date | date: '%Y' }}

{% for track in album.tracks %} -

+

{{ track.common.track.no }}. {{ track.common.title }}
| - {{ track.common.genre }} + {{ track.common.genre }}

@@ -59,13 +59,13 @@ image: /images/guillaume-techer-jm9p0mdpo6a-unsplash.jpg
- {{ album.title }} + {{ album.title }}