From 8c15441fe5e782c39cbf99557436742f89579040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Fri, 22 Sep 2023 14:30:06 +0200
Subject: [PATCH] More html cleanup to match W3c

---
 ram/portal/static/css/main.css           |  4 ++++
 ram/portal/templates/base.html           |  4 ++--
 ram/portal/templates/cards.html          |  6 +++---
 ram/portal/templates/companies.html      | 10 +++++-----
 ram/portal/templates/consist.html        |  2 +-
 ram/portal/templates/consists.html       |  4 ++--
 ram/portal/templates/home.html           |  2 +-
 ram/portal/templates/includes/login.html |  2 +-
 ram/portal/templates/manufacturers.html  |  6 +++---
 ram/portal/templates/rollingstock.html   | 18 +++++++++---------
 ram/portal/templates/scales.html         |  8 ++++----
 ram/portal/templates/types.html          |  4 ++--
 ram/ram/__init__.py                      |  2 +-
 13 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/ram/portal/static/css/main.css b/ram/portal/static/css/main.css
index df6847d..aad3c5c 100644
--- a/ram/portal/static/css/main.css
+++ b/ram/portal/static/css/main.css
@@ -36,3 +36,7 @@ a.badge, a.badge:hover {
 #footer > p {
   display: inline;
 }
+
+th.th-35 {
+  width: 35%;
+}
diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index cd6a262..572a3e5 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -125,8 +125,8 @@
         <div class="container d-flex">
           <div class="me-auto">
             <a href="{% url 'index' %}" class="navbar-brand d-flex align-items-center">
-              <svg class="me-2" width="26" height="16" enable-background="new 0 0 26 26" version="1" viewBox="0 0 26 16" xmlns="http://www.w3.org/2000/svg">
-                <path d="m2.8125 0.0010991a1.0001 1.0001 0 0 0-0.8125 1c0 0.55455-0.44545 1-1 1a1.0001 1.0001 0 0 0-1 1v10a1.0001 1.0001 0 0 0 1 1c0.55455 0 1 0.44546 1 1a1.0001 1.0001 0 0 0 1 1h20a1.0001 1.0001 0 0 0 1-1c0-0.55454 0.44546-1 1-1a1.0001 1.0001 0 0 0 1-1v-10a1.0001 1.0001 0 0 0-1-1c-0.55454 0-1-0.44545-1-1a1.0001 1.0001 0 0 0-1-1h-20a1.0001 1.0001 0 0 0-0.09375 0 1.0001 1.0001 0 0 0-0.09375 0zm0.78125 2h14.406v1h2v-1h2.4062c0.30628 0.76906 0.82469 1.2875 1.5938 1.5938v8.8125c-0.76906 0.30628-1.2875 0.82469-1.5938 1.5938h-2.4062v-1h-2v1h-14.406c-0.30628-0.76906-0.82469-1.2875-1.5938-1.5938v-8.8125c0.76906-0.30628 1.2875-0.82469 1.5938-1.5938zm14.406 2v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" enable-background="accumulate" overflow="visible" stroke-width="2" />
+              <svg class="me-2" width="26" height="16" viewBox="0 0 26 16" xmlns="http://www.w3.org/2000/svg">
+                <path d="m2.8125 0.0010991a1.0001 1.0001 0 0 0-0.8125 1c0 0.55455-0.44545 1-1 1a1.0001 1.0001 0 0 0-1 1v10a1.0001 1.0001 0 0 0 1 1c0.55455 0 1 0.44546 1 1a1.0001 1.0001 0 0 0 1 1h20a1.0001 1.0001 0 0 0 1-1c0-0.55454 0.44546-1 1-1a1.0001 1.0001 0 0 0 1-1v-10a1.0001 1.0001 0 0 0-1-1c-0.55454 0-1-0.44545-1-1a1.0001 1.0001 0 0 0-1-1h-20a1.0001 1.0001 0 0 0-0.09375 0 1.0001 1.0001 0 0 0-0.09375 0zm0.78125 2h14.406v1h2v-1h2.4062c0.30628 0.76906 0.82469 1.2875 1.5938 1.5938v8.8125c-0.76906 0.30628-1.2875 0.82469-1.5938 1.5938h-2.4062v-1h-2v1h-14.406c-0.30628-0.76906-0.82469-1.2875-1.5938-1.5938v-8.8125c0.76906-0.30628 1.2875-0.82469 1.5938-1.5938zm14.406 2v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" stroke-width="2" />
                 <style>
                   path {
                     text-indent:0;
diff --git a/ram/portal/templates/cards.html b/ram/portal/templates/cards.html
index a46133c..eab6169 100644
--- a/ram/portal/templates/cards.html
+++ b/ram/portal/templates/cards.html
@@ -32,7 +32,7 @@
                 </thead>
                 <tbody>
                   <tr>
-                    <th width="35%" scope="row">Type</th>
+                    <th class="th-35" scope="row">Type</th>
                     <td>{{ d.rolling_class.type }}</td>
                   </tr>
                   <tr>
@@ -54,7 +54,7 @@
                     <td>{{ d.era }}</td>
                   </tr>
                   <tr>
-                    <th width="35%" scope="row">Manufacturer</th>
+                    <th class="th-35" scope="row">Manufacturer</th>
                     <td>{%if d.manufacturer %}
                       <a href="{% url 'filtered' _filter="manufacturer" search=d.manufacturer.slug %}">{{ d.manufacturer }}{% if d.manufacturer.website %}</a> <a href="{{ d.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                     {% endif %}</td>
@@ -78,7 +78,7 @@
                 </thead>
                 <tbody>
                   <tr>
-                    <th width="35%" scope="row">Decoder</th>
+                    <th class="th-35" scope="row">Decoder</th>
                     <td>{{ d.decoder }}</td>
                   </tr>
                   <tr>
diff --git a/ram/portal/templates/companies.html b/ram/portal/templates/companies.html
index 89a0d98..448c5b0 100644
--- a/ram/portal/templates/companies.html
+++ b/ram/portal/templates/companies.html
@@ -17,25 +17,25 @@
               <tbody>
                 {% if d.logo %}
                 <tr>
-                  <th width="35%" scope="row">Logo</th>
+                  <th class="th-35" scope="row">Logo</th>
                   <td><img style="max-height: 48px" src="{{ d.logo.url }}" /></td>
                 </tr>
                 {% endif %}
                 <tr>
-                  <th width="35%" scope="row">Name</th>
+                  <th class="th-35" scope="row">Name</th>
                   <td>{{ d.extended_name }}</td>
                 </tr>
                 <tr>
-                  <th width="35%" scope="row">Abbreviation</th>
+                  <th class="th-35" scope="row">Abbreviation</th>
                   <td>{{ d.name }}</td>
                 </tr>
                 <tr>
-                  <th width="35%" scope="row">Country</th>
+                  <th class="th-35" scope="row">Country</th>
                   <td>{{ d.country.name }} <img src="{{ d.country.flag }}" alt="{{ d.country }}" />
                 </tr>
                {% if d.freelance %}
                <tr>
-                  <th width="35%" scope="row">Notes</th>
+                  <th class="th-35" scope="row">Notes</th>
                   <td>A <em>freelance</em> company</td>
                 </tr>
                {% endif %}
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 1b5fd5f..9fefaca 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -82,7 +82,7 @@
                   </thead>
                   <tbody>
                     <tr>
-                      <th width="35%" scope="row">Company</th>
+                      <th class="th-35" scope="row">Company</th>
                       <td><abbr title="{{ consist.company.extended_name }}">{{ consist.company }}</abbr></td>
                     </tr>
                     <tr>
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html
index 6e8a3d9..d4125ce 100644
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -36,12 +36,12 @@
               <tbody>
                 {% if d.address %}
                 <tr>
-                  <th width="35%" scope="row">Address</th>
+                  <th class="th-35" scope="row">Address</th>
                   <td>{{ d.address }}</td>
                 </tr>
                 {% endif %}
                 <tr>
-                  <th width="35%" scope="row">Company</th>
+                  <th class="th-35" scope="row">Company</th>
                   <td><abbr title="{{ d.company.extended_name }}">{{ d.company }}</abbr></td>
                 </tr>
                 <tr>
diff --git a/ram/portal/templates/home.html b/ram/portal/templates/home.html
index fc48ce7..9876353 100644
--- a/ram/portal/templates/home.html
+++ b/ram/portal/templates/home.html
@@ -1,5 +1,5 @@
 {% extends "roster.html" %}
 
       {% block header %}
-        <p class="lead text-muted">{{ site_conf.about | safe }}</p>
+        <div class="text-muted">{{ site_conf.about | safe }}</div>
       {% endblock %}
diff --git a/ram/portal/templates/includes/login.html b/ram/portal/templates/includes/login.html
index b654159..35ec22a 100644
--- a/ram/portal/templates/includes/login.html
+++ b/ram/portal/templates/includes/login.html
@@ -22,7 +22,7 @@
             {% endif %}
           </li>
           <li class="nav-item dropdown">
-            <a class="theme-icon-active nav-link dropdown-toggle" href="#" type="button" id="bd-theme" data-bs-toggle="dropdown" aria-expanded="false">
+            <a class="theme-icon-active nav-link dropdown-toggle" href="#" role="button" id="bd-theme" data-bs-toggle="dropdown" aria-expanded="false">
               <i class="bi bi-circle-half"></i>
             </a>
             <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme">
diff --git a/ram/portal/templates/manufacturers.html b/ram/portal/templates/manufacturers.html
index 10c8144..9a0e580 100644
--- a/ram/portal/templates/manufacturers.html
+++ b/ram/portal/templates/manufacturers.html
@@ -17,18 +17,18 @@
               <tbody>
                 {% if d.logo %}
                 <tr>
-                  <th width="35%" scope="row">Logo</th>
+                  <th class="th-35" scope="row">Logo</th>
                   <td><img style="max-height: 48px" src="{{ d.logo.url }}" /></td>
                 </tr>
                 {% endif %}
                 {% if d.website %}
                 <tr>
-                  <th width="35%" scope="row">Website</th>
+                  <th class="th-35" scope="row">Website</th>
                   <td><a href="{{ d.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a></td>
                 </tr>
                 {% endif %}
                 <tr>
-                  <th width="35%" scope="row">Category</th>
+                  <th class="th-35" scope="row">Category</th>
                   <td>{{ d.category | title }}</td>
                 </tr>
               </tbody>
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 04d9f53..58ab8fd 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -64,7 +64,7 @@
                     </thead>
                     <tbody>
                       <tr>
-                        <th width="35%" scope="row">Type</th>
+                        <th class="th-35" scope="row">Type</th>
                         <td>{{ rolling_stock.rolling_class.type }}</td>
                       </tr>
                       <tr>
@@ -95,7 +95,7 @@
                     </thead>
                     <tbody>
                       <tr>
-                        <th width="35%" scope="row">Manufacturer</th>
+                        <th class="th-35" scope="row">Manufacturer</th>
                         <td>{%if rolling_stock.manufacturer %}
                           <a href="{% url 'filtered' _filter="manufacturer" search=rolling_stock.manufacturer.slug %}">{{ rolling_stock.manufacturer }}{% if rolling_stock.manufacturer.website %}</a> <a href="{{ rolling_stock.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                         {% endif %}</td>
@@ -119,7 +119,7 @@
                     </thead>
                     <tbody>
                       <tr>
-                        <th width="35%" scope="row">Interface</th>
+                        <th class="th-35" scope="row">Interface</th>
                         <td>{{ rolling_stock.get_decoder_interface_display }}</td>
                       </tr>
                       {% if rolling_stock.decoder %}
@@ -145,7 +145,7 @@
                     </thead>
                     <tbody>
                       <tr>
-                        <th width="35%" scope="row">Manufacturer</th>
+                        <th class="th-35" scope="row">Manufacturer</th>
                         <td>{%if rolling_stock.manufacturer %}
                           <a href="{% url 'filtered' _filter="manufacturer" search=rolling_stock.manufacturer.slug %}">{{ rolling_stock.manufacturer }}{% if rolling_stock.manufacturer.website %}</a> <a href="{{ rolling_stock.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                         {% endif %}</td>
@@ -182,7 +182,7 @@
                     <tbody>
                     {% for p in rolling_stock_properties %}
                       <tr>
-                        <th width="35%" scope="row">{{ p.property }}</th>
+                        <th class="th-35" scope="row">{{ p.property }}</th>
                         <td>{{ p.value }}</td>
                       </tr>
                     {% endfor %}
@@ -199,7 +199,7 @@
                     </thead>
                     <tbody>
                       <tr>
-                        <th width="35%" scope="row">Class</th>
+                        <th class="th-35" scope="row">Class</th>
                         <td>{{ rolling_stock.rolling_class.identifier }}</td>
                       </tr>
                       <tr>
@@ -234,7 +234,7 @@
                     <tbody>
                     {% for p in class_properties %}
                       <tr>
-                        <th width="35%" scope="row">{{ p.property }}</th>
+                        <th class="th-35" scope="row">{{ p.property }}</th>
                         <td>{{ p.value }}</td>
                       </tr>
                     {% endfor %}
@@ -255,7 +255,7 @@
                         <td>{{ rolling_stock.get_decoder_interface_display }}</td>
                       </tr>
                       <tr>
-                        <th width="35%" scope="row">Address</th>
+                        <th class="th-35" scope="row">Address</th>
                         <td>{{ rolling_stock.address }}</td>
                       </tr>
                       <tr>
@@ -319,7 +319,7 @@
                     <tbody>
                     {% for j in rolling_stock_journal %}
                       <tr>
-                          <th width="35%" scope="row">{{ j.date }}</th>
+                          <th class="th-35" scope="row">{{ j.date }}</th>
                         <td>{{ j.log | safe }}</a></td>
                       </tr>
                     {% endfor %}
diff --git a/ram/portal/templates/scales.html b/ram/portal/templates/scales.html
index 40e42ad..37a65e2 100644
--- a/ram/portal/templates/scales.html
+++ b/ram/portal/templates/scales.html
@@ -14,19 +14,19 @@
               </thead>
               <tbody>
                 <tr>
-                  <th width="35%" scope="row">Name</th>
+                  <th class="th-35" scope="row">Name</th>
                   <td>{{ d.scale }}</td>
                 </tr>
                 <tr>
-                  <th width="35%" scope="row">Ratio</th>
+                  <th class="th-35" scope="row">Ratio</th>
                   <td>{{ d.ratio }}</td>
                 </tr>
                 <tr>
-                  <th width="35%" scope="row">Gauge</th>
+                  <th class="th-35" scope="row">Gauge</th>
                   <td>{{ d.gauge }}</td>
                 </tr>
                 <tr>
-                  <th width="35%" scope="row">Tracks</th>
+                  <th class="th-35" scope="row">Tracks</th>
                   <td>{{ d.tracks }}</td>
                 </tr>
               </tbody>
diff --git a/ram/portal/templates/types.html b/ram/portal/templates/types.html
index 4fb948f..22e0fad 100644
--- a/ram/portal/templates/types.html
+++ b/ram/portal/templates/types.html
@@ -14,11 +14,11 @@
               </thead>
               <tbody>
                 <tr>
-                  <th width="35%" scope="row">Type</th>
+                  <th class="th-35" scope="row">Type</th>
                   <td>{{ d.type }}</td>
                 </tr>
                 <tr>
-                  <th width="35%" scope="row">Category</th>
+                  <th class="th-35" scope="row">Category</th>
                   <td>{{ d.category | title}}</td>
                 </tr>
               </tbody>
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 373c970..da274de 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 __version__ += git_suffix(__file__)