diff --git a/_data/navigation.yml b/_data/navigation.yml index 5141483..16ffaac 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,16 +1,16 @@ -- icon: fa-disc +- icon: 💽 url: /discography/ name: Discog external_site: false -- icon: fa-newspaper +- icon: 📰 url: /log/ name: Log external_site: false -- icon: fa-finger-print +- icon: 🐿 url: /about/ name: About external_site: false -- icon: fa-link +- icon: 🔗 url: /links/ name: Links external_site: false diff --git a/_includes/analytics.js b/_includes/analytics.js index c8f9293..1b0c4b6 100644 --- a/_includes/analytics.js +++ b/_includes/analytics.js @@ -13,7 +13,7 @@ _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.defer=true; g.src='//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/matomo.js'; s.parentNode.insertBefore(g,s); })(); //* End Matomo *// @@ -26,7 +26,7 @@ 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.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/container_{{ site.matomo_container }}.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_{{ site.matomo_container }}.js'; s.parentNode.insertBefore(g,s); //* End Matomo Tag Manager *// {% endif %} diff --git a/_includes/author.html b/_includes/author.html index 2fcc190..362df5a 100644 --- a/_includes/author.html +++ b/_includes/author.html @@ -26,7 +26,7 @@ href="https://touch.facebook.com/sharer.php?u={{ site.url }}{{ page.url | xml_escape }}&quote={{ page.title | xml_escape }}%20by%20{{ site.title xml_escape }}%20via%20{{ site.url }}" class="icon smaller fab fa-facebook-f">Facebook Twitter +
+
+
+
+

Kontakta oss!

+
+ +
+
+ + + {% if page.url == '/fr-fretag/' %} + + + + + + + {% endif %} +
+
+
+ +
+
+
+ integritets policyn + +
+
+
+ +
+
+
+ +
+
+
+
+ \ No newline at end of file diff --git a/_includes/cookie-consent.html b/_includes/cookie-consent.html index e212b89..dc267d9 100644 --- a/_includes/cookie-consent.html +++ b/_includes/cookie-consent.html @@ -1,13 +1,13 @@ diff --git a/_includes/ethoicon-selector.html b/_includes/ethoicon-selector.html new file mode 100644 index 0000000..61df6ce --- /dev/null +++ b/_includes/ethoicon-selector.html @@ -0,0 +1,172 @@ + +{% case include.icon %} +{% when "alcohol" %} + + + + + + + + +{% when "fossile" %} + + + +{% when "gambling" %} + + + + +{% when "gmo" %} + + + + + + +{% when "nuclear" %} + + + + + + +{% when "meat" %} + + + +{% when "pesticide" %} + + + + + + +{% when "processed" %} + + + + + +{% when "tobak" %} + + + + + +{% when "weapon" %} + + + + +{% endcase %} diff --git a/_includes/ethos.html b/_includes/ethos.html new file mode 100644 index 0000000..25d7f02 --- /dev/null +++ b/_includes/ethos.html @@ -0,0 +1,31 @@ +
+

+ Kategorier + +

+

✎ + Edit order


+
+ + {% for etho_name in site.data.ethos_ordning %}{% for etho in site.ethos %} + {% capture name -%}{{ etho.relative_path | replace_first: etho.collection, '' | replace_first: '_/', '' | replace_first: '.md', '' }}{%- endcapture %} + {% if name == etho_name %} +
+
+ + {% capture name -%}{{ etho.relative_path | replace_first: etho.collection, '' | replace_first: '_/', '' | replace_first: '.md', '' }}{%- endcapture %} + {% include ethoicon-selector.html icon=name %} + + +
+
+

{{ etho.title }}

+

{{ etho.description }}

+

✎ + Edit Ethos

+
+
+ {% break %} {% endif %} {% endfor %} {% endfor %} +
+
+ diff --git a/_includes/footer.html b/_includes/footer.html index 20907bd..45db997 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,32 +1,35 @@ - -{% unless page.collection == 'tracks' %} {% include streamer.html %} -{% endunless %} + diff --git a/_includes/header.html b/_includes/header.html index 5c18bf5..42193fb 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,23 +1,33 @@ -
-
-

{{ page.title }}

-

{{ page.description }}

- {% if page.category == 'releases' %} -

Listen

- {% endif %} - {% if page.category == 'ramblings' %} -

Read

- {% endif %} - {% if page.url == '/404/' %} -

Take me home

- {% endif %} -
+{% include relBase.html %} +
- +

{{ page.title }}

- {% if page.video_path %} - - {% endif %} -
+ + +
+
+ +
+ + + +
+ +

{{ page.title }}

+ {% if page.category == 'releases' %} +

by {{ page.artist }}

+ {% endif %} + {% unless page.category == 'releases' %} +

{{ page.description }}

+ {% endunless %} +
+
+ +
+ + + diff --git a/_includes/matomo.js b/_includes/matomo.js index b5aa886..214bac0 100644 --- a/_includes/matomo.js +++ b/_includes/matomo.js @@ -9,5 +9,5 @@ _paq.push(['enableLinkTracking']); _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.defer=true; g.src='//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/matomo.js'; s.parentNode.insertBefore(g,s); })(); diff --git a/_includes/navigation.html b/_includes/navigation.html index a22341e..6db262c 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,7 +1,7 @@
- + @@ -15,13 +15,13 @@ X
- +
-
+
{{ content }}
@@ -130,7 +132,6 @@ layout: default
-

{{ track.common.title }}

@@ -138,12 +139,8 @@ layout: default {% 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

- - - +

Play

-
{% endfor %} @@ -156,34 +153,26 @@ layout: default
- - {% if page.previous.url or page.next.url %} - -

Check out more

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

 {{page.previous.title}}

-

{{ page.previous.description }}

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

+

{{ page.previous.title }}

+

{{ page.previous.description }}

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

+

{{ page.next.title }}

+

{{ page.next.description }}

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

{{page.next.title}} 

-

{{ page.next.description }}

- - {% endif %} -
- - - -{% endif %} - - -
@@ -309,34 +298,39 @@ layout: default {% else %} {% include header.html %} +
-
+
+ {{ content }} -

 

-

Check it out

+ {% if page.link %} +

👀 Check it out!

+ {% endif %}
- {% include streamer.html %} - -
- {% if page.previous.url or page.next.url %} -

Post Navigation

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

 {{page.previous.title}}

- -

{{ page.previous.description }}

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

{{page.next.title}} 

-

{{ page.next.description }}

- {% endif %} -
- {% endif %} -
+ + + +
+ {% if page.previous.url or page.next.url %} +
+
+ {% if page.previous.url %} +

+

{{ page.previous.title }}

+

{{ page.previous.description }}

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

+

{{ 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 6ddcee8..d8e2162 100644 --- a/_layouts/track.html +++ b/_layouts/track.html @@ -18,7 +18,7 @@ layout: default
Play!
-

{{ page.common.title }}

+

@@ -27,7 +27,9 @@ layout: default
+
+

{{ page.common.title }}

{% for style in page.common.genre %}{{ style }}{% endfor %} by {{ page.common.artist }}

{% for post in site.posts %} {% if post.album == page.albumSlug %} @@ -37,7 +39,7 @@ layout: default

{% assign round_seconds = page.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 }}

- + {% include author.html %} @@ -71,48 +73,32 @@ layout: default

{{ page.all.Comment }}

- {% for albumurl in site.posts %} - {% if albumurl.album == page.albumSlug %} -

See release page

-{% endif %} -{% endfor %} +
{% for post in site.posts %} {% if post.album == page.albumSlug %} -{% include streamer.html %} + {% endif %} {% endfor %}
- - {% if page.previous.url or page.next.url %} - -

Track Navigation

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

 Previous

-

{{ page.previous.common.title }}

-

{{ page.previous.description }}

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

Next 

-

{{ page.next.common.title }}

-

{{ page.next.description }}

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

+

{{ page.previous.common.title }}

+

{{ page.previous.description }}

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

+

{{ page.next.common.title }}

+

{{ page.next.description }}

+ {% endif %} +
{% endif %} - - - {% include footer.html %} @@ -126,7 +112,7 @@ layout: default
-