Merge pull request #13 from Basspistol/developement

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 %}
+
 <h1>Sorry, this page is not available anymore or never has been. <br />
 Have a look in the archive...</h1>
 If you really miss something, please send an email to info@basspistol.com 
-{% assign posts_collate = site.posts %}
+
-{% include JB/posts_collate %}

_drafts/2018-09-25-dabke.md

@@ -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 

_drafts/2018-10-17-vetesnskap.md

@@ -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.

_includes/JB/posts_collate

@@ -1,55 +0,0 @@
-{% comment %}<!--
-Collate_posts helper. Collated posts by year and month.
-Usage:
-  1) assign the 'posts_collate' variable to a valid array of posts.
-  2) include JB/posts_collate
-  example:
-    {% assign posts_collate = site.posts %}
-    {% include JB/posts_collate %}
-
-  Ordering:
-    Posts are displayed in reverse chronological order.
-    For normal chronological order:
-      1) Change the for loop to this:
-        => 'for post in site.posts reversed'
-      2) Next make sure to change 'post.previous.date' to:
-        => 'post.next.date'
-        
--->{% 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 %}
-      <p><strong>{{this_year}}</stong></p>
-      <p>{{this_month}}</p>
-      <ul>
-    {% endif %}
-  
-    <li><a href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></li>
-  
-    {% if forloop.last %}
-      </ul>
-    {% else %}
-      {% if this_year != next_year %}
-        </ul>
-        <p><strong>{{next_year}}</strong></p>
-        <p><strong>{{next_month}}</strong></p>
-        <ul>
-      {% else %}    
-        {% if this_month != next_month %}
-          </ul>
-          <p><strong>{{next_month}}</strong></p>
-          <ul>
-        {% endif %}
-      {% endif %}
-    {% endif %}
-  {% endfor %}
-{% endif %}
-{% assign posts_collate = nil %}

_includes/JB/setup

@@ -1,22 +0,0 @@
-{% capture jbcache %}
-  <!--
-  - Dynamically set liquid variables for working with URLs/paths
-  -->
-  {% 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 %}

_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 %}
 				<a href="mailto:info+comment@basspistol.com?subject=Regarding the post &quot;{{ page.title }}&quot;!&body=Hey Set! The post on on your site with the title &quot;{{ page.title }}&quot; is wrong/right/good/bad/weird/peanuts/jelly/crazy/" style="text-decoration:none;"><img class="square-image" src="{{ base }}{{ author_name.image_path }}" /></a>
-				<br /><p class="blurb"><a href="mailto:info+comment@basspistol.com?subject=Regarding the post &quot;{{ page.title }}&quot;!&body=Hey Set! The post on on your site with the title &quot;{{ page.title }}&quot; is wrong/right/good/bad/weird/peanuts/jelly/crazy/" style="text-decoration:none;"><strong>{{ author_name.name }}</strong></a><br />{{ author_name.blurb }}</p>
+				<br /><p class="blurb"><a href="mailto:info+comment@basspistol.com?subject=Regarding the post &quot;{{ page.title }}&quot;!&body=Hey Set! The post on on your site with the title &quot;{{ page.title }}&quot; is wrong/right/good/bad/weird/peanuts/jelly/crazy/" style="text-decoration:none;"><strong>{{ author_name.name }}</strong></a><br />{{ author_name.blurb_markup }}</p>
 {% endif %}

_includes/highlightmetahead.html

@@ -53,12 +53,12 @@
   <meta property="og:title" content="{{ page.title }} | {{ site.title }}" />{% if page.description == null %}
   <meta property="og:description" content="{{ site.tagline | strip_html }}" />{% else %}
   <meta property="og:description" content="{{ page.description | strip_html }}" />{% endif %}{% if page.image == null %}
-  <meta property="og:image" content="{{ site.production_url }}/assets/vid/{{ page.poster }}" />{% elsif page.poster == null %}
+  <meta property="og:image" content="{{ site.production_url }}{{ page.poster_image }}" />{% elsif page.poster_image == null %}
   <meta property="og:image" content="{{ site.production_url }}{{ site.banner }}" />
   <meta property="og:image:type" content="image/jpeg" />
   <meta property="og:image:width" content="1024" />
   <meta property="og:image:height" content="1024" /> {% else %}
-  <meta property="og:image" content="{{ site.production_url }}/assets/vid/{{ page.image }}" />{% endif %}
+  <meta property="og:image" content="{{ site.production_url }}{{ page.image }}" />{% endif %}
   <meta property="og:site_name" content="{{ site.title }}" />
   {% for social_id in site.social_ids %}{% assign social = site.social[social_id] %}<meta property="og:see_also" content="{{ social }}" />
   {% endfor %}

_includes/metahead.html

@@ -55,8 +55,8 @@
   <meta property="og:title" content="{{ page.title }} | {{ site.title }}" />{% if page.description == null %}
   <meta property="og:description" content="{{ site.tagline | strip_html }}" />{% else %}
   <meta property="og:description" content="{{ page.description | strip_html }}" />{% endif %}{% if page.image == null %}
-  <meta property="og:image" content="{{ site.production_url }}/assets/vid/{{ page.poster }}" />{% elsif page.category == "highlights" %}
+  <meta property="og:image" content="{{ site.production_url }}{{ page.poster_image }}" />{% elsif page.category == "highlights" %}
-  <meta property="og:image" content="{{ site.production_url }}/assets/img/thumb/{{ page.image }}" />{% else %}
+  <meta property="og:image" content="{{ site.production_url }}{{ page.image }}" />{% else %}
   <meta property="og:image" content="{{ site.production_url }}{{ site.banner }}" />
   <meta property="og:image:type" content="image/jpeg" />
   <meta property="og:image:width" content="1024" />
@@ -72,7 +72,7 @@
   <meta name="twitter:title" content="{{ page.title }} | {{ site.title }}" />{% if page.description == null %}
   <meta name="twitter:description" content="{{ site.tagline | strip_html }}" />{% else %}
   <meta name="twitter:description" content="{{ page.description | strip_html }}" />{% endif %}{% if page.image == null %}
-  <meta name="twitter:image" content="{{ site.production_url }}/assets/vid/{{ page.poster }}" />{% elsif page.category == "highlights" %}
+  <meta name="twitter:image" content="{{ site.production_url }}{{ page.poster_image }}" />{% elsif page.category == "highlights" %}
   <meta name="twitter:image" content="{{ site.production_url }}/assets/img/thumb/{{ page.image }}" />{% else %}
   <meta name="twitter:image" content="{{ site.production_url }}{{ site.banner }}" />{% 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",

_includes/videopageheader.html

@@ -1,5 +1,5 @@
-    <video poster="{{ base }}/assets/vid/{{ page.poster }}" id="bgvid" autoplay playsinline muted loop>
+    <video poster="{{ base }}{{ page.poster_image }}" id="bgvid" autoplay playsinline muted loop>
-       <source src="{{ base }}/assets/vid/{{ page.video }}" type="video/mp4">
+       <source src="{{ base }}{{ page.video_path }}" type="video/mp4">
     </video>
-    <img id="bgpic" src="{{ base }}/assets/vid/{{ page.poster }}" alt="Basspistol" />
+    <img id="bgpic" src="{{ base }}{{ page.poster_image }}" alt="Basspistol" />
     <div id="headline"><h1>~/{{ page.subtitle }}</h1></div>

_posts/_defaults.md

@@ -1,12 +1,12 @@
 ---
 title: ''
+description: ''
 date: ''
 artist: ''
 author: ''
 category: ''
 tags: []
 layout: 
-description: ''
 uid: ''
 image: ''
 download: ''

_staff_members/_defaults.md

@@ -5,5 +5,5 @@ image_path:
 url_staff: 
 email: 
 gpg: 
-blurb:
+blurb_markup:
 ---

_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.'
 ---

about.html

@@ -2,9 +2,8 @@
 title: About The Syndicate
 subtitle: About
 description: 'The Basspistol DNA'
-video: intro_loop_.mp4
+video_path: /assets/vid/intro_loop_.mp4
-poster: intro_loop_.png
+poster_image: /assets/vid/intro_loop_.jpg
-thumb: intro_loop_.png
 layout: default
 ---
 

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
+video_path: /assets/vid/artists.mp4
-poster: artists.jpg
+poster_image: /assets/vid/artists.jpg
-thumb: artists.jpg
 ---
 <!DOCTYPE html>
 <html>

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
+video_path: /assets/vid/discogs.mp4
-poster: discogs.png
+poster_image: /assets/vid/discogs.jpg
-thumb: discogs.png
 ---
 <!DOCTYPE html>
 <html>

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
+video_path: /assets/vid/highlights.mp4
-poster: highlights.png
+poster_image: /assets/vid/highlights.jpg
-thumb: highlights.png
 permalink: /highlights/
 pagination: 
   enabled: true
@@ -40,6 +39,7 @@ pagination:
       {% endfor %}
 
     <!-- Pagination links -->
+    {% if jekyll.environment == 'production' %}
     {% if paginator.total_pages > 1 %}
     <div class="articles">
       <h3>page {{ paginator.page }} of {{ paginator.total_pages }}</h3>
@@ -56,6 +56,7 @@ pagination:
       {% endif %}
     </div>
     {% endif %}
+    {% endif %}
 {% include footer.html %}
     </div>
   </div>

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
+video_path: /assets/vid/intro_loop_.mp4
-poster: intro_loop_.png
+poster_image: /assets/vid/intro_loop_.jpg
-thumb: intro_loop_.png
 ---
 
 <!DOCTYPE html>

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
+video_path: /assets/vid/links.mp4
-poster: links.png
+poster_image: /assets/vid/links.jpg
-thumb: links.png
 ---
 <!DOCTYPE html>
 <html>

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
+video_path: /assets/vid/radio.mp4
-poster: radio.png
+poster_image: /assets/vid/radio.jpg
-thumb: radio.png
 ---
 <!DOCTYPE html>
 <html>

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
+video_path: /assets/vid/intro_loop_.mp4
-poster: intro_loop_.png
+poster_image: /assets/vid/intro_loop_.jpg
-thumb: intro_loop_.png
 permalink: /tags/
 ---
 <!DOCTYPE html>