From 5ebce9480e8726bc20924767a2b30e3a95103a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Thu, 21 Sep 2023 22:22:06 +0200
Subject: [PATCH] Cleanup html tags

---
 ram/portal/templates/base.html            | 8 ++++----
 ram/portal/templates/companies.html       | 2 +-
 ram/portal/templates/consist.html         | 2 +-
 ram/portal/templates/consists.html        | 2 +-
 ram/portal/templates/filter.html          | 2 +-
 ram/portal/templates/includes/footer.html | 2 +-
 ram/portal/templates/manufacturers.html   | 2 +-
 ram/portal/templates/roster.html          | 2 +-
 ram/portal/templates/scales.html          | 2 +-
 ram/portal/templates/search.html          | 2 +-
 ram/portal/templates/types.html           | 2 +-
 ram/ram/__init__.py                       | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index 0798e97..cd6a262 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -149,10 +149,10 @@
             <div class="navbar-collapse" id="navbarSupportedContent">
               <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                 <li class="nav-item dropdown">
-                  <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                  <a class="nav-link dropdown-toggle" href="#" id="rosterDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                     Roster
                   </a>
-                  <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                  <ul class="dropdown-menu" aria-labelledby="rosterDropdownMenu">
                     <li><a class="dropdown-item" href="{% url 'roster' %}">Rolling stock</a></li>
                     <li><a class="dropdown-item" href="{% url 'companies' %}">Companies</a></li>
                     <li><a class="dropdown-item" href="{% url 'types' %}">Types</a></li>
@@ -163,10 +163,10 @@
                   <a class="nav-link" href="{% url 'consists' %}">Consists</a>
                 </li>
                 <li class="nav-item dropdown">
-                  <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                  <a class="nav-link dropdown-toggle" href="#" id="manufacturersDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                     Manufacturers
                   </a>
-                  <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                  <ul class="dropdown-menu" aria-labelledby="manufacturersDropdownMenu">
                     <li><a class="dropdown-item" href="{% url 'manufacturers' category='model' %}">Models</a></li>
                     <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Real</a></li>
                   </ul>
diff --git a/ram/portal/templates/companies.html b/ram/portal/templates/companies.html
index b7fd706..89a0d98 100644
--- a/ram/portal/templates/companies.html
+++ b/ram/portal/templates/companies.html
@@ -66,7 +66,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index c5fce90..1b5fd5f 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -39,7 +39,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html
index ff95e49..6e8a3d9 100644
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -79,7 +79,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/filter.html b/ram/portal/templates/filter.html
index 27bbaa1..afe25c9 100644
--- a/ram/portal/templates/filter.html
+++ b/ram/portal/templates/filter.html
@@ -16,7 +16,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/includes/footer.html b/ram/portal/templates/includes/footer.html
index a018a26..8e57903 100644
--- a/ram/portal/templates/includes/footer.html
+++ b/ram/portal/templates/includes/footer.html
@@ -13,6 +13,6 @@
 
     <div class="container">
         <p class="small text-muted">Made with ❤️ for 🚂 and <a href="https://github.com/daniviga/django-ram">django-ram</a>
-        {% if site_conf.show_version %}<br/>Version {{ site_conf.version }}{% endif %}
+        {% if site_conf.show_version %}<br>Version {{ site_conf.version }}{% endif %}
     </div>
   </footer>
diff --git a/ram/portal/templates/manufacturers.html b/ram/portal/templates/manufacturers.html
index 6ad0f8e..10c8144 100644
--- a/ram/portal/templates/manufacturers.html
+++ b/ram/portal/templates/manufacturers.html
@@ -59,7 +59,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/roster.html b/ram/portal/templates/roster.html
index c05f0f2..cd03be4 100644
--- a/ram/portal/templates/roster.html
+++ b/ram/portal/templates/roster.html
@@ -16,7 +16,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/scales.html b/ram/portal/templates/scales.html
index dd3c609..40e42ad 100644
--- a/ram/portal/templates/scales.html
+++ b/ram/portal/templates/scales.html
@@ -56,7 +56,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/search.html b/ram/portal/templates/search.html
index 3c9aa02..ffc9126 100644
--- a/ram/portal/templates/search.html
+++ b/ram/portal/templates/search.html
@@ -16,7 +16,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/portal/templates/types.html b/ram/portal/templates/types.html
index 32088b3..4fb948f 100644
--- a/ram/portal/templates/types.html
+++ b/ram/portal/templates/types.html
@@ -48,7 +48,7 @@
           {% for i in page_range %}
             {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
               {% if i == data.paginator.ELLIPSIS %}
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index d78551a..373c970 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 __version__ += git_suffix(__file__)