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/_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.
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}}
-
- {% endif %}
- {% endif %}
- {% endif %}
- {% endfor %}
-{% endif %}
-{% assign posts_collate = nil %}
diff --git a/_includes/JB/setup b/_includes/JB/setup
deleted file mode 100644
index efcd84b..0000000
--- a/_includes/JB/setup
+++ /dev/null
@@ -1,22 +0,0 @@
-{% capture jbcache %}
-
- {% if site.JB.setup.provider == "custom" %}
- {% include custom/setup %}
- {% else %}
- {% if site.safe and site.JB.BASE_PATH and site.JB.BASE_PATH != '' %}
- {% assign BASE_PATH = site.JB.BASE_PATH %}
- {% assign HOME_PATH = site.JB.BASE_PATH %}
- {% else %}
- {% assign BASE_PATH = nil %}
- {% assign HOME_PATH = "/" %}
- {% endif %}
-
- {% if site.JB.ASSET_PATH %}
- {% assign ASSET_PATH = site.JB.ASSET_PATH %}
- {% else %}
- {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %}
- {% endif %}
- {% endif %}
-{% endcapture %}{% assign jbcache = nil %}
\ No newline at end of file
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/_includes/highlightmetahead.html b/_includes/highlightmetahead.html
index bcc0e94..c055e30 100644
--- a/_includes/highlightmetahead.html
+++ b/_includes/highlightmetahead.html
@@ -53,12 +53,12 @@
{% if page.description == null %}
{% else %}
{% endif %}{% if page.image == null %}
- {% elsif page.poster == null %}
+ {% elsif page.poster_image == null %}
{% else %}
- {% endif %}
+ {% endif %}
{% for social_id in site.social_ids %}{% assign social = site.social[social_id] %}
{% endfor %}
diff --git a/_includes/metahead.html b/_includes/metahead.html
index c19ef79..d5dc71e 100644
--- a/_includes/metahead.html
+++ b/_includes/metahead.html
@@ -55,8 +55,8 @@
{% if page.description == null %}
{% else %}
{% endif %}{% if page.image == null %}
- {% elsif page.category == "highlights" %}
- {% else %}
+ {% elsif page.category == "highlights" %}
+ {% else %}
@@ -72,7 +72,7 @@
{% if page.description == null %}
{% else %}
{% endif %}{% if page.image == null %}
- {% elsif page.category == "highlights" %}
+ {% elsif page.category == "highlights" %}
{% else %}
{% endif %}
@@ -169,7 +169,7 @@
{% if page.description == null %}"description": "{{ site.tagline | strip_html }}",{% else %}"description": "{{ page.description | strip_html }}",{% endif %}
"image": {
"@type": "ImageObject", {% if page.image == null %}
- "url": "{{ site.production_url }}/assets/vid/{{ page.poster }}"{% elsif page.category == "highlights" %}
+ "url": "{{ site.production_url }}{{ page.poster_image }}"{% elsif page.category == "highlights" %}
"url": "{{ site.production_url }}/assets/img/thumb/{{ page.image }}"{% else %}
"url": "{{ site.production_url }}{{ site.banner }}",
"width": "1024",
diff --git a/_includes/videopageheader.html b/_includes/videopageheader.html
index f1e86c5..705ce2c 100644
--- a/_includes/videopageheader.html
+++ b/_includes/videopageheader.html
@@ -1,5 +1,5 @@
-
-
+
+
-
+
~/{{ page.subtitle }}
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
diff --git a/about.html b/about.html
index 9195099..54f2053 100644
--- a/about.html
+++ b/about.html
@@ -2,9 +2,8 @@
title: About The Syndicate
subtitle: About
description: 'The Basspistol DNA'
-video: intro_loop_.mp4
-poster: intro_loop_.png
-thumb: intro_loop_.png
+video_path: /assets/vid/intro_loop_.mp4
+poster_image: /assets/vid/intro_loop_.jpg
layout: default
---
diff --git a/artists/index.html b/artists.html
similarity index 94%
rename from artists/index.html
rename to artists.html
index 7e6614e..19c8672 100644
--- a/artists/index.html
+++ b/artists.html
@@ -3,9 +3,8 @@ title: Basspistol Artists
subtitle: Roster
description: 'The Basspistol roster, united powerful syndicated Artists'
keywords: basspistol, artists, rosters, Franky, Fresco, Jokko, Sakrecoer, Max Park, Fraglebay, Sweatsky, Tikov
-video: artists.mp4
-poster: artists.jpg
-thumb: artists.jpg
+video_path: /assets/vid/artists.mp4
+poster_image: /assets/vid/artists.jpg
---
diff --git a/assets/vid/discogs.jpg b/assets/vid/discogs.jpg
new file mode 100644
index 0000000..f906ce5
Binary files /dev/null and b/assets/vid/discogs.jpg differ
diff --git a/assets/vid/discogs.png b/assets/vid/discogs.png
deleted file mode 100644
index d97135b..0000000
Binary files a/assets/vid/discogs.png and /dev/null differ
diff --git a/assets/vid/highlights.jpg b/assets/vid/highlights.jpg
new file mode 100644
index 0000000..6b848f8
Binary files /dev/null and b/assets/vid/highlights.jpg differ
diff --git a/assets/vid/highlights.png b/assets/vid/highlights.png
deleted file mode 100644
index bf8d3d3..0000000
Binary files a/assets/vid/highlights.png and /dev/null differ
diff --git a/assets/vid/intro_loop_.jpg b/assets/vid/intro_loop_.jpg
new file mode 100644
index 0000000..578673e
Binary files /dev/null and b/assets/vid/intro_loop_.jpg differ
diff --git a/assets/vid/intro_loop_.png b/assets/vid/intro_loop_.png
deleted file mode 100644
index 8865542..0000000
Binary files a/assets/vid/intro_loop_.png and /dev/null differ
diff --git a/assets/vid/links.jpg b/assets/vid/links.jpg
new file mode 100644
index 0000000..9d9871a
Binary files /dev/null and b/assets/vid/links.jpg differ
diff --git a/assets/vid/links.png b/assets/vid/links.png
deleted file mode 100644
index 1dd117e..0000000
Binary files a/assets/vid/links.png and /dev/null differ
diff --git a/assets/vid/radio.jpg b/assets/vid/radio.jpg
new file mode 100644
index 0000000..b4cb6d4
Binary files /dev/null and b/assets/vid/radio.jpg differ
diff --git a/assets/vid/radio.png b/assets/vid/radio.png
deleted file mode 100644
index 279590f..0000000
Binary files a/assets/vid/radio.png and /dev/null differ
diff --git a/discography/index.html b/discography.html
similarity index 91%
rename from discography/index.html
rename to discography.html
index b2dd33c..bc595b7 100644
--- a/discography/index.html
+++ b/discography.html
@@ -3,9 +3,8 @@ title: Discography
subtitle: Discog
description: 'Our collection of Creative Commons licensed releases. Open culture''s finest'
keywords: Discography, Releases, Music, Full-length, Albums, EP
-video: discogs.mp4
-poster: discogs.png
-thumb: discogs.png
+video_path: /assets/vid/discogs.mp4
+poster_image: /assets/vid/discogs.jpg
---
diff --git a/highlights/index.html b/highlights.html
similarity index 94%
rename from highlights/index.html
rename to highlights.html
index 4da8119..e520b06 100644
--- a/highlights/index.html
+++ b/highlights.html
@@ -3,9 +3,8 @@ title: Highlights
subtitle: Hi-Lights
description: 'Links to secret music, infamous articles, forbiden videos, off the record interviews and much more...'
keywords: Music, News, blog, Interviews, links, promotion,
-video: highlights.mp4
-poster: highlights.png
-thumb: highlights.png
+video_path: /assets/vid/highlights.mp4
+poster_image: /assets/vid/highlights.jpg
permalink: /highlights/
pagination:
enabled: true
@@ -40,6 +39,7 @@ pagination:
{% endfor %}
+ {% if jekyll.environment == 'production' %}
{% if paginator.total_pages > 1 %}
page {{ paginator.page }} of {{ paginator.total_pages }}
@@ -56,6 +56,7 @@ pagination:
{% endif %}
{% endif %}
+ {% endif %}
{% include footer.html %}
diff --git a/index.html b/index.html
index 252fdf1..e7d2b1f 100644
--- a/index.html
+++ b/index.html
@@ -5,9 +5,8 @@ description: 'Homepage of Basspistol, The Outernational Music Syndicate establis
keywords: >-
Basspistol, Outernational, Music, Syndicate, Homepage, Collective, Free,
Culture,
-video: intro_loop_.mp4
-poster: intro_loop_.png
-thumb: intro_loop_.png
+video_path: /assets/vid/intro_loop_.mp4
+poster_image: /assets/vid/intro_loop_.jpg
---
diff --git a/links/index.html b/links.html
similarity index 92%
rename from links/index.html
rename to links.html
index aada3f6..a56d0ca 100644
--- a/links/index.html
+++ b/links.html
@@ -3,9 +3,8 @@ title: Links
subtitle: Links
description: 'Venture outside of your daily web-routine, read about some real projects. These links are way more than just Friends and Resources'
keywords: Links, music, record, labels, resources, friends
-video: links.mp4
-poster: links.png
-thumb: links.png
+video_path: /assets/vid/links.mp4
+poster_image: /assets/vid/links.jpg
---
diff --git a/radio/index.html b/radio.html
similarity index 98%
rename from radio/index.html
rename to radio.html
index 9c978c6..5062dec 100644
--- a/radio/index.html
+++ b/radio.html
@@ -3,9 +3,8 @@ title: Basspistol Libre Radio
subtitle: Radio
description: "Basspistol Radio Station! 777% without commercials! RobotDJ-sets and live interventions!"
keywords: Radio, basspistol, Live, Music, Broadcast, Stream,
-video: radio.mp4
-poster: radio.png
-thumb: radio.png
+video_path: /assets/vid/radio.mp4
+poster_image: /assets/vid/radio.jpg
---
diff --git a/tags.html b/tags.html
index 39c7308..408a668 100644
--- a/tags.html
+++ b/tags.html
@@ -3,9 +3,8 @@ title: taxonomy page
subtitle: Tags
description: 'List of post tags on Basspistol'
keywords: Basspistol, Outernational, Music, Syndicate, Homepage, Collective, Free, Culture, Tags
-video: intro_loop_.mp4
-poster: intro_loop_.png
-thumb: intro_loop_.png
+video_path: /assets/vid/intro_loop_.mp4
+poster_image: /assets/vid/intro_loop_.jpg
permalink: /tags/
---