Merge branch 'master' into content-setto

_config.yml

@@ -44,7 +44,7 @@ categories:
 
 collections:
   albums:
-    output: true
+    output: false
     permalink: /albums/:name/
   tracks:
     output: true

_layouts/track.html

@@ -76,8 +76,11 @@ layout: default
     </div>
   </div>
 </section>
-
+{% for post in site.posts %}
+{% if post.album == page.albumSlug %}
 {% include streamer.html %}
+{% endif %}
+{% endfor %}
 <!-- Page navigation -->
 <section class="wrapper style1 align-center">
   <div class="inner">

discography.html

@@ -36,9 +36,9 @@ image: /images/pages/jack-hamilton-CMnNiQBkwBI-unsplash.jpg
 
 </section>
 
-{% assign sorted = site.albums | sort: 'date' | reverse %}
+{% assign sorted = site.posts | sort: 'date' | reverse %}
 {% for album in sorted %}
-
+{% if album.category == 'releases' %}
 <section class="spotlight style4 orient-{% cycle 'left', 'right' %} content-align-left image-position-center onscroll-image-fade-in" {% if forloop.index == 1 %}style="box-shadow: none;" {% endif %}>
   <div class="content">
     <h1>{{ album.title }}</h1>
@@ -66,11 +66,11 @@ image: /images/pages/jack-hamilton-CMnNiQBkwBI-unsplash.jpg
   </div>
 
   <div class="image">
-    <img src="{{ site.mediaurl }}/{{ album.slug }}/{{ album.tracks[0].trackSlug }}.jpeg" alt="{{ album.title }}" title="{{ album.title }}" />
+    <img src="{{ album.image }}" alt="{{ album.title }}" title="{{ album.title }}" />
 
   </div>
 </section>
-
+{% endif %}
 {% endfor %}
 
 {% include streamer.html %}

index.html

@@ -43,7 +43,7 @@ logo_image: /siteicon.png
   </div>
 </section>
 
-{% for post in site.posts limit: '2' %}
+{% for post in site.posts limit: '1' %}
 
 <section
   class="section-shadow banner style1 orient-{% cycle 'left', 'right' %} content-align-{% cycle 'right', 'left' %} image-position-center fullscreen onload-image-fade-in onload-content-fade-right">
@@ -102,9 +102,9 @@ logo_image: /siteicon.png
 </section>
 
 
-{% assign sorted = site.albums | sort: 'date' | reverse %}
-{% for album in sorted %}
-
+{% assign sorted = site.posts | sort: 'date' | reverse %}
+{% for album in sorted | offset: '1' %}
+{% if album.category == 'releases' %}
 <section
   class="spotlight style5 orient-{% cycle 'left', 'right' %} content-align-{% cycle 'right', 'left' %} image-position-center onscroll-image-fade-in"
   {% if forloop.index == 1 %}style="box-shadow: none;" {% endif %}>
@@ -119,12 +119,12 @@ logo_image: /siteicon.png
     </ul>
   </div>
   <div class="image">
-    <img src="{{ site.mediaurl }}/{{ album.slug }}/{{ album.tracks[0].trackSlug }}.jpeg"
+    <img src="{{ album.image }}"
       alt="{{ album.title | smartify }}" />
   </div>
 
 </section>
-
+{% endif %}
 {% endfor %}
 
 <!-- END Release -->