From 538dc0bd8048dfeb389325f2145a0acd22692ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Wed, 28 Dec 2022 23:36:46 +0100
Subject: [PATCH] Add page title in html

---
 ram/portal/templates/base.html      |  6 ++++--
 ram/portal/templates/companies.html |  3 ---
 ram/portal/templates/consist.html   |  1 -
 ram/portal/templates/consists.html  |  3 ---
 ram/portal/templates/flatpage.html  |  1 -
 ram/portal/templates/home.html      |  1 -
 ram/portal/templates/page.html      |  1 -
 ram/portal/templates/scales.html    |  3 ---
 ram/portal/templates/search.html    |  1 -
 ram/portal/views.py                 | 32 ++++++++++++++++++++++-------
 10 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index c5ccca5..9a64637 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -12,7 +12,7 @@
     <meta name="description" content="{{ site_conf.about}}">
     <meta name="author" content="{{ site_conf.site_author }}">
     <meta name="generator" content="Django Framework">
-    <title>{{ site_conf.site_name }}</title>
+    <title>{% block title %}{{ title }}{% endblock %} - {{ site_conf.site_name }}</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap-dark-5@1.1.3/dist/css/bootstrap-nightshade.min.css" rel="stylesheet">
     <link href="{% static "css/main.css" %}" rel="stylesheet">
     <link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
@@ -81,7 +81,9 @@
       <section class="py-4 text-center container">
         <div class="row">
           <div class="mx-auto">
-            {% block header %}{% endblock %}
+            <h1 class="fw-light">{{ title }}</h1>
+            {% block header %}
+            {% endblock %}
           </div>
         </div>
       </section>
diff --git a/ram/portal/templates/companies.html b/ram/portal/templates/companies.html
index 09bfedc..3c82828 100644
--- a/ram/portal/templates/companies.html
+++ b/ram/portal/templates/companies.html
@@ -1,8 +1,5 @@
 {% extends "base.html" %}
 
-      {% block header %}
-        <h1 class="fw-light">Companies</h1>
-      {% endblock %}
       {% block cards %}
       {% for c in company %}
       <div class="col">
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 96a5624..1e763b0 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
       {% block header %}
-      <h1 class="fw-light">{{ consist }}</h1>
       {% if consist.tags.all %}
       <p><small>Tags:</small>
         {% for t in consist.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html
index 04b803d..c3850b4 100644
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -1,8 +1,5 @@
 {% extends "base.html" %}
 
-      {% block header %}
-        <h1 class="fw-light">Consists</h1>
-      {% endblock %}
       {% block cards %}
       {% for c in consist %}
       <div class="col">
diff --git a/ram/portal/templates/flatpage.html b/ram/portal/templates/flatpage.html
index 184f88a..001e68a 100644
--- a/ram/portal/templates/flatpage.html
+++ b/ram/portal/templates/flatpage.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 
         {% block header %}
-        <h1 class="fw-light">{{ flatpage.name }}</h1>
         <small class="text-muted">Updated {{ flatpage.updated_time | date:"M d, Y H:i" }}</small>
         {% endblock %}
         {% block extra_content %}
diff --git a/ram/portal/templates/home.html b/ram/portal/templates/home.html
index 56f8e5e..bc1746a 100644
--- a/ram/portal/templates/home.html
+++ b/ram/portal/templates/home.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
       {% block header %}
-        {% if site_conf.about %}<h1 class="fw-light">About</h1>{% endif %}
         <p class="lead text-muted">{{ site_conf.about | safe }}</p>
       {% endblock %}
 
diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html
index 02b8307..b99e70c 100644
--- a/ram/portal/templates/page.html
+++ b/ram/portal/templates/page.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 
         {% block header %}
-        <h1 class="fw-light">{{ rolling_stock }}</h1>
         {% if rolling_stock.tags.all %}
         <p><small>Tags:</small>
           {% for t in rolling_stock.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
diff --git a/ram/portal/templates/scales.html b/ram/portal/templates/scales.html
index ec6596b..1d18b3c 100644
--- a/ram/portal/templates/scales.html
+++ b/ram/portal/templates/scales.html
@@ -1,8 +1,5 @@
 {% extends "base.html" %}
 
-      {% block header %}
-        <h1 class="fw-light">Scales</h1>
-      {% endblock %}
       {% block cards %}
       {% for s in scale %}
       <div class="col">
diff --git a/ram/portal/templates/search.html b/ram/portal/templates/search.html
index eb66adc..6bcf633 100644
--- a/ram/portal/templates/search.html
+++ b/ram/portal/templates/search.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
       {% block header %}
-        <h1 class="fw-light">{{ filter | default_if_none:"Search" | title }}: {{ search }}</h1>
         <p class="lead text-muted">Results found: {{ matches }}</p>
       {% endblock %}
       {% block pagination %}
diff --git a/ram/portal/views.py b/ram/portal/views.py
index a37177e..e845983 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -46,7 +46,11 @@ class GetHome(View):
         return render(
             request,
             "home.html",
-            {"rolling_stock": rolling_stock, "page_range": page_range},
+            {
+                "title": "Home",
+                "rolling_stock": rolling_stock,
+                "page_range": page_range,
+            },
         )
 
 
@@ -83,8 +87,10 @@ class GetHomeFiltered(View):
             query = Q(tags__slug__iexact=search)
         else:
             raise Http404
-        rolling_stock = RollingStock.objects.filter(query).distinct().order_by(
-            *order_by_fields()
+        rolling_stock = (
+            RollingStock.objects.filter(query)
+            .distinct()
+            .order_by(*order_by_fields())
         )
         matches = len(rolling_stock)
 
@@ -105,6 +111,7 @@ class GetHomeFiltered(View):
             request,
             "search.html",
             {
+                "title": "{0}: {1}".format(_filter.capitalize(), search),
                 "search": search,
                 "filter": _filter,
                 "matches": matches,
@@ -125,6 +132,7 @@ class GetHomeFiltered(View):
             request,
             "search.html",
             {
+                "title": "{0}: {1}".format(_filter.capitalize(), search),
                 "search": search,
                 "filter": _filter,
                 "matches": matches,
@@ -164,6 +172,7 @@ class GetRollingStock(View):
             request,
             "page.html",
             {
+                "title": rolling_stock,
                 "rolling_stock": rolling_stock,
                 "class_properties": class_properties,
                 "rolling_stock_properties": rolling_stock_properties,
@@ -186,7 +195,11 @@ class Consists(View):
         return render(
             request,
             "consists.html",
-            {"consist": consist, "page_range": page_range},
+            {
+                "title": "Consists",
+                "consist": consist,
+                "page_range": page_range,
+            },
         )
 
 
@@ -209,6 +222,7 @@ class GetConsist(View):
             request,
             "consist.html",
             {
+                "title": consist,
                 "consist": consist,
                 "rolling_stock": rolling_stock,
                 "page_range": page_range,
@@ -230,7 +244,11 @@ class Companies(View):
         return render(
             request,
             "companies.html",
-            {"company": company, "page_range": page_range},
+            {
+                "title": "Companies",
+                "company": company,
+                "page_range": page_range,
+            },
         )
 
 
@@ -248,7 +266,7 @@ class Scales(View):
         return render(
             request,
             "scales.html",
-            {"scale": scale, "page_range": page_range},
+            {"title": "Scales", "scale": scale, "page_range": page_range},
         )
 
 
@@ -264,5 +282,5 @@ class GetFlatpage(View):
         return render(
             request,
             "flatpage.html",
-            {"flatpage": flatpage},
+            {"title": flatpage.name, "flatpage": flatpage},
         )