From 772fd44b4d9f9f1e545b1a69134327d9cfb21931 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Fri, 1 Jan 2021 12:42:14 -0300
Subject: Remove _layouts/page.html, use 'default' layout for pages

---
 _layouts/default.html                 | 8 ++++++--
 _layouts/page.html                    | 6 ------
 _plugins/linter.rb                    | 8 ++++----
 a-propos.md                           | 2 +-
 about.md                              | 2 +-
 aja-par-categorie.md                  | 2 +-
 aja.md                                | 2 +-
 articles-by-category.md               | 2 +-
 articles-par-categorie.md             | 2 +-
 artigos-por-categoria.md              | 2 +-
 artikoloj-lau-kategorio.md            | 2 +-
 diapositives-par-categorie.md         | 2 +-
 diapositives.md                       | 2 +-
 en/index.md                           | 2 +-
 eo/index.md                           | 2 +-
 episodes-de-podcast-par-categorie.md  | 2 +-
 episodios-do-podcast-por-categoria.md | 2 +-
 eslaides-por-categoria.md             | 2 +-
 eslaides.md                           | 2 +-
 fr/index.md                           | 2 +-
 hea-por-categoria.md                  | 2 +-
 hea.md                                | 2 +-
 hml-lau-kategorio.md                  | 2 +-
 hml.md                                | 2 +-
 index.md                              | 2 +-
 lumbildoj-lau-kategorio.md            | 2 +-
 lumbildoj.md                          | 2 +-
 pastebins-by-category.md              | 2 +-
 pastebins-lau-kategorio.md            | 2 +-
 pastebins-par-categorie.md            | 2 +-
 pastebins-por-categoria.md            | 2 +-
 pastebins.en.md                       | 2 +-
 pastebins.eo.md                       | 2 +-
 pastebins.fr.md                       | 2 +-
 pastebins.pt.md                       | 2 +-
 podcast-episodes-by-category.md       | 2 +-
 podcast.en.md                         | 2 +-
 podcast.fr.md                         | 2 +-
 podcast.pt.md                         | 2 +-
 podkastajoj-lau-kategorio.md          | 2 +-
 podkasto.md                           | 2 +-
 pri.md                                | 2 +-
 pt/index.md                           | 2 +-
 screencasts-by-category.md            | 2 +-
 screencasts-lau-kategorio.md          | 2 +-
 screencasts-par-categorie.md          | 2 +-
 screencasts-por-categoria.md          | 2 +-
 screencasts.en.md                     | 2 +-
 screencasts.eo.md                     | 2 +-
 screencasts.fr.md                     | 2 +-
 screencasts.pt.md                     | 2 +-
 slides-by-category.md                 | 2 +-
 slides.md                             | 2 +-
 sobre.md                              | 2 +-
 til-by-category.md                    | 2 +-
 til.md                                | 2 +-
 56 files changed, 63 insertions(+), 65 deletions(-)
 delete mode 100644 _layouts/page.html

diff --git a/_layouts/default.html b/_layouts/default.html
index a553db6..c5bbdfe 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -111,8 +111,12 @@
     </header>
 
     <main>
-      {% if page.title %}<h1>{{ page.title }}</h1>{% endif %}
-      {{ content }}
+      <article>
+        <h1>
+          {{ page.title }}
+        </h1>
+        {{ content }}
+      </article>
     </main>
 
     <footer>
diff --git a/_layouts/page.html b/_layouts/page.html
deleted file mode 100644
index 57116c1..0000000
--- a/_layouts/page.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
----
-<article class="post">
-  {{ content }}
-</article>
diff --git a/_plugins/linter.rb b/_plugins/linter.rb
index 50be99f..919a8bb 100644
--- a/_plugins/linter.rb
+++ b/_plugins/linter.rb
@@ -50,7 +50,7 @@ module Jekyll
     end
 
     COLLECTION_LAYOUTS = {
-      'page' => 'page',
+      'page' => 'default',
       'slides' => 'slides',
       'articles' => 'post',
       'pastebins' => 'post',
@@ -64,8 +64,8 @@ module Jekyll
       lang = assert_field document, 'lang'
       ref = assert_field document, 'ref'
       layout = assert_field document, 'layout'
-      date = document.date.strftime('%Y-%m-%d') unless layout == 'page'
-      slug = layout == 'page' ? ref : assert_field(document, 'slug')
+      date = document.date.strftime('%Y-%m-%d') unless layout == 'default'
+      slug = layout == 'default' ? ref : assert_field(document, 'slug')
       extension = name == 'slides' ? 'slides' : 'md'
 
       unless LANGS.member? lang
@@ -84,7 +84,7 @@ module Jekyll
         end
       end
 
-      unless layout == 'page' then
+      unless layout == 'default' then
         path = "_#{name}/#{date}-#{slug}.#{extension}"
         unless path == document.relative_path then
           raise "date/filename mismatch:\ndate+slug: #{path}\nfilename:  #{document.relative_path}"
diff --git a/a-propos.md b/a-propos.md
index beea3f8..0db4c89 100644
--- a/a-propos.md
+++ b/a-propos.md
@@ -1,6 +1,6 @@
 ---
 
-layout: page
+layout: default
 
 title: À propos
 
diff --git a/about.md b/about.md
index dc27ea0..6e1ad37 100644
--- a/about.md
+++ b/about.md
@@ -1,6 +1,6 @@
 ---
 
-layout: page
+layout: default
 
 title: About
 
diff --git a/aja-par-categorie.md b/aja-par-categorie.md
index 97a9bc2..b11eb56 100644
--- a/aja-par-categorie.md
+++ b/aja-par-categorie.md
@@ -2,7 +2,7 @@
 
 title: AJA par catégorie
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/aja.md b/aja.md
index ecdf085..4526dd4 100644
--- a/aja.md
+++ b/aja.md
@@ -2,7 +2,7 @@
 
 title: Aujourd'hui J'ai Appris
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/articles-by-category.md b/articles-by-category.md
index ee94e79..9666174 100644
--- a/articles-by-category.md
+++ b/articles-by-category.md
@@ -2,7 +2,7 @@
 
 title: Articles by category
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/articles-par-categorie.md b/articles-par-categorie.md
index 41d1a97..28c32a3 100644
--- a/articles-par-categorie.md
+++ b/articles-par-categorie.md
@@ -2,7 +2,7 @@
 
 title: Articles par catégorie
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/artigos-por-categoria.md b/artigos-por-categoria.md
index 138a02d..690c0a6 100644
--- a/artigos-por-categoria.md
+++ b/artigos-por-categoria.md
@@ -2,7 +2,7 @@
 
 title: Artigos por categoria
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/artikoloj-lau-kategorio.md b/artikoloj-lau-kategorio.md
index ca8d518..026395b 100644
--- a/artikoloj-lau-kategorio.md
+++ b/artikoloj-lau-kategorio.md
@@ -2,7 +2,7 @@
 
 title: Artikoloj laŭ kategorio
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/diapositives-par-categorie.md b/diapositives-par-categorie.md
index 88186f6..ff68a4a 100644
--- a/diapositives-par-categorie.md
+++ b/diapositives-par-categorie.md
@@ -2,7 +2,7 @@
 
 title: Diapositives par catégorie
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/diapositives.md b/diapositives.md
index ce83586..f570d26 100644
--- a/diapositives.md
+++ b/diapositives.md
@@ -2,7 +2,7 @@
 
 title: Diapositives
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/en/index.md b/en/index.md
index 3e88743..49f5f19 100644
--- a/en/index.md
+++ b/en/index.md
@@ -2,7 +2,7 @@
 
 title: Blog
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/eo/index.md b/eo/index.md
index 2889890..1499e04 100644
--- a/eo/index.md
+++ b/eo/index.md
@@ -2,7 +2,7 @@
 
 title: Blogo
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/episodes-de-podcast-par-categorie.md b/episodes-de-podcast-par-categorie.md
index ce6f66e..8f13a0e 100644
--- a/episodes-de-podcast-par-categorie.md
+++ b/episodes-de-podcast-par-categorie.md
@@ -2,7 +2,7 @@
 
 title: Épisodes de podcast par catégorie
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/episodios-do-podcast-por-categoria.md b/episodios-do-podcast-por-categoria.md
index 42eceaa..6223b72 100644
--- a/episodios-do-podcast-por-categoria.md
+++ b/episodios-do-podcast-por-categoria.md
@@ -2,7 +2,7 @@
 
 title: Episódios do podcast por categoria
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/eslaides-por-categoria.md b/eslaides-por-categoria.md
index 41aec18..3a28158 100644
--- a/eslaides-por-categoria.md
+++ b/eslaides-por-categoria.md
@@ -2,7 +2,7 @@
 
 title: Eslaides por categoria
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/eslaides.md b/eslaides.md
index 096992e..24d5671 100644
--- a/eslaides.md
+++ b/eslaides.md
@@ -2,7 +2,7 @@
 
 title: Eslaides
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/fr/index.md b/fr/index.md
index 584da33..82260c4 100644
--- a/fr/index.md
+++ b/fr/index.md
@@ -2,7 +2,7 @@
 
 title: Blogue
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/hea-por-categoria.md b/hea-por-categoria.md
index 02ee6c5..5739bc4 100644
--- a/hea-por-categoria.md
+++ b/hea-por-categoria.md
@@ -2,7 +2,7 @@
 
 title: HEA por categoria
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/hea.md b/hea.md
index 230b2f9..69acfe4 100644
--- a/hea.md
+++ b/hea.md
@@ -2,7 +2,7 @@
 
 title: Hoje Eu Aprendi
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/hml-lau-kategorio.md b/hml-lau-kategorio.md
index 81b1068..6ffd079 100644
--- a/hml-lau-kategorio.md
+++ b/hml-lau-kategorio.md
@@ -2,7 +2,7 @@
 
 title: HML laŭ kategorio
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/hml.md b/hml.md
index 2ddeaf0..d6b802d 100644
--- a/hml.md
+++ b/hml.md
@@ -2,7 +2,7 @@
 
 title: Hodiaŭ Mi Lernis
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/index.md b/index.md
index 8aeb264..2836f57 100644
--- a/index.md
+++ b/index.md
@@ -1,6 +1,6 @@
 ---
 title: Blog
-layout: page
+layout: default
 lang: en
 ref: root
 ---
diff --git a/lumbildoj-lau-kategorio.md b/lumbildoj-lau-kategorio.md
index e466554..22be492 100644
--- a/lumbildoj-lau-kategorio.md
+++ b/lumbildoj-lau-kategorio.md
@@ -2,7 +2,7 @@
 
 title: Lumbildoj laŭ kategorio
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/lumbildoj.md b/lumbildoj.md
index a412268..87a48cb 100644
--- a/lumbildoj.md
+++ b/lumbildoj.md
@@ -2,7 +2,7 @@
 
 title: Lumbildoj
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/pastebins-by-category.md b/pastebins-by-category.md
index a425bd9..ed97156 100644
--- a/pastebins-by-category.md
+++ b/pastebins-by-category.md
@@ -2,7 +2,7 @@
 
 title: Pastebins by category
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/pastebins-lau-kategorio.md b/pastebins-lau-kategorio.md
index ef13508..1c52560 100644
--- a/pastebins-lau-kategorio.md
+++ b/pastebins-lau-kategorio.md
@@ -2,7 +2,7 @@
 
 title: Pastebins laŭ kategorio
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/pastebins-par-categorie.md b/pastebins-par-categorie.md
index 97c0b11..dd6440f 100644
--- a/pastebins-par-categorie.md
+++ b/pastebins-par-categorie.md
@@ -2,7 +2,7 @@
 
 title: Pastebins par catégorie
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/pastebins-por-categoria.md b/pastebins-por-categoria.md
index acd5bba..752d629 100644
--- a/pastebins-por-categoria.md
+++ b/pastebins-por-categoria.md
@@ -2,7 +2,7 @@
 
 title: Pastebins por categoria
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/pastebins.en.md b/pastebins.en.md
index 12f85f3..c96eac1 100644
--- a/pastebins.en.md
+++ b/pastebins.en.md
@@ -2,7 +2,7 @@
 
 title: Pastebins
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/pastebins.eo.md b/pastebins.eo.md
index 222b88c..790e18b 100644
--- a/pastebins.eo.md
+++ b/pastebins.eo.md
@@ -2,7 +2,7 @@
 
 title: Pastebins
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/pastebins.fr.md b/pastebins.fr.md
index ce1b6ab..a711f6c 100644
--- a/pastebins.fr.md
+++ b/pastebins.fr.md
@@ -2,7 +2,7 @@
 
 title: Pastebins
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/pastebins.pt.md b/pastebins.pt.md
index c35552a..6f34829 100644
--- a/pastebins.pt.md
+++ b/pastebins.pt.md
@@ -2,7 +2,7 @@
 
 title: Pastebins
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/podcast-episodes-by-category.md b/podcast-episodes-by-category.md
index 4a4931d..28dd013 100644
--- a/podcast-episodes-by-category.md
+++ b/podcast-episodes-by-category.md
@@ -2,7 +2,7 @@
 
 title: Podcast episodes by category
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/podcast.en.md b/podcast.en.md
index b6d5da1..ddd4a23 100644
--- a/podcast.en.md
+++ b/podcast.en.md
@@ -2,7 +2,7 @@
 
 title: Podcast
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/podcast.fr.md b/podcast.fr.md
index 987af2c..f310fc7 100644
--- a/podcast.fr.md
+++ b/podcast.fr.md
@@ -2,7 +2,7 @@
 
 title: Podcast
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/podcast.pt.md b/podcast.pt.md
index 49023cf..17342ca 100644
--- a/podcast.pt.md
+++ b/podcast.pt.md
@@ -2,7 +2,7 @@
 
 title: Podcast
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/podkastajoj-lau-kategorio.md b/podkastajoj-lau-kategorio.md
index cbc9b6e..6c286e4 100644
--- a/podkastajoj-lau-kategorio.md
+++ b/podkastajoj-lau-kategorio.md
@@ -2,7 +2,7 @@
 
 title: Podkastaĵoj laŭ kategorio
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/podkasto.md b/podkasto.md
index e655261..2d46d47 100644
--- a/podkasto.md
+++ b/podkasto.md
@@ -2,7 +2,7 @@
 
 title: Podkasto
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/pri.md b/pri.md
index 79135e2..615f3bf 100644
--- a/pri.md
+++ b/pri.md
@@ -1,6 +1,6 @@
 ---
 
-layout: page
+layout: default
 
 title: Pri
 
diff --git a/pt/index.md b/pt/index.md
index c643a73..28f9029 100644
--- a/pt/index.md
+++ b/pt/index.md
@@ -2,7 +2,7 @@
 
 title: Blog
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/screencasts-by-category.md b/screencasts-by-category.md
index ef0eb4b..5473cc9 100644
--- a/screencasts-by-category.md
+++ b/screencasts-by-category.md
@@ -2,7 +2,7 @@
 
 title: Screencasts by category
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/screencasts-lau-kategorio.md b/screencasts-lau-kategorio.md
index be653ea..6d2893c 100644
--- a/screencasts-lau-kategorio.md
+++ b/screencasts-lau-kategorio.md
@@ -2,7 +2,7 @@
 
 title: Screencasts laŭ kategorio
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/screencasts-par-categorie.md b/screencasts-par-categorie.md
index 3f7b828..96f1bc8 100644
--- a/screencasts-par-categorie.md
+++ b/screencasts-par-categorie.md
@@ -2,7 +2,7 @@
 
 title: Screencasts par catégorie
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/screencasts-por-categoria.md b/screencasts-por-categoria.md
index a830663..43265f4 100644
--- a/screencasts-por-categoria.md
+++ b/screencasts-por-categoria.md
@@ -2,7 +2,7 @@
 
 title: Screencasts por categoria
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/screencasts.en.md b/screencasts.en.md
index 0a11428..4fc58f9 100644
--- a/screencasts.en.md
+++ b/screencasts.en.md
@@ -2,7 +2,7 @@
 
 title: Screencasts
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/screencasts.eo.md b/screencasts.eo.md
index 4d2c030..8b03e6f 100644
--- a/screencasts.eo.md
+++ b/screencasts.eo.md
@@ -2,7 +2,7 @@
 
 title: Screencasts
 
-layout: page
+layout: default
 
 lang: eo
 
diff --git a/screencasts.fr.md b/screencasts.fr.md
index 018f6c5..f5c8498 100644
--- a/screencasts.fr.md
+++ b/screencasts.fr.md
@@ -2,7 +2,7 @@
 
 title: Screencasts
 
-layout: page
+layout: default
 
 lang: fr
 
diff --git a/screencasts.pt.md b/screencasts.pt.md
index 88d0600..64baf2e 100644
--- a/screencasts.pt.md
+++ b/screencasts.pt.md
@@ -2,7 +2,7 @@
 
 title: Screencasts
 
-layout: page
+layout: default
 
 lang: pt
 
diff --git a/slides-by-category.md b/slides-by-category.md
index e950b10..be399b1 100644
--- a/slides-by-category.md
+++ b/slides-by-category.md
@@ -2,7 +2,7 @@
 
 title: Slides by category
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/slides.md b/slides.md
index 22529be..f6de10d 100644
--- a/slides.md
+++ b/slides.md
@@ -2,7 +2,7 @@
 
 title: Slides
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/sobre.md b/sobre.md
index fb831a7..8ca1dbb 100644
--- a/sobre.md
+++ b/sobre.md
@@ -1,6 +1,6 @@
 ---
 
-layout: page
+layout: default
 
 title: Sobre
 
diff --git a/til-by-category.md b/til-by-category.md
index c2b4734..876e91b 100644
--- a/til-by-category.md
+++ b/til-by-category.md
@@ -2,7 +2,7 @@
 
 title: TIL by category
 
-layout: page
+layout: default
 
 lang: en
 
diff --git a/til.md b/til.md
index 68db937..7f7f4d6 100644
--- a/til.md
+++ b/til.md
@@ -2,7 +2,7 @@
 
 title: Today I Learned
 
-layout: page
+layout: default
 
 lang: en
 
-- 
cgit v1.2.3