Fix shrine layouts

src/_includes/layouts/asummersend.vto

@@ -1,14 +1,13 @@
 ---
-layout: layouts/base
 sectionName: A Summer’s End — Hong Kong 1986 Shrine
 ---
+{{ layout "layouts/base.vto" }}
 {{- css }}{{ include "../../assets/css/asummersend.css" }}{{- /css }}
 
 {{ set favicon }}
 <link rel="icon" type="image/x-icon" href="/assets/shrines/asummersend/images/favicon.ico">
 {{ /set }}
 
-{{ layout "partials/hero.vto" }}
 {{ set heroImg }}
 <picture>
     <source srcset="/assets/shrines/asummersend/images/asummersend-header-320.avif" media="(orientation: landscape)" />
@@ -53,9 +52,7 @@ function getTodayEvent() {
         return null;
 }
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/navbar.vto" }}
 {{ set navbarLinks }}
 {{ set navPages = collections.all |> eleventyNavigation("A Summer’s End Shrine") }}
 {{- for entry of navPages }}
@@ -64,9 +61,9 @@ function getTodayEvent() {
 </li>
 {{ /for }}
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/shrineinfo.vto" }}
+{{ content }}
+
 {{ set shrineAbout }}
 <p>Welcome to {{ sitemeta.siteAuthor.name }}'s shrine for {{ cite "A Summer’s End — Hong Kong 1986" }}, an indie visual novel developed by Oracle and Bone. Set in 1980s Hong Kong, it tells of a love story between two women.</p>
 {{ /set }}
@@ -77,9 +74,7 @@ function getTodayEvent() {
 <li><a href="https://store.steampowered.com/app/1111370/A_Summers_End__Hong_Kong_1986/">Steam</a></li>
 <li><a href="https://oracleandbone.itch.io/a-summers-end">itch.io</a></li>
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/footer.vto" }}
 {{ set footerContent }}
 <p>Made with ♥ by {{ sitemeta.siteAuthor.name }} • Shrine Launched: 16 February 2023</p>
 {{ /set }}

src/_includes/layouts/cassettebeasts.vto

@@ -1,14 +1,13 @@
 ---
-layout: layouts/base
 sectionName: Cassette Beasts Shrine
 ---
+{{ layout "layouts/base.vto" }}
 {{- css }}{{ include "../../assets/css/cassettebeasts.css" }}{{- /css }}
 
 {{ set favicon }}
 <link rel="icon" type="image/x-icon" href="/assets/shrines/cassettebeasts/images/favicon.ico">
 {{ /set }}
 
-{{ layout "partials/hero.vto" }}
 {{ set heroImg }}
 <picture>
     <source srcset="/assets/shrines/cassettebeasts/images/cassettebeasts-header-320.avif" media="(orientation: landscape)" />
@@ -47,9 +46,7 @@ function getTodayEvent() {
         return null;
 }
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/navbar.vto" }}
 {{ set shrineHomeUrl = "/shrines/cassettebeasts/" }}
 
 {{ set navbarLinks }}
@@ -60,9 +57,9 @@ function getTodayEvent() {
 </li>
 {{ /for }}
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/shrineinfo.vto" }}
+{{ content }}
+
 {{ set shrineAbout }}
 <p>Welcome to {{ sitemeta.siteAuthor.name }}'s shrine for {{ cite "Cassette Beasts" }}, an indie monster collecting turn-based open-world role-playing video game developed by Bytten Studio and published by Raw Fury.</p>
 {{ /set }}
@@ -75,9 +72,7 @@ function getTodayEvent() {
 <li><a href="https://bytten-studio.com/">Bytten Studio</a></li>
 <li><a href="https://fan.leilukin.com/cassettebeasts/">Cassette Beasts fanlisting</a></li>
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/footer.vto" }}
 {{ set footerContent }}
 <p>Made with ♥ by {{ sitemeta.siteAuthor.name }} • Shrine Launched: 3 August 2023</p>
 {{ /set }}

src/_includes/layouts/pokemonoras.vto

@@ -1,14 +1,13 @@
 ---
-layout: layouts/base
 sectionName: Pokémon Omega Ruby and Alpha Sapphire Shrine
 ---
+{{ layout "layouts/base.vto" }}
 {{- css }}{{ include "../../assets/css/pokemonoras.css" }}{{- /css }}
 
 {{ set favicon }}
 <link rel="icon" type="image/x-icon" href="/assets/shrines/pokemonoras/images/favicon.ico">
 {{ /set }}
 
-{{ layout "partials/hero.vto" }}
 {{ set heroImg }}
 <picture>
     <source srcset="/assets/shrines/pokemonoras/images/pokemonoras-header-320.avif" media="(orientation: landscape)" />
@@ -41,9 +40,7 @@ function getTodayEvent() {
         return null;
 }
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/navbar.vto" }}
 {{ set shrineHomeUrl = "/shrines/pokemonoras/" }}
 
 {{ set navbarLinks }}
@@ -54,9 +51,9 @@ function getTodayEvent() {
 </li>
 {{ /for }}
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/shrineinfo.vto" }}
+{{ content }}
+
 {{ set shrineAbout }}
 <p>Welcome to {{ sitemeta.siteAuthor.name }}'s shrine for {{ cite "Pokémon Omega Ruby and Alpha Sapphire" }}, remakes of the 2002 Game Boy Advance role-playing video games {{ cite "Pokémon Ruby" }} and {{ cite "Pokémon Sapphire" }}. The games are part of the sixth generation of the {{ cite "Pokémon" }} main series of video games, developed by Game Freak and published by The Pokémon Company and Nintendo for the Nintendo 3DS.</p>
 {{ /set }}
@@ -65,9 +62,7 @@ function getTodayEvent() {
 <li><a href="https://bulbapedia.bulbagarden.net/wiki/Pok%C3%A9mon_Omega_Ruby_and_Alpha_Sapphire">Bulbapedia</a></li>
 <li><a href="https://pkmn.redcrown.net/hoenn/"><cite>Pokémon Ruby</cite>, <cite>Sapphire</cite>, <cite>Omega Ruby</cite> and <cite>Alpha Sapphire</cite> fanlisting</a></li>
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/footer.vto" }}
 {{ set footerContent }}
 <p>Made with ♥ by {{ sitemeta.siteAuthor.name }} • Shrine Launched: 21 November 2024</p>
 {{ /set }}

src/_includes/layouts/starwarskotor.vto

@@ -1,14 +1,13 @@
 ---
-layout: layouts/base
 sectionName: "Star Wars: Knights of the Old Republic Shrine" 
 ---
+{{ layout "layouts/base.vto" }}
 {{- css }}{{ include "../../assets/css/starwarskotor.css" }}{{- /css }}
 
 {{ set favicon }}
 <link rel="icon" type="image/x-icon" href="/assets/shrines/starwarskotor/images/favicon.ico">
 {{ /set }}
 
-{{ layout "partials/hero.vto" }}
 {{ set heroImg }}
 <picture>
     <source srcset="/assets/shrines/starwarskotor/images/swkotor-header-320.avif" media="(orientation: landscape)" />
@@ -47,9 +46,7 @@ function getTodayEvent() {
         return null;
 }
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/navbar.vto" }}
 {{ set shrineHomeUrl = "/shrines/starwarskotor/" }}
 
 {{ set navbarLinks }}
@@ -60,9 +57,9 @@ function getTodayEvent() {
 </li>
 {{ /for }}
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/shrineinfo.vto" }}
+{{ content }}
+
 {{ set shrineAbout }}
 <p>Welcome to {{ sitemeta.siteAuthor.name }}'s shrine for {{ cite "Star Wars: Knights of the Old Republic" }}, a series of role-playing video games set in the {{ cite "Star Wars" }} universe, taking place almost 4,000 years before the events of the Skywalker film saga.</p>
 {{ /set }}
@@ -72,9 +69,7 @@ function getTodayEvent() {
 <li><a href="https://glitterskies.org/kotor/"><cite>Star Wars: KotOR</cite> fanlisting</a></li>
 <li><a href="https://glitterskies.org/kotor2/"><cite>Star Wars: KotOR II</cite> fanlisting</a></li>
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/footer.vto" }}
 {{ set footerContent }}
 <p>Made with ♥ and the Force by {{ sitemeta.siteAuthor.name }} • Shrine Launched: 17 February 2023</p>
 {{ /set }}

src/_includes/partials/content.vto

@@ -81,7 +81,9 @@
     {{ include "partials/content-nav.vto" }}
     {{ /if }}
 
-    {{ shrineInfo }}
+    {{ if tags && tags.includes("shrine pages") }}
+    {{ include "partials/shrineinfo.vto" }}
+    {{ /if }}
 </content-wrapper>
 
 {{- css }}