From afb998739768e885d2ba730296c31701d5840c4a Mon Sep 17 00:00:00 2001
From: Friedel Wolff <friedel.wolff@nwu.ac.za>
Date: Thu, 12 Sep 2024 14:51:13 +0200
Subject: [PATCH 1/3] Mark up telephone number as a tag

---
 app/templates/app/contact.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/app/contact.html b/app/templates/app/contact.html
index c4faafd8..3cec35ba 100644
--- a/app/templates/app/contact.html
+++ b/app/templates/app/contact.html
@@ -18,7 +18,7 @@ <h2 class="fs-4">{% trans "Contact details for more information" %}</h2>
                         South Africa
                     {% endblocktrans %}
                 </p>
-                <p>+27 18 285 2750</p>
+                <p><a href="tel:+27182852750">+27 (0)18 285-2750</a></p>
                 <p><a href="mailto:info@sadilar.org">info@sadilar.org</a></p>
             </div>
 

From 8f3a0febc69206afd394d1ba87c7b57bf3378e01 Mon Sep 17 00:00:00 2001
From: Friedel Wolff <friedel.wolff@nwu.ac.za>
Date: Thu, 12 Sep 2024 14:53:47 +0200
Subject: [PATCH 2/3] Remove unnecessary final slash in self-closing tags

Although not invalid, it makes it easier to make a mistake with
unquoted attributes before, and is plainly not needed in HTML5.
---
 app/templates/admin/base_site.html | 2 +-
 app/templates/app/home.html        | 2 +-
 app/templates/app/search.html      | 4 ++--
 app/templates/base.html            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/templates/admin/base_site.html b/app/templates/admin/base_site.html
index 2f980435..ad9b5160 100644
--- a/app/templates/admin/base_site.html
+++ b/app/templates/admin/base_site.html
@@ -19,7 +19,7 @@
 {% block extrastyle %}
   <link rel="stylesheet" href="{% static 'css/admin.css' %}">
   <link rel="stylesheet" href="{% static 'css/dark_mode_override.css' %}">
-  <link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32" />
+  <link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32">
 {% endblock %}
 
 {% block branding %}
diff --git a/app/templates/app/home.html b/app/templates/app/home.html
index 5bc37c90..bccd5ade 100644
--- a/app/templates/app/home.html
+++ b/app/templates/app/home.html
@@ -46,7 +46,7 @@ <h2 class="fs-3 card-title">{% trans "Search" %}</h2>
            <form method="get" action="{% url 'search' %}">
                <input type="search" name="search" placeholder="{% trans 'Search term...' %}"
                       class="form-control search-input">
-               <input type="submit" value="{% trans 'Search' %}" class="btn btn-primary mt-2"/>
+               <input type="submit" value="{% trans 'Search' %}" class="btn btn-primary mt-2">
            </form>
            </p>
        </div>
diff --git a/app/templates/app/search.html b/app/templates/app/search.html
index 304d38da..c3ba9eb6 100644
--- a/app/templates/app/search.html
+++ b/app/templates/app/search.html
@@ -34,7 +34,7 @@ <h2 class="fs-5 card-title mt-2">{% trans "Search a term" %}</h2>
                            value="{{ request.GET.search }}">
                 </div>
                 <div class="col-auto">
-                    <input type="submit" class="btn btn-primary me-4"/>
+                    <input type="submit" class="btn btn-primary me-4">
                     <a href="{% url 'search' %}" hx-target="#main" hx-select="#main" class="btn btn-secondary">{% trans 'Reset' %}</a>
                 </div>
                 {% if page_obj.paginator.num_pages > 1 %}
@@ -111,7 +111,7 @@ <h2 id="filter-heading" class="fs-5 card-title">{% trans "Filters" %}</h2>
                     <a href="#search" class="d-md-none">{% trans "Alter search terms above" %}</a>
                 </div>
             </div>
-            <input type="submit" class="btn btn-primary me-4"/>
+            <input type="submit" class="btn btn-primary me-4">
             <a href="{% url 'search' %}" hx-target="#main" hx-select="#main" class="btn btn-secondary">{% trans 'Reset' %}</a>
         </section>
         {% endif %}
diff --git a/app/templates/base.html b/app/templates/base.html
index 2ddb0736..a2864648 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -7,11 +7,11 @@
 <head>
     <title>{% block title %}{% trans "SADiLaR" %}{% endblock %}</title>
     <meta name="description" content="{% block description %}{% trans 'Terminology and other language resources' %}{% endblock %}">
-    <meta name="keywords" content="{% block keywords %}{% trans 'language, terminology' %}{% endblock %}"/>
+    <meta name="keywords" content="{% block keywords %}{% trans 'language, terminology' %}{% endblock %}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" integrity="sha256-9kPW/n5nn53j4WMRYAxe9c1rCY96Oogo/MKSVdKzPmI=" crossorigin="anonymous">
-    <link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32" />
+    <link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32">
     {# htmx JS at the end of body seems to create problems when navigating through browser history #}
     <script src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.2/dist/htmx.min.js" integrity="sha256-4XRtl1nsDUPFwoRFIzOjELtf1yheusSy3Jv0TXK1qIc=" crossorigin="anonymous"></script>
     <meta name="htmx-config" content='{% include "app/htmx-config.json" %}'>

From c484fdd1d334adc65f1fd2cf63fa790a206f0b3e Mon Sep 17 00:00:00 2001
From: Friedel Wolff <friedel.wolff@nwu.ac.za>
Date: Thu, 12 Sep 2024 14:54:20 +0200
Subject: [PATCH 3/3] Fix invalid <form> in <p>

Block-level elements are not allowed in a p tag.
---
 app/templates/app/home.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/templates/app/home.html b/app/templates/app/home.html
index bccd5ade..f3001621 100644
--- a/app/templates/app/home.html
+++ b/app/templates/app/home.html
@@ -42,13 +42,11 @@ <h2 class="fs-3 card-title">{% trans "Search" %}</h2>
                    This platforms hosts terminology and other useful language resources.
                {% endblocktrans %}
            </p>
-           <p>
            <form method="get" action="{% url 'search' %}">
                <input type="search" name="search" placeholder="{% trans 'Search term...' %}"
                       class="form-control search-input">
                <input type="submit" value="{% trans 'Search' %}" class="btn btn-primary mt-2">
            </form>
-           </p>
        </div>
    </div>
 </section>