From c78bd0c85bbfde7ac6241fbfe40d6f2dbaf32add Mon Sep 17 00:00:00 2001
From: Lucas <lucas@domain.invalid>
Date: Fri, 24 Mar 2023 13:58:39 +0000
Subject: [PATCH] backend: move all header and pager display out of layout

---
 templates/exception.html.ep    | 1 +
 templates/gallery.html.ep      | 3 +++
 templates/layouts/main.html.ep | 6 ------
 templates/media.html.ep        | 4 +++-
 templates/not_found.html.ep    | 1 +
 templates/tags.html.ep         | 3 +++
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/templates/exception.html.ep b/templates/exception.html.ep
index d90acf5..930483b 100644
--- a/templates/exception.html.ep
+++ b/templates/exception.html.ep
@@ -1,2 +1,3 @@
 % layout "main";
 % title "Error";
+<h1><%= title %></h1>
diff --git a/templates/gallery.html.ep b/templates/gallery.html.ep
index c3d2f59..770ed3c 100644
--- a/templates/gallery.html.ep
+++ b/templates/gallery.html.ep
@@ -1,4 +1,5 @@
 % layout "main";
+<h1><%= title %></h1>
 
 <div class="flex-c-horizontal flex-c-wrap gallery">
 % for my $m ($media->@*) {
@@ -7,3 +8,5 @@
   <% end %>
 % }
 </div>
+
+%= include "_pager";
diff --git a/templates/layouts/main.html.ep b/templates/layouts/main.html.ep
index 2b9d4c0..8a46b70 100644
--- a/templates/layouts/main.html.ep
+++ b/templates/layouts/main.html.ep
@@ -18,13 +18,7 @@
   </header>
   <main class="flex-i-fullsize flex-c-vertical">
     <div class="viewport flex-i-fullsize flex-c-vertical">
-% if (defined title) {
-      <h1><%= title %></h1>
-% }
-      <div class="flex-i-fullsize">
 %= content 
-      </div>
-%= include "_pager"
     </div>
   </main>
   <footer class="border-top">
diff --git a/templates/media.html.ep b/templates/media.html.ep
index 9fb1f28..1331167 100644
--- a/templates/media.html.ep
+++ b/templates/media.html.ep
@@ -19,6 +19,8 @@
 % } else {
   <dd><%= c($media->{tags}->@*)
     ->map(sub { link_to $_ => url_for("tag_show", tag_id_or_name => $_) })
-    ->join(", ") %>.</dd>
+    ->join(", ") %></dd>
 % }
 </dl>
+
+%= include "_pager";
diff --git a/templates/not_found.html.ep b/templates/not_found.html.ep
index 145b06d..7a4bf6c 100644
--- a/templates/not_found.html.ep
+++ b/templates/not_found.html.ep
@@ -1,2 +1,3 @@
 % layout "main";
 % title "Not Found";
+<h1><%= title %></h1>
diff --git a/templates/tags.html.ep b/templates/tags.html.ep
index 0f290c5..96d85d4 100644
--- a/templates/tags.html.ep
+++ b/templates/tags.html.ep
@@ -1,7 +1,10 @@
 % layout "main";
+<h1><%= title %></h1>
 
 <p class="text-center">
 % for my $t ($tags->@*) {
   <%= link_to $t->{name} => $t->{uri} %>(<%= $t->{count} %>)
 % }
 </p>
+
+%= include "_pager";