From 09736fde3c65f78c8d6896e9a171f70dce868ea9 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 28 Dec 2020 09:51:02 -0300
Subject: Merge _layouts/cast.html into _layouts/post.html

---
 _layouts/cast.html                           | 28 ----------------------------
 _layouts/post.html                           | 24 ++++++++++++++++++++++++
 _plugins/linter.rb                           |  6 +++---
 _podcasts/2020-12-19-a-test-entry.md         |  2 +-
 _screencasts/2020-12-24-sample-screencast.md |  2 +-
 5 files changed, 29 insertions(+), 33 deletions(-)
 delete mode 100644 _layouts/cast.html

diff --git a/_layouts/cast.html b/_layouts/cast.html
deleted file mode 100644
index 42ab071..0000000
--- a/_layouts/cast.html
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: post
----
-
-{% if page.audio %}
-  <audio controls>
-    <source src="{% link /resources/podcasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.ogg  %}" type="audio/ogg">
-    <source src="{% link /resources/podcasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.flac %}" type="audio/flac">
-  </audio>
-
-  <div class="torrent-link">
-    {% capture torrent-file %}{{ site.url }}/resources/podcasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.ogg.torrent{% endcapture %}
-    <a href="{{ torrent-file }}">torrent</a>
-    |
-    <a href="/torrent.html?torrent={{ torrent-file | uri_escape }}">online webtorrent</a>
-  </div>
-{% endif %}
-
-{% if page.video %}
-  <div class="torrent-link">
-    {% capture torrent-file %}{{ site.url }}/resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.mkv.torrent{% endcapture %}
-    <a href="{{ torrent-file }}">torrent</a>
-    |
-    <a href="/torrent.html?torrent={{ torrent-file | uri_escape }}">online webtorrent</a>
-  </div>
-{% endif %}
-
-{{ content }}
diff --git a/_layouts/post.html b/_layouts/post.html
index 71e47f3..02f5bcb 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -13,6 +13,30 @@ layout: default
     </section>
   {% endif %}
   <section>
+
+    {% if page.audio %}
+      <audio controls>
+        <source src="{% link /resources/podcasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.ogg  %}" type="audio/ogg">
+        <source src="{% link /resources/podcasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.flac %}" type="audio/flac">
+      </audio>
+
+      <div class="torrent-link">
+        {% capture torrent-file %}{{ site.url }}/resources/podcasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.ogg.torrent{% endcapture %}
+        <a href="{{ torrent-file }}">torrent</a>
+        |
+        <a href="/torrent.html?torrent={{ torrent-file | uri_escape }}">online webtorrent</a>
+      </div>
+    {% endif %}
+
+    {% if page.video %}
+      <div class="torrent-link">
+        {% capture torrent-file %}{{ site.url }}/resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.mkv.torrent{% endcapture %}
+        <a href="{{ torrent-file }}">torrent</a>
+        |
+        <a href="/torrent.html?torrent={{ torrent-file | uri_escape }}">online webtorrent</a>
+      </div>
+    {% endif %}
+
     {{ content }}
   </section>
   <section class="post-footer">
diff --git a/_plugins/linter.rb b/_plugins/linter.rb
index 4db2b5f..c0059c9 100644
--- a/_plugins/linter.rb
+++ b/_plugins/linter.rb
@@ -51,12 +51,12 @@ module Jekyll
 
     COLLECTION_LAYOUTS = {
       'page' => 'page',
+      'slides' => 'slides',
       'articles' => 'post',
       'pastebins' => 'post',
       'tils' => 'post',
-      'slides' => 'slides',
-      'podcasts' => 'cast',
-      'screencasts' => 'cast'
+      'podcasts' => 'post',
+      'screencasts' => 'post'
     }
 
     def assert_frontmatter_fields(name, document)
diff --git a/_podcasts/2020-12-19-a-test-entry.md b/_podcasts/2020-12-19-a-test-entry.md
index 8c7656c..a9235eb 100644
--- a/_podcasts/2020-12-19-a-test-entry.md
+++ b/_podcasts/2020-12-19-a-test-entry.md
@@ -4,7 +4,7 @@ title: A test entry
 
 date: 2020-12-19
 
-layout: cast
+layout: post
 
 lang: en
 
diff --git a/_screencasts/2020-12-24-sample-screencast.md b/_screencasts/2020-12-24-sample-screencast.md
index 56c0316..e5b9b50 100644
--- a/_screencasts/2020-12-24-sample-screencast.md
+++ b/_screencasts/2020-12-24-sample-screencast.md
@@ -4,7 +4,7 @@ title: Sample screencast
 
 date: 2020-12-24
 
-layout: cast
+layout: post
 
 lang: en
 
-- 
cgit v1.2.3