diff --git a/_config-reference.yml b/_config-reference.yml new file mode 100644 index 0000000..5ed9b1c --- /dev/null +++ b/_config-reference.yml @@ -0,0 +1,117 @@ +title : 徒 setto セット +description: 'Set, Party, Gang! #Cybersoul.' + +url: "https://setto.basspistol.com" # the base hostname & protocol for your site +permalink: /:categories/:title/ + +## jekyll excludes +exclude: + - changelog.md + - '*.*~' + - '*.xcf' + - '*.blend*' + - Gemfile + - Gemfile.lock + - README.md + - LICENCE +## SEO +geo: + timezone: "Europe/Switzerland" + lat: '46.203918' + long: '6.133011' + region: 'CH-GE' + town: 'Geneva' + country: 'Switzerland' + postalcode: '1201' + +banner: /images/setto-logo.svg +icon: /images/setto-logoicon.svg +logo: /images/setto-logo.svg +logo-footer: /images/setto-logo-dark.svg +mediaurl: https://media.basspistol.com/setto.basspistol.com + +publisher: + name: Basspistol + domain: setto.basspistol.com + mail: info@basspistol.com +social: + name: To Setto Setto + mail: setto@basspistol.com + links: + - https://twitter.com/ToSettoSetto + - https://instagram.com/ToSettoSetto + +categories: + - releases + - ramblings + +collections: + albums: + output: false + permalink: /albums/:name/ + tracks: + output: true + permalink: /albums/:path/ + authors: + output: false + +## Matomo +matomo_site_id: '11' +matomo_container: 'kJUGWiO2' + +# defaults + +sass: + sass_dir: _sass + +defaults: + - scope: + path: "" + values: + lang: en + - scope: + path: "" + type: "tracks" + values: + layout: "track" + lang: en + seo: + type: "AudioObject" + - scope: + path: "" + type: "pages" + values: + layout: "default" + lang: en + _options: + image: + width: 1024 + height: 720 + resize_style: cover + uploads_dir: "/images/pages" + content: + width: 720 + height: 720 + resize_style: cover + uploads_dir: "/images/pages" + - scope: + path: "" + type: "posts" + values: + layout: "post" + lang: en + permalink: /:title/ + _options: + image: + width: 1024 + height: 720 + resize_style: cover + uploads_dir: "/images/posts" + content: + width: 720 + height: 720 + resize_style: cover + uploads_dir: "/images/posts" +# --------- +# Translate +lang: en diff --git a/_config.yml b/_config.yml index 5ed9b1c..7603476 100644 --- a/_config.yml +++ b/_config.yml @@ -25,10 +25,12 @@ geo: postalcode: '1201' banner: /images/setto-logo.svg +banner-vert: icon: /images/setto-logoicon.svg logo: /images/setto-logo.svg logo-footer: /images/setto-logo-dark.svg mediaurl: https://media.basspistol.com/setto.basspistol.com +# mediaurl: /assets/albums publisher: name: Basspistol @@ -41,9 +43,17 @@ social: - https://twitter.com/ToSettoSetto - https://instagram.com/ToSettoSetto +## Matomo +matomo_site_id: '11' +matomo_container: 'kJUGWiO2' +# defaults categories: - releases - ramblings +tags: + - LP + - EP + - Single collections: albums: @@ -55,12 +65,6 @@ collections: authors: output: false -## Matomo -matomo_site_id: '11' -matomo_container: 'kJUGWiO2' - -# defaults - sass: sass_dir: _sass @@ -77,6 +81,14 @@ defaults: lang: en seo: type: "AudioObject" + - scope: + path: "" + type: "albums" + values: + layout: "album" + lang: en + seo: + type: "AudioObject" - scope: path: "" type: "pages" diff --git a/_data/stores.yml b/_data/stores.yml index 54bf9b0..786689b 100644 --- a/_data/stores.yml +++ b/_data/stores.yml @@ -20,7 +20,7 @@ download: false - name: Deezer url: https://www.deezer.com/fr/artist/56004012 - icon: fa-creative-commons-sampling + icon: fa-deezer download: false - name: Napster url: https://us.napster.com/artist/-setto- diff --git a/_includes/author.html b/_includes/author.html index ad61b30..2fcc190 100644 --- a/_includes/author.html +++ b/_includes/author.html @@ -1,38 +1,41 @@ {% assign author_id = page.author | prepend: "/authors/" | append: "/" %} {% assign author = site.authors | where: "url", author_id | first %} -
+
- {% if page.collection == 'posts' %} -
+ {% if page.collection == 'posts' %} +
+
+
+

{{ author.name }}

+

{{ author.position }}{% if author.gpg != nil %} | GPG{% endif %}

+

+ Published the + + {% include dates.html %} +

+ + {% endif %} +
+ + Share this page: +
+ + +
-
-

{{ author.name }}

-

{{ author.position }}{% if author.gpg != nil %} | GPG{% endif %}

-

- Published the - -{% include dates.html %} -

- - {% endif %} -
- - Share this page: -
- - {% if page.collection == 'tracks' %} - {% for post in site.posts %} - {% if post.album == page.albumSlug %} - Back to Album

- {% endif %} - {% endfor %} - {% endif %} -
-
\ No newline at end of file + \ No newline at end of file diff --git a/_includes/contact.html b/_includes/contact.html deleted file mode 100644 index 1e647a8..0000000 --- a/_includes/contact.html +++ /dev/null @@ -1,42 +0,0 @@ - -
-
-

- -

-
-
- -
-
- - -
-
- - -
-
- - -
-
-
- - -

- - - -
-
-
    -
    • -
-
- -
-
- diff --git a/_includes/cookie-consent.html b/_includes/cookie-consent.html index 1a12014..af402ed 100644 --- a/_includes/cookie-consent.html +++ b/_includes/cookie-consent.html @@ -1,7 +1,14 @@ - - - - - - diff --git a/_includes/streamer.html b/_includes/streamer.html index 9250ea6..8fff8f7 100644 --- a/_includes/streamer.html +++ b/_includes/streamer.html @@ -1,205 +1,88 @@ {% 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 %} -
- -

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

+ {% 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 %} + + {{ shop.name }} + {% endfor %}
- -

Stream it, follow, like and subscribe!

+
+ {% else %} +
+

This release can't be obtained

+

Stream, follow, like and subscribe!

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

Get this release

+
+ {% for shop in page.stores %} + {{ shop.name }} + {% endfor %} +
+
+ {% else %} + {% endif %} + {% endif %} {% elsif page.collection == 'tracks' %} +
-
+ {% for post in site.posts %} + {% if post.album == page.albumSlug %} + {% if post.check_this_if_cannot_be_bought == false %} -{% 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 %} -

Get this track

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

This track can't be obtained

+

Stream, follow, like and subscribe!

+
+ {% for shop in site.data.stores %} + + {{ shop.name }} + + {% endfor %} +
+ {% break %} + + {% endif %} {% endif %} {% 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 %} - -

Get this album

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

Stream it, follow, like and subscribe!

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

This album 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 %} - -
+
{% else %} -
-

Support {{ site.title }}

-

Stream, follow, like and subscribe!

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

 

+
+

Support {{ site.title }}

+

Stream, follow, like and subscribe!

+
+ {% for shop in site.data.stores %} -
-{% for shop in site.data.stores %} -{% if shop.download != true %} -{{ shop.name }} -{% endif %} -{% endfor %} -
-
+ {{ shop.name }} + + {% endfor %} + +
{% endif %} diff --git a/_layouts/blog.html b/_layouts/blog.html deleted file mode 100644 index 036c436..0000000 --- a/_layouts/blog.html +++ /dev/null @@ -1,3 +0,0 @@ ---- -layout: default ---- \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index b5140b3..4d87ffc 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -2,32 +2,40 @@ --- - + {% include seo.html %} {% include relBase.html %} - - - + + - + - - - -
- {{ content }} -
- {% include navigation.html %} - {% include scripts.html %} - {% include cookie-consent.html %} + + +
+ +{{ content }} + +{% unless page.collection == 'tracks' %} +{% include footer.html %} +{% endunless %} + + + +
+ +{% unless page.collection == 'traks' %} +{% include navigation.html %} +{% endunless %} +{% include cookie-consent.html %} +{% include scripts.html %} \ No newline at end of file diff --git a/_layouts/page.html b/_layouts/page.html index 11caa91..2eec892 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,46 +1,7 @@ --- layout: default --- - -{% include relBase.html %} - - - - -
-
- -
- -
- {% if page.url != '/cookies/' %} - {% if page.url != '/webcreds/' %} - {% include author.html %} - {% endif %}{% endif %} - -
- {{ content }} - -
-
-
-
-
- - - - -{% include footer.html %} \ No newline at end of file +{% include header.html %} +
+{{ content }} +
\ No newline at end of file diff --git a/_layouts/post.html b/_layouts/post.html index 866ebfd..2300419 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,403 +1,332 @@ --- +layout: default --- {% if page.category == 'releases' %} - - - - + +{% include header.html %} -{% include seo.html %} -{% include relBase.html %} - - - - - - - - - - - -
+
+ + +{% for album in site.albums %} +{% if page.album == album.slug %} +{% assign onetracker = album.tracks | size %} +
- - - -
-
-
- -
- {% include author.html %} - -
- - - - {% for album in site.albums %} - {% if page.album == album.slug %} - -
-
-
-

-

Paused...

-
-
-
- -
{% assign onetracker = album.tracks | size %} - {% if onetracker > 1 %} -
- - -
- {% endif %} -
-
-
    - {% for track in album.tracks %} -
  • -
    -
    {{ 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 }}
    -
    -
    • - {% endfor %} -
-
-
-
- - {% for track in album.tracks %} - -
-
{{ 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 }}
-
- - {% endfor %} - -
-
-
- {{ content }} +
+
    + {% for track in album.tracks %} +
  • +
    +
    {{ 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 }}
    -
+ + {% endfor %} + +
+
+
+ + {% for track in album.tracks %} + +
+
{{ 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 }}
+ + {% endfor %} + +
+ +
+
+
+
+ {% assign author_id = page.author | prepend: "/authors/" | append: "/" %} + {% assign author = site.authors | where: "url", author_id | first %} +
+
+

{{ author.name }}

+

{{ author.position }}{% if author.gpg != nil %} | GPG{% endif %}

+

+ Published the + + {% include dates.html %} +

+ + +
+ + Share this page: +
+ + + +
+
+
+
+
+ +
+ +
+ +
+
+ + {% if onetracker > 1 %} +
+ + +
+ {% endif %} +

+

Paused...

+
+ +
+
+
+
+ {{ content }} +
{% include streamer.html %} - + +{% if onetracker > 1 %} + {% for track in album.tracks %} -
-
-

{{ 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 }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }}
{{ track.common.genre }}
{{ track.common.year }}

+ Play + + - -
-
- {{ track.common.title }}
+
{% endfor %} - + +{% endif %} -{% break %} {% endif %} {% endfor %} - + {% break %} {% endif %} {% endfor %} + + + +
-
-
-
- + {% if page.previous.url or page.next.url %} -
- - -
- -
-

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

Check out more

+
+ {% if page.previous.url %} +

{{page.previous.title}}

+

{{ page.previous.description }}

+

 Previous

+ {% endif %} +
+
+ {% if page.next.url%} + +

{{page.next.title}}

+

{{ page.next.description }}

+

Next 

+ {% endif %}
-{% include navigation.html %} -{% include scripts.html %} - + }; + extension = audio.canPlayType('audio/mpeg') ? '.mp3' : audio.canPlayType('audio/ogg') ? '.ogg' : ''; + loadTrack(index); + } + }); + + + -{% include cookie-consent.html %} - - {% else %} - - - - - - -{% include seo.html %} -{% include relBase.html %} - - - - - - - - - - - - - -
- - - - -
-
- -
- -
- {% if page.url != '/cookies/' %} - {% if page.url != '/webcreds/' %} - {% include author.html %} - {% endif %}{% endif %} - -
- {{ content }} - {% if page.link != nil %} - - {% endif %} -
-
+ {% include header.html %} +
+
+ {{ 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 %} - - +
+ {% include streamer.html %} + +
+ {% if page.previous.url or page.next.url %} +

Post Navigation

+
+ + {% if page.previous.url %} +

 Previous Post

+

{{page.previous.title}}

+

{{ page.previous.description }}

+ {% endif %} +
+
+ {% if page.next.url%} +

Next Post 

+

{{page.next.title}}

+

{{ page.next.description }}

+ {% endif %} +
+ {% endif %} +
{% endif %} \ No newline at end of file diff --git a/_layouts/track.html b/_layouts/track.html index d3accbc..169c154 100644 --- a/_layouts/track.html +++ b/_layouts/track.html @@ -4,124 +4,154 @@ layout: default {% include relBase.html %} -