From 5c6ca3bd2fdb6310282f0d59f07f8d5291a1e9de Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 10 Jan 2022 08:35:25 +0100
Subject: [PATCH] templates: include parent head block

Among other things, this ensures that the robots meta tag is present for
unlisted repositories.
---
 gitsrht/templates/blame.html          | 2 +-
 gitsrht/templates/blob.html           | 2 +-
 gitsrht/templates/log.html            | 2 +-
 gitsrht/templates/refs.html           | 2 +-
 gitsrht/templates/repo.html           | 2 ++
 gitsrht/templates/send-email-end.html | 2 +-
 gitsrht/templates/send-email.html     | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gitsrht/templates/blame.html b/gitsrht/templates/blame.html
index 9c5046f..35fa71b 100644
--- a/gitsrht/templates/blame.html
+++ b/gitsrht/templates/blame.html
@@ -3,7 +3,7 @@
 {% block title %}
 <title>{{repo.owner.canonical_name}}/{{repo.name}}: {{path_join(*path)}} blame - {{cfg("sr.ht", "site-name")}} git</title>
 {% endblock %}
-{% block head %}
+{% block repohead %}
 <style>
 pre {
   tab-size: {{editorconfig.tab_width()}}
diff --git a/gitsrht/templates/blob.html b/gitsrht/templates/blob.html
index 4b3924a..c838f61 100644
--- a/gitsrht/templates/blob.html
+++ b/gitsrht/templates/blob.html
@@ -3,7 +3,7 @@
 {% block title %}
 <title>{{repo.owner.canonical_name}}/{{repo.name}}: {{path_join(*path)}} - {{cfg("sr.ht", "site-name")}} git</title>
 {% endblock %}
-{% block head %}
+{% block repohead %}
 <style>
 pre {
   tab-size: {{editorconfig.tab_width()}}
diff --git a/gitsrht/templates/log.html b/gitsrht/templates/log.html
index 4f94073..5ede399 100644
--- a/gitsrht/templates/log.html
+++ b/gitsrht/templates/log.html
@@ -4,7 +4,7 @@
 <title>{{repo.owner.canonical_name}}/{{repo.name}}: {% if path != [''] %}{{path_join(*path)}} {% endif %}{{ ref.decode("utf-8", "replace") }} - {{cfg("sr.ht", "site-name")}} git</title>
 {% endblock %}
 
-{% block head %}
+{% block repohead %}
   <link rel="alternate"
     title="{{ repo.owner.canonical_name }}/{{ repo.name }}: {{ ref.decode('utf-8', 'replace') }} log"
     type="application/rss+xml"
diff --git a/gitsrht/templates/refs.html b/gitsrht/templates/refs.html
index f5ec98f..2deae85 100644
--- a/gitsrht/templates/refs.html
+++ b/gitsrht/templates/refs.html
@@ -4,7 +4,7 @@
 <title>{{repo.owner.canonical_name}}/{{repo.name}} refs - {{cfg("sr.ht", "site-name")}} git</title>
 {% endblock %}
 
-{% block head %}
+{% block repohead %}
   <link rel="alternate"
     title="{{ repo.owner.canonical_name }}/{{ repo.name }} refs"
     type="application/rss+xml"
diff --git a/gitsrht/templates/repo.html b/gitsrht/templates/repo.html
index 847ae83..2a6edc7 100644
--- a/gitsrht/templates/repo.html
+++ b/gitsrht/templates/repo.html
@@ -1,5 +1,7 @@
 {% extends "layout.html" %}
 {% block head %}
+{% block repohead %}
+{% endblock %}
 {% if repo.visibility.value =='unlisted' %}
 <meta name="robots" content="noindex">
 {% endif %}
diff --git a/gitsrht/templates/send-email-end.html b/gitsrht/templates/send-email-end.html
index d69da74..7e77f8b 100644
--- a/gitsrht/templates/send-email-end.html
+++ b/gitsrht/templates/send-email-end.html
@@ -133,7 +133,7 @@
 </form>
 {% endblock %}
 
-{% block head %}
+{% block repohead %}
 <style>
   .commit-diff {
     display: none;
diff --git a/gitsrht/templates/send-email.html b/gitsrht/templates/send-email.html
index 77eafd1..9e498de 100644
--- a/gitsrht/templates/send-email.html
+++ b/gitsrht/templates/send-email.html
@@ -120,7 +120,7 @@
 </form>
 {% endblock %}
 
-{% block head %}
+{% block repohead %}
 <style>
   .event-list.commit-list, .form-controls {
     display: none;
-- 
2.38.4