From 552a4e17445cec338725d338103c106f1616e62d Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Mon, 1 Apr 2019 23:35:32 +0200 Subject: [PATCH 01/10] cannon defaults --- _includes/author.html | 2 +- _posts/_defaults.md | 2 +- _staff_members/_defaults.md | 2 +- _staff_members/set.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_includes/author.html b/_includes/author.html index f3f7e9b..2e2b84e 100644 --- a/_includes/author.html +++ b/_includes/author.html @@ -2,5 +2,5 @@ {% assign author_id = page.author | prepend: "/staff_members/" | append: "/" %} {% assign author_name = site.staff_members | where: "url", author_id | first %} -

{{ author_name.name }}
{{ author_name.blurb }}

+

{{ author_name.name }}
{{ author_name.blurb_markup }}

{% endif %} \ No newline at end of file diff --git a/_posts/_defaults.md b/_posts/_defaults.md index e1872bc..0deb994 100644 --- a/_posts/_defaults.md +++ b/_posts/_defaults.md @@ -1,12 +1,12 @@ --- title: '' +description: '' date: '' artist: '' author: '' category: '' tags: [] layout: -description: '' uid: '' image: '' download: '' diff --git a/_staff_members/_defaults.md b/_staff_members/_defaults.md index 64a664c..34473b6 100644 --- a/_staff_members/_defaults.md +++ b/_staff_members/_defaults.md @@ -5,5 +5,5 @@ image_path: url_staff: email: gpg: -blurb: +blurb_markup: --- \ No newline at end of file diff --git a/_staff_members/set.md b/_staff_members/set.md index 153ce40..57127a9 100644 --- a/_staff_members/set.md +++ b/_staff_members/set.md @@ -5,5 +5,5 @@ image_path: /assets/img/staff/set.png url_staff: 'https://sakrecoer.com' email: 'set@basspistol.com' gpg: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x92401D3F102A0208' -blurb: 'Multi-tasking humanoïd.' +blurb_markup: 'Multi-tasking humanoïd.' --- \ No newline at end of file From 1d777a6c52fdff8adfa6de9a6ed647b25b855de1 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Mon, 1 Apr 2019 23:45:27 +0200 Subject: [PATCH 02/10] freeing hightlights filter out pagination ineditor --- highlights/index.html => highlights.html | 2 ++ 1 file changed, 2 insertions(+) rename highlights/index.html => highlights.html (97%) diff --git a/highlights/index.html b/highlights.html similarity index 97% rename from highlights/index.html rename to highlights.html index 4da8119..140a8b4 100644 --- a/highlights/index.html +++ b/highlights.html @@ -40,6 +40,7 @@ pagination: {% endfor %} + {% if jekyll.environment == 'production' %} {% if paginator.total_pages > 1 %}

page {{ paginator.page }} of {{ paginator.total_pages }}

@@ -56,6 +57,7 @@ pagination: {% endif %}
{% endif %} + {% endif %} {% include footer.html %} From b73463c77b530a38d4eed734590d429f5e436d09 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Mon, 1 Apr 2019 21:48:33 +0000 Subject: [PATCH 03/10] Updated 'highlights.html' via CloudCannon --- highlights.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/highlights.html b/highlights.html index 140a8b4..2ae53f5 100644 --- a/highlights.html +++ b/highlights.html @@ -7,14 +7,6 @@ video: highlights.mp4 poster: highlights.png thumb: highlights.png permalink: /highlights/ -pagination: - enabled: true - category: highlights - per_page: 14 - title: 'Highlight page :num of :max' - limit: 0 - sort_field: 'date' - sort_reverse: true --- From 0b4049171f996dbe20ca9955565a2d6e05f5eed0 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Mon, 1 Apr 2019 21:49:41 +0000 Subject: [PATCH 04/10] Updated 'highlights.html' via CloudCannon --- highlights.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/highlights.html b/highlights.html index 2ae53f5..140a8b4 100644 --- a/highlights.html +++ b/highlights.html @@ -7,6 +7,14 @@ video: highlights.mp4 poster: highlights.png thumb: highlights.png permalink: /highlights/ +pagination: + enabled: true + category: highlights + per_page: 14 + title: 'Highlight page :num of :max' + limit: 0 + sort_field: 'date' + sort_reverse: true --- From b6813b70e786ed85db44475a6994ed6659eca2f8 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Mon, 1 Apr 2019 23:59:27 +0200 Subject: [PATCH 05/10] trash --- _drafts/2018-09-25-dabke.md | 18 ------------------ _drafts/2018-10-17-vetesnskap.md | 11 ----------- 2 files changed, 29 deletions(-) delete mode 100644 _drafts/2018-09-25-dabke.md delete mode 100644 _drafts/2018-10-17-vetesnskap.md diff --git a/_drafts/2018-09-25-dabke.md b/_drafts/2018-09-25-dabke.md deleted file mode 100644 index deebade..0000000 --- a/_drafts/2018-09-25-dabke.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: 'Dabke' -artist: 'Various Artists' -category: highlights -tags: [oriental, arabic, kurdish, persian, dabke, maghreb, article] -layout: link -description: 'Oriental music and the 1001 unreadable superhits' -uid: '1001dabkedeliciousness' -image: 'clr.jpg' -download: '' -link: 'https://youtu.be/TmAvt5p6f8g' -author: set ---- -There is something intriguing with minorities. Even the concept itself: often times a minority is actually a majority. It's easy to glue a bunch of stuff together under the minority tag; many occidentals think that arabs are a minortiy, and perhaps they are in whatever occidental country said westener is thinking about it, but there is so much more. There are kurds, persians, Maghrebins (ironically occidentals in arabic) and there is probably more!!!? Lately i have geeked out on music from the middle east. Particularily this one style mainly associated to a dance called [Dabke](https://en.wikipedia.org/wiki/Dabke "Dabke-Dance Wikipedia page") - -It first hit me in a Lebanease restaurant. I didn't really pay attention first, because the rythm was so familiar, it felt like reaggeton. But at some point there was this crazy TB-303 basline with resonance and tune knob set to max. As i started to listen, i realized this was neither Acid Techno, nor reggeaton. I waved in the waiter and asked what it was. A slightly emarassed young man told me he didn't know how to spell it in European carachters, but gave me a paper with the name in arabic and an attempt in European. Of course, I lost that paper and none of my attempts to spell the name in search queries ever worked. - -Fastforward, in a train to Södertälje, also known as "Little Syria". I hear that melody again, this time comming from someones headphone. I emediatly asked \ No newline at end of file diff --git a/_drafts/2018-10-17-vetesnskap.md b/_drafts/2018-10-17-vetesnskap.md deleted file mode 100644 index 4ae2e31..0000000 --- a/_drafts/2018-10-17-vetesnskap.md +++ /dev/null @@ -1,11 +0,0 @@ -Stadens vetenhet mot stadens vetenskap. -Vi vet saker men vi vet inte vilka saker andra vet -Vi ger varandra erfarenhet och erfarenheten kommer till oss från alla andra -tillsammans har vi ovisgemenskapen -Tillsmamans vet vart vi ska -Vetenskapen drivas av kärlek för vetenskap -Skepticism definerar kärlekens utsträckning. -Utsträckning vara religion -Religion äro ej vetenskap. -Ingen absolut kunskap är möjlig -Ingen absolut kärlek heller. From f23252c963a1796d03c5a6dac170d589b23d93e3 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Tue, 2 Apr 2019 00:03:34 +0200 Subject: [PATCH 06/10] consolidating --- artists/index.html => artists.html | 0 discography/index.html => discography.html | 0 links/index.html => links.html | 0 radio/index.html => radio.html | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename artists/index.html => artists.html (100%) rename discography/index.html => discography.html (100%) rename links/index.html => links.html (100%) rename radio/index.html => radio.html (100%) diff --git a/artists/index.html b/artists.html similarity index 100% rename from artists/index.html rename to artists.html diff --git a/discography/index.html b/discography.html similarity index 100% rename from discography/index.html rename to discography.html diff --git a/links/index.html b/links.html similarity index 100% rename from links/index.html rename to links.html diff --git a/radio/index.html b/radio.html similarity index 100% rename from radio/index.html rename to radio.html From f91dc2379fd753108a1051eeb4031f52659f5216 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Tue, 2 Apr 2019 00:12:48 +0200 Subject: [PATCH 07/10] killing dinosaur --- 404.html | 6 ++--- _includes/JB/posts_collate | 55 -------------------------------------- _includes/JB/setup | 22 --------------- 3 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 _includes/JB/posts_collate delete mode 100644 _includes/JB/setup diff --git a/404.html b/404.html index 6672de1..627d458 100644 --- a/404.html +++ b/404.html @@ -1,12 +1,12 @@ --- layout: default title : Error 404 +subtitle: Error 404 bgimg: /assets/img/404.png permalink: /404.html --- -{% include JB/setup %} +

Sorry, this page is not available anymore or never has been.
Have a look in the archive...

If you really miss something, please send an email to info@basspistol.com -{% assign posts_collate = site.posts %} -{% include JB/posts_collate %} + diff --git a/_includes/JB/posts_collate b/_includes/JB/posts_collate deleted file mode 100644 index cbe3fe5..0000000 --- a/_includes/JB/posts_collate +++ /dev/null @@ -1,55 +0,0 @@ -{% comment %}{% endcomment %} - -{% if site.JB.posts_collate.provider == "custom" %} - {% include custom/posts_collate %} -{% else %} - {% for post in posts_collate %} - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% capture this_month %}{{ post.date | date: "%B" }}{% endcapture %} - {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} - {% capture next_month %}{{ post.previous.date | date: "%B" }}{% endcapture %} - - {% if forloop.first %} -

{{this_year}}

-

{{this_month}}

- - {% else %} - {% if this_year != next_year %} - -

{{next_year}}

-

{{next_month}}

-
    - {% else %} - {% if this_month != next_month %} -
-

{{next_month}}

-