From 5bb6279095fa4f6b43661c65e4b5da4d1b1d5e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Fri, 27 Oct 2023 23:11:21 +0200
Subject: [PATCH] Extend UX improvements on other pages

---
 ram/portal/templates/base.html           | 13 +++++++++++++
 ram/portal/templates/bookshelf/book.html |  6 +++++-
 ram/portal/templates/consist.html        |  8 ++++++--
 ram/portal/templates/rollingstock.html   | 17 ++---------------
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index 97126fc..8c43d79 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -115,6 +115,19 @@
           })
        })()
     </script>
+	<script>
+	  document.addEventListener('DOMContentLoaded', function () {
+		var selectElement = document.getElementById('tabSelector');
+		selectElement.addEventListener('change', function () {
+		  var selectedTabId = this.value;
+		  var tabs = document.querySelectorAll('.tab-pane');
+		  tabs.forEach(function (tab) {
+			tab.classList.remove('show', 'active');
+		  });
+		  document.getElementById(selectedTabId).classList.add('show', 'active');
+		});
+	  });
+	</script>
     {% block extra_head %}
     {{ site_conf.extra_head | safe }}
     {% endblock %}
diff --git a/ram/portal/templates/bookshelf/book.html b/ram/portal/templates/bookshelf/book.html
index 72fde7f..630dde6 100644
--- a/ram/portal/templates/bookshelf/book.html
+++ b/ram/portal/templates/bookshelf/book.html
@@ -43,10 +43,14 @@
         <section class="py-4 text-start container">
           <div class="row">
             <div class="mx-auto">
-              <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
+              <nav class="nav nav-tabs d-none d-lg-flex flex-row mb-2" id="nav-tab" role="tablist">
                 <button class="nav-link active" id="nav-summary-tab" data-bs-toggle="tab" data-bs-target="#nav-summary" type="button" role="tab" aria-controls="nav-summary" aria-selected="true">Summary</button>
                 {% if book.notes %}<button class="nav-link" id="nav-notes-tab" data-bs-toggle="tab" data-bs-target="#nav-notes" type="button" role="tab" aria-controls="nav-notes" aria-selected="false">Notes</button>{% endif %}
               </nav>
+              <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
+                <option value="nav-summary" selected>Summary</option>
+                {% if book.notes %}<option value="nav-notes">Notes</option>{% endif %}
+              </select>
               <div class="tab-content" id="nav-tabContent">
                 <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                   <table class="table table-striped">
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 87a5010..a5c1371 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -16,7 +16,7 @@
         <div id="carouselControls" class="carousel carousel-dark slide" data-bs-ride="carousel">
           <div class="carousel-inner">
             <div class="carousel-item active">
-              <img src="{{ consist.image.url }}" class="d-block w-100 rounded img-thumbnail" alt="...">
+              <img src="{{ consist.image.url }}" class="d-block w-100 rounded img-thumbnail" alt="Consist cover">
             </div>
           </div>
         </div>
@@ -66,10 +66,14 @@
       <section class="py-4 text-start container">
         <div class="row">
           <div class="mx-auto">
-            <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
+            <nav class="nav nav-tabs d-none d-lg-flex flex-row mb-2" id="nav-tab" role="tablist">
               <button class="nav-link active" id="nav-summary-tab" data-bs-toggle="tab" data-bs-target="#nav-summary" type="button" role="tab" aria-controls="nav-summary" aria-selected="true">Summary</button>
               {% if consist.notes %}<button class="nav-link" id="nav-notes-tab" data-bs-toggle="tab" data-bs-target="#nav-notes" type="button" role="tab" aria-controls="nav-notes" aria-selected="false">Notes</button>{% endif %}
             </nav>
+            <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
+              <option value="nav-summary" selected>Summary</option>
+              {% if consist.notes %}<option value="nav-notes">Notes</option>{% endif %}
+            </select>
             <div class="tab-content" id="nav-tabContent">
               <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                 <table class="table table-striped">
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 3683226..8ea0420 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -259,7 +259,7 @@
                       {% if company.logo %}
                       <tr>
                         <th class="w-33" scope="row">Logo</th>
-                        <td><img clas="logo-xl" src="{{ company.logo.url }}" alt="{{ company }} logo"></td>
+                        <td><img class="logo-xl" src="{{ company.logo.url }}" alt="{{ company }} logo"></td>
                       </tr>
                       {% endif %}
                       <tr>
@@ -356,7 +356,7 @@
                   <table class="table table-striped">
                     <thead>
                       <tr>
-                        <th colspan="2" scope="row">Journal</th>
+                        <th scope="row">Journal</th>
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
@@ -387,17 +387,4 @@
             </div>
           </div>
         </section>
-		<script>
-		  document.addEventListener('DOMContentLoaded', function () {
-			var selectElement = document.getElementById('tabSelector');
-			selectElement.addEventListener('change', function () {
-			  var selectedTabId = this.value;
-			  var tabs = document.querySelectorAll('.tab-pane');
-			  tabs.forEach(function (tab) {
-				tab.classList.remove('show', 'active');
-			  });
-			  document.getElementById(selectedTabId).classList.add('show', 'active');
-			});
-		  });
-		</script>
         {% endblock %}