From 6dd63fd195b9d3adac1e22f723673131d7915dfd Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Mon, 13 Jan 2020 17:44:10 +0100 Subject: [PATCH] realtive paths --- _includes/cookiemonster.html | 3 ++- _includes/liberapay.html | 3 ++- _includes/navmenu.html | 9 ++++---- _includes/relBase.html | 12 ++++++++++ _layouts/default.html | 16 ++++++++------ _layouts/music.html | 14 ++++++------ _layouts/null.html | 3 +++ about/index.html | 9 ++++---- index.html | 12 +++++----- links.html | 43 ++++++++++++++++++------------------ music.html | 7 +++--- 11 files changed, 77 insertions(+), 54 deletions(-) create mode 100644 _includes/relBase.html diff --git a/_includes/cookiemonster.html b/_includes/cookiemonster.html index 2e24b33..c226f3c 100644 --- a/_includes/cookiemonster.html +++ b/_includes/cookiemonster.html @@ -1,3 +1,4 @@ +{% include relBase.html %} - + diff --git a/_includes/liberapay.html b/_includes/liberapay.html index 9fe4f78..44529f7 100644 --- a/_includes/liberapay.html +++ b/_includes/liberapay.html @@ -1,3 +1,4 @@ +{% include relBase.html %} -Donate using Liberapay +Donate using Liberapay diff --git a/_includes/navmenu.html b/_includes/navmenu.html index 4d972f9..29717eb 100644 --- a/_includes/navmenu.html +++ b/_includes/navmenu.html @@ -1,13 +1,14 @@ +{% include relBase.html %} {% if page.collection != 'tracks' %} diff --git a/_includes/relBase.html b/_includes/relBase.html new file mode 100644 index 0000000..cb47344 --- /dev/null +++ b/_includes/relBase.html @@ -0,0 +1,12 @@ +{% assign relBase = '' %} +{% assign tempDepth = page.url | append: 'hackish-solution' | split: '/' | size | minus: 2 %} +{% for i in (1..tempDepth) %} + {% if forloop.last %} + {% assign relBase = relBase | append: ".." %} + {% else %} + {% assign relBase = relBase | append: "../" %} + {% endif %} +{% endfor %} +{% if relBase == '' %} + {% assign relBase = '.' %} +{% endif %} diff --git a/_layouts/default.html b/_layouts/default.html index ae014d6..28ac9e9 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,22 +1,24 @@ --- --- +{% include relBase.html %} - - - - - - + + + + + + {% include seo.html %} -{% include matomo.html %} + + diff --git a/_layouts/music.html b/_layouts/music.html index ed4e6a4..254f09a 100644 --- a/_layouts/music.html +++ b/_layouts/music.html @@ -8,14 +8,14 @@ layout: default


{% if page.previous != nil %} - + {% endif %} + src="{{ relBase }}/assets/img/icons/dl.png" title="Download Track" /> {% if page.next != nil %} - {% endif %} + {% endif %}

{% include liberapay.html %}
@@ -58,7 +58,7 @@ layout: default mu.pause(); mu.currentTime = 0; {% if page.previous != nil %} - loadUrl('{{ site.baseurl }}{{ page.previous.url }}'); return false; + loadUrl('{{ relBase }}{{ page.previous.url }}'); return false; {% endif %} // qq IE10 muFade(); @@ -85,7 +85,7 @@ layout: default } #wallpaper { - background-image: url(/assets/img/world.svg); + background-image: url({{ relBase }}/assets/img/world.svg); -webkit-animation: AnimationName 30s ease infinite; -moz-animation: AnimationName 30s ease infinite; animation: AnimationName 30s ease infinite; diff --git a/_layouts/null.html b/_layouts/null.html index e69de29..7f63ffd 100644 --- a/_layouts/null.html +++ b/_layouts/null.html @@ -0,0 +1,3 @@ +--- +--- +{{ content }} \ No newline at end of file diff --git a/about/index.html b/about/index.html index 6406c5e..a9cc8f9 100644 --- a/about/index.html +++ b/about/index.html @@ -3,19 +3,20 @@ title: About layout: default description: What is Sakrecoer about and what does its music stand for? --- +{% include relBase.html %}
-

Back

 +

Back

{{ page.title }}

{{ page.description }}

{% include liberapay.html %}
-
diff --git a/index.html b/index.html index c6769b8..28878a1 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ image: /siteicon.png mp4_path: /assets/vi/0001-0076.mp4 webm_path: /assets/vi/0001-0076.webm --- - +{% include relBase.html %}

{{ site.title }}

@@ -15,16 +15,16 @@ webm_path: /assets/vi/0001-0076.webm

You are here

-

Where am I?

+

Where am I?

Stream

-

Music

+

Music

-
diff --git a/links.html b/links.html index 6be7691..5e70867 100644 --- a/links.html +++ b/links.html @@ -3,27 +3,28 @@ title: Links layout: default image: /links/linkbg.jpg --- +{% include relBase.html %}
- - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
{% include navmenu.html %} \ No newline at end of file diff --git a/music.html b/music.html index 615b744..04f24b6 100644 --- a/music.html +++ b/music.html @@ -4,6 +4,7 @@ description: Officially released but also exclusive audio-material by Sakrecoer layout: default image: /assets/img/world.svg --- +{% include relBase.html %} {% include navmenu.html %}
@@ -11,7 +12,7 @@ image: /assets/img/world.svg
-

Back

 +

Back

Music

{{ page.description }}

{% include liberapay.html %} @@ -47,7 +48,7 @@ image: /assets/img/world.svg {% for track in site.tracks reversed %}
- +

{{ track.title }}

 @@ -92,7 +93,7 @@ body { -moz-animation: AnimationName 60s ease infinite; animation: AnimationName 60s ease infinite; } #wallpaper { - background-image: url('{{ page.image }}'); + background-image: url('{{ relBase }}{{ page.image }}'); background-position: center; background-repeat: repeat; -webkit-animation: AnimationName 60s ease infinite;