From 425eed3d83301f7850aee31e989c21e738a76c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Thu, 5 Oct 2023 23:13:42 +0200
Subject: [PATCH] Bookshelf reloaded (#25)

* Navbar refactoring
* Fix coming soon SVG fonts
* Overhaul templating and extend search to consists and books
---
 ram/portal/static/coming_soon.svg             |   4 +-
 ram/portal/templates/base.html                |   2 +-
 ram/portal/templates/bookshelf/book.html      |  12 +-
 ram/portal/templates/bookshelf/books.html     |  64 -------
 .../templates/bookshelf/bookshelf_menu.html   |   2 +-
 ram/portal/templates/cards.html               | 108 ++----------
 ram/portal/templates/cards/book.html          |  60 +++++++
 ram/portal/templates/cards/company.html       |  46 +++++
 ram/portal/templates/cards/consist.html       |  59 +++++++
 ram/portal/templates/cards/manufacturer.html  |  39 +++++
 ram/portal/templates/cards/rolling_stock.html |  92 ++++++++++
 .../templates/cards/rolling_stock_type.html   |  29 ++++
 ram/portal/templates/cards/scale.html         |  36 ++++
 ram/portal/templates/companies.html           |  51 ------
 ram/portal/templates/consist.html             |  12 +-
 ram/portal/templates/consists.html            |  64 -------
 ram/portal/templates/filter.html              |   1 -
 ram/portal/templates/manufacturers.html       |  45 +----
 ram/portal/templates/rollingstock.html        |  32 ++--
 ram/portal/templates/scales.html              |  41 -----
 ram/portal/templates/types.html               |  33 ----
 ram/portal/urls.py                            |  50 ++++--
 ram/portal/views.py                           | 159 ++++++++++++------
 ram/ram/__init__.py                           |   2 +-
 ram/ram/admin.py                              |   4 +-
 25 files changed, 554 insertions(+), 493 deletions(-)
 create mode 100644 ram/portal/templates/cards/book.html
 create mode 100644 ram/portal/templates/cards/company.html
 create mode 100644 ram/portal/templates/cards/consist.html
 create mode 100644 ram/portal/templates/cards/manufacturer.html
 create mode 100644 ram/portal/templates/cards/rolling_stock.html
 create mode 100644 ram/portal/templates/cards/rolling_stock_type.html
 create mode 100644 ram/portal/templates/cards/scale.html

diff --git a/ram/portal/static/coming_soon.svg b/ram/portal/static/coming_soon.svg
index 1d0f58d..c20a612 100644
--- a/ram/portal/static/coming_soon.svg
+++ b/ram/portal/static/coming_soon.svg
@@ -46,12 +46,12 @@
        transform="rotate(-90)" />
     <text
        xml:space="preserve"
-       style="font-weight:bold;font-size:0.444444px;line-height:1.25;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';letter-spacing:0px;word-spacing:0px;stroke-width:0.0138889"
+       style="font-weight:bold;font-size:0.444444px;line-height:1.25;font-family:system-ui,-apple-system,'Segoe UI',Roboto,'Helvetica Neue','Noto Sans','Liberation Sans',Arial,sans-serif;-inkscape-font-specification:'Noto Sans Bold';letter-spacing:0px;word-spacing:0px;stroke-width:0.0138889"
        x="1.5366687"
        y="1.6798887"
        id="text1"><tspan
          id="tspan1"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:0.444444px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans';fill:#dee2e6;fill-opacity:1;stroke-width:0.0138889"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:0.444444px;font-family:system-ui,-apple-system,'Segoe UI',Roboto,'Helvetica Neue','Noto Sans','Liberation Sans',Arial,sans-serif;-inkscape-font-specification:'Noto Sans';fill:#dee2e6;fill-opacity:1;stroke-width:0.0138889"
          x="1.5366687"
          y="1.6798887">Coming soon</tspan></text>
   </g>
diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index dfb0d26..c27b811 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -171,8 +171,8 @@
                     <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Real</a></li>
                   </ul>
                 </li>
-                {% show_flatpages_menu %}
                 {% show_bookshelf_menu %}
+                {% show_flatpages_menu %}
               </ul>
               {% include 'includes/search.html' %}
             </div>
diff --git a/ram/portal/templates/bookshelf/book.html b/ram/portal/templates/bookshelf/book.html
index 5731e69..72fde7f 100644
--- a/ram/portal/templates/bookshelf/book.html
+++ b/ram/portal/templates/bookshelf/book.html
@@ -43,14 +43,12 @@
         <section class="py-4 text-start container">
           <div class="row">
             <div class="mx-auto">
-              <nav>
-                <div class="nav nav-tabs" 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 %}
-                </div>
+              <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
+                <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>
               <div class="tab-content" id="nav-tabContent">
-                <div class="tab-pane fade show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
+                <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -112,7 +110,7 @@
                   </table>
                   {% endif %}
                 </div>
-                <div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
+                <div class="tab-pane" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
                   {{ book.notes | safe }}
                 </div>
               </div>
diff --git a/ram/portal/templates/bookshelf/books.html b/ram/portal/templates/bookshelf/books.html
index c2cf53b..f06f0be 100644
--- a/ram/portal/templates/bookshelf/books.html
+++ b/ram/portal/templates/bookshelf/books.html
@@ -1,68 +1,4 @@
 {% extends "cards.html" %}
-
-      {% block cards %}
-      {% for d in data %}
-      <div class="col">
-        <div class="card shadow-sm">
-          {% if d.image.all %}
-          <a href="{{ d.get_absolute_url }}">
-            {% for r in d.image.all %}
-              {% if forloop.first %}<img src="{{ r.image.url }}" alt="Card image cap">{% endif %}
-            {% endfor %}
-            </a>
-          {% endif %}
-          <div class="card-body">
-            <p class="card-text" style="position: relative;">
-              <strong>{{ d }}</strong>
-              <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
-            </p>
-            {% if d.tags.all %}
-            <p class="card-text"><small>Tags:</small>
-              {% for t in d.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
-              {{ t.name }}</a>{# new line is required #}
-              {% endfor %}
-            </p>
-            {% endif %}
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Book</th>
-                </tr>
-              </thead>
-              <tbody class="table-group-divider">
-                <tr>
-                  <th class="w-33" scope="row">Authors</th>
-                  <td>
-                    <ul class="mb-0 list-unstyled">{% for a in d.authors.all %}<li>{{ a }}</li>{% endfor %}</ul>
-                  </td>
-                </tr>
-                <tr>
-                  <th class="w-33" scope="row">Publisher</th>
-                  <td>{{ d.publisher }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Language</th>
-                  <td>{{ d.get_language_display }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Pages</th>
-                  <td>{{ d.number_of_pages|default:"-" }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Year</th>
-                  <td>{{ d.publication_year|default:"-" }}</td>
-                </tr>
-              </tbody>
-            </table>
-            <div class="d-grid gap-2 mb-1 d-md-block">
-              <a class="btn btn-sm btn-outline-primary" href="{{ d.get_absolute_url }}">Show all data</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:bookshelf_book_change' d.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
diff --git a/ram/portal/templates/bookshelf/bookshelf_menu.html b/ram/portal/templates/bookshelf/bookshelf_menu.html
index 9c67e19..2c6ab5f 100644
--- a/ram/portal/templates/bookshelf/bookshelf_menu.html
+++ b/ram/portal/templates/bookshelf/bookshelf_menu.html
@@ -4,7 +4,7 @@
                     Bookshelf
                   </a>
                   <ul class="dropdown-menu" aria-labelledby="bookshelfDropdownMenuLink">
-                    <li><a class="nav-link" href="{% url 'books' %}">Books</a></li>
+                    <li><a class="dropdown-item" href="{% url 'books' %}">Books</a></li>
                   </ul>
                 </li>
                 {% endif %}
diff --git a/ram/portal/templates/cards.html b/ram/portal/templates/cards.html
index 4c106d6..3a46078 100644
--- a/ram/portal/templates/cards.html
+++ b/ram/portal/templates/cards.html
@@ -1,6 +1,4 @@
 {% extends "base.html" %}
-{% load static %}
-
       {% block header %}
         <p class="lead text-muted">Results found: {{ matches }}</p>
       {% endblock %}
@@ -8,97 +6,21 @@
       <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
       {% block cards %}
         {% for d in data %}
-        <div class="col">
-          <div class="card shadow-sm">
-            {% if d.image.count > 0 %}
-            <a href="{{d.get_absolute_url}}"><img class="card-img-top" src="{{ d.image.first.image.url }}" alt="{{ d }}"></a>
-            {% else %}
-            <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
-            <a href="{{d.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}"></a>
-            {% endif %}
-            <div class="card-body">
-              <p class="card-text" style="position: relative;">
-                <strong>{{ d }}</strong>
-                <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
-              </p>
-              {% if d.tags.all %}
-              <p class="card-text"><small>Tags:</small>
-                {% for t in d.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
-                {{ t.name }}</a>{# new line is required #}
-                {% endfor %}
-              </p>
-              {% endif %}
-              <table class="table table-striped">
-                <thead>
-                  <tr>
-                    <th colspan="2" scope="row">Data</th>
-                  </tr>
-                </thead>
-                <tbody class="table-group-divider">
-                  <tr>
-                    <th class="w-33" scope="row">Type</th>
-                    <td>{{ d.rolling_class.type }}</td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Company</th>
-                    <td>
-                      <a href="{% url 'filtered' _filter="company" search=d.rolling_class.company.slug %}"><abbr title="{{ d.rolling_class.company.extended_name }}">{{ d.rolling_class.company }}</abbr></a>
-                    </td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Class</th>
-                    <td>{{ d.rolling_class.identifier }}</td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Road number</th>
-                    <td>{{ d.road_number }}</td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Era</th>
-                    <td>{{ d.era }}</td>
-                  </tr>
-                  <tr>
-                    <th class="w-33" 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>
-                  </tr>
-                  <tr>
-                    <th scope="row">Scale</th>
-                    <td><a href="{% url 'filtered' _filter="scale" search=d.scale.slug %}"><abbr title="{{ d.scale.ratio }} - {{ d.scale.tracks }}">{{ d.scale }}</abbr></a></td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Item number</th>
-                    <td>{{ d.item_number }}</td>
-                  </tr>
-                </tbody>
-              </table>
-              {% if d.decoder %}
-              <table class="table table-striped">
-                <thead>
-                  <tr>
-                    <th colspan="2" scope="row">DCC data</th>
-                  </tr>
-                </thead>
-                <tbody class="table-group-divider">
-                  <tr>
-                    <th class="w-33" scope="row">Decoder</th>
-                    <td>{{ d.decoder }}</td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Address</th>
-                    <td>{{ d.address }}</td>
-                  </tr>
-                </tbody>
-              </table>
-              {% endif %}
-              <div class="d-grid gap-2 mb-1 d-md-block">
-               <a class="btn btn-sm btn-outline-primary" href="{{d.get_absolute_url}}">Show all data</a>
-                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' d.pk %}">Edit</a>{% endif %}
-              </div>
-            </div>
-          </div>
-        </div>
+        {% if d.type == "rolling_stock" %}
+        {% include "cards/rolling_stock.html" %}
+        {% elif d.type == "company" %}
+        {% include "cards/company.html" %}
+        {% elif d.type == "rolling_stock_type" %}
+        {% include "cards/rolling_stock_type.html" %}
+        {% elif d.type == "scale" %}
+        {% include "cards/scale.html" %}
+        {% elif d.type == "consist" %}
+        {% include "cards/consist.html" %}
+        {% elif d.type == "manufacturer" %}
+        {% include "cards/manufacturer.html" %}
+        {% elif d.type == "book" %}
+        {% include "cards/book.html" %}
+        {% endif %}
         {% endfor %}
       {% endblock %}
       </div>
diff --git a/ram/portal/templates/cards/book.html b/ram/portal/templates/cards/book.html
new file mode 100644
index 0000000..b2f77f8
--- /dev/null
+++ b/ram/portal/templates/cards/book.html
@@ -0,0 +1,60 @@
+        <div class="col">
+          <div class="card shadow-sm">
+            {% if d.item.image.all %}
+            <a href="{{ d.item.get_absolute_url }}">
+              {% for r in d.item.image.all %}
+                {% if forloop.first %}<img src="{{ r.image.url }}" alt="Card image cap">{% endif %}
+              {% endfor %}
+              </a>
+            {% endif %}
+            <div class="card-body">
+              <p class="card-text" style="position: relative;">
+                <strong>{{ d.item }}</strong>
+                <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
+              </p>
+              {% if d.item.tags.all %}
+              <p class="card-text"><small>Tags:</small>
+                {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                {{ t.name }}</a>{# new line is required #}
+                {% endfor %}
+              </p>
+              {% endif %}
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">Book</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  <tr>
+                    <th class="w-33" scope="row">Authors</th>
+                    <td>
+                      <ul class="mb-0 list-unstyled">{% for a in d.item.authors.all %}<li>{{ a }}</li>{% endfor %}</ul>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th class="w-33" scope="row">Publisher</th>
+                    <td>{{ d.item.publisher }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Language</th>
+                    <td>{{ d.item.get_language_display }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Pages</th>
+                    <td>{{ d.item.number_of_pages|default:"-" }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Year</th>
+                    <td>{{ d.item.publication_year|default:"-" }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              <div class="d-grid gap-2 mb-1 d-md-block">
+                <a class="btn btn-sm btn-outline-primary" href="{{ d.item.get_absolute_url }}">Show all data</a>
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:bookshelf_book_change' d.item.pk %}">Edit</a>{% endif %}
+              </div>
+            </div>
+          </div>
+        </div>
+
diff --git a/ram/portal/templates/cards/company.html b/ram/portal/templates/cards/company.html
new file mode 100644
index 0000000..3157a9e
--- /dev/null
+++ b/ram/portal/templates/cards/company.html
@@ -0,0 +1,46 @@
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text" style="position: relative;">
+              <strong>{{ d.item.name }}</strong>
+            </p>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">Company</th>
+                </tr>
+              </thead>
+              <tbody class="table-group-divider">
+                {% if d.item.logo %}
+                <tr>
+                  <th class="w-33" scope="row">Logo</th>
+                  <td><img style="max-height: 48px" src="{{ d.item.logo.url }}" /></td>
+                </tr>
+                {% endif %}
+                <tr>
+                  <th class="w-33" scope="row">Name</th>
+                  <td>{{ d.item.extended_name }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Abbreviation</th>
+                  <td>{{ d.item.name }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Country</th>
+                  <td>{{ d.item.country.name }} <img src="{{ d.item.country.flag }}" alt="{{ d.item.country }}" />
+                </tr>
+               {% if d.item.freelance %}
+               <tr>
+                  <th class="w-33" scope="row">Notes</th>
+                  <td>A <em>freelance</em> company</td>
+                </tr>
+               {% endif %}
+              </tbody>
+            </table>
+            <div class="d-grid gap-2 mb-1 d-md-block">
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="company" search=d.item.slug %}">Show all rolling stock</a>
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_company_change' d.item.pk %}">Edit</a>{% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
diff --git a/ram/portal/templates/cards/consist.html b/ram/portal/templates/cards/consist.html
new file mode 100644
index 0000000..f0f6e77
--- /dev/null
+++ b/ram/portal/templates/cards/consist.html
@@ -0,0 +1,59 @@
+      <div class="col">
+        <div class="card shadow-sm">
+          <a href="{{ d.item.get_absolute_url }}">
+          {% if d.item.image %}
+            <img src="{{ d.item.image.url }}" alt="Card image cap">
+          {% else %}
+            {% with d.item.consist_item.first.rolling_stock as r %}
+            {% for i in r.image.all %}
+              {% if forloop.first %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
+            {% endfor %}
+            {% endwith %}
+          {% endif %}
+          </a>
+          <div class="card-body">
+            <p class="card-text" style="position: relative;">
+              <strong>{{ d.item }}</strong>
+              <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
+            </p>
+            {% if d.item.tags.all %}
+            <p class="card-text"><small>Tags:</small>
+              {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+              {{ t.name }}</a>{# new line is required #}
+              {% endfor %}
+            </p>
+            {% endif %}
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">Consist data</th>
+                </tr>
+              </thead>
+              <tbody class="table-group-divider">
+                {% if d.item.address %}
+                <tr>
+                  <th class="w-33" scope="row">Address</th>
+                  <td>{{ d.item.address }}</td>
+                </tr>
+                {% endif %}
+                <tr>
+                  <th class="w-33" scope="row">Company</th>
+                  <td><abbr title="{{ d.item.company.extended_name }}">{{ d.item.company }}</abbr></td>
+                </tr>
+                <tr>
+                  <th scope="row">Era</th>
+                  <td>{{ d.item.era }}</td>
+                </tr>
+                <tr>
+                  <th scope="row">Length</th>
+                  <td>{{ d.item.consist_item.all | length }}</td>
+                </tr>
+              </tbody>
+            </table>
+            <div class="d-grid gap-2 mb-1 d-md-block">
+             <a class="btn btn-sm btn-outline-primary" href="{{ d.item.get_absolute_url }}">Show all data</a>
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:consist_consist_change' d.item.pk %}">Edit</a>{% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
diff --git a/ram/portal/templates/cards/manufacturer.html b/ram/portal/templates/cards/manufacturer.html
new file mode 100644
index 0000000..bdbad62
--- /dev/null
+++ b/ram/portal/templates/cards/manufacturer.html
@@ -0,0 +1,39 @@
+        <div class="col">
+          <div class="card shadow-sm">
+            <div class="card-body">
+              <p class="card-text" style="position: relative;">
+                <strong>{{ d.item.name }}</strong>
+              </p>
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">Manufacturer</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  {% if d.item.logo %}
+                  <tr>
+                    <th class="w-33" scope="row">Logo</th>
+                    <td><img style="max-height: 48px" src="{{ d.item.logo.url }}" /></td>
+                  </tr>
+                  {% endif %}
+                  {% if d.item.website %}
+                  <tr>
+                    <th class="w-33" scope="row">Website</th>
+                    <td><a href="{{ d.item.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a></td>
+                  </tr>
+                  {% endif %}
+                  <tr>
+                    <th class="w-33" scope="row">Category</th>
+                    <td>{{ d.item.category | title }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              <div class="d-grid gap-2 mb-1 d-md-block">
+                <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="manufacturer" search=d.item.slug %}">Show all rolling stock</a>
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_manufacturer_change' d.item.pk %}">Edit</a>{% endif %}
+              </div>
+            </div>
+          </div>
+        </div>
+
diff --git a/ram/portal/templates/cards/rolling_stock.html b/ram/portal/templates/cards/rolling_stock.html
new file mode 100644
index 0000000..d69acaf
--- /dev/null
+++ b/ram/portal/templates/cards/rolling_stock.html
@@ -0,0 +1,92 @@
+{% load static %}
+        <div class="col">
+          <div class="card shadow-sm">
+            {% if d.item.image.count > 0 %}
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d }}"></a>
+            {% else %}
+            <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}"></a>
+            {% endif %}
+            <div class="card-body">
+              <p class="card-text" style="position: relative;">
+                <strong>{{ d.item }}</strong>
+                <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
+              </p>
+              {% if d.item.tags.all %}
+              <p class="card-text"><small>Tags:</small>
+                {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                {{ t.name }}</a>{# new line is required #}
+                {% endfor %}
+              </p>
+              {% endif %}
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">Rolling stock</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  <tr>
+                    <th class="w-33" scope="row">Type</th>
+                    <td>{{ d.item.rolling_class.type }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Company</th>
+                    <td>
+                      <a href="{% url 'filtered' _filter="company" search=d.item.rolling_class.company.slug %}"><abbr title="{{ d.item.rolling_class.company.extended_name }}">{{ d.item.rolling_class.company }}</abbr></a>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Class</th>
+                    <td>{{ d.item.rolling_class.identifier }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Road number</th>
+                    <td>{{ d.item.road_number }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Era</th>
+                    <td>{{ d.item.era }}</td>
+                  </tr>
+                  <tr>
+                    <th class="w-33" scope="row">Manufacturer</th>
+                    <td>{%if d.item.manufacturer %}
+                      <a href="{% url 'filtered' _filter="manufacturer" search=d.item.manufacturer.slug %}">{{ d.item.manufacturer }}{% if d.item.manufacturer.website %}</a> <a href="{{ d.item.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                    {% endif %}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Scale</th>
+                    <td><a href="{% url 'filtered' _filter="scale" search=d.item.scale.slug %}"><abbr title="{{ d.item.scale.ratio }} - {{ d.item.scale.tracks }}">{{ d.item.scale }}</abbr></a></td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Item number</th>
+                    <td>{{ d.item.item_number }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              {% if d.item.decoder %}
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">DCC data</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  <tr>
+                    <th class="w-33" scope="row">Decoder</th>
+                    <td>{{ d.item.decoder }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Address</th>
+                    <td>{{ d.item.address }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              {% endif %}
+              <div class="d-grid gap-2 mb-1 d-md-block">
+               <a class="btn btn-sm btn-outline-primary" href="{{d.item.get_absolute_url}}">Show all data</a>
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' d.item.pk %}">Edit</a>{% endif %}
+              </div>
+            </div>
+          </div>
+        </div>
diff --git a/ram/portal/templates/cards/rolling_stock_type.html b/ram/portal/templates/cards/rolling_stock_type.html
new file mode 100644
index 0000000..52a45f8
--- /dev/null
+++ b/ram/portal/templates/cards/rolling_stock_type.html
@@ -0,0 +1,29 @@
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text"><strong>{{ d.item }}</strong></p>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">Type</th>
+                </tr>
+              </thead>
+              <tbody class="table-group-divider">
+                <tr>
+                  <th class="w-33" scope="row">Type</th>
+                  <td>{{ d.item.type }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Category</th>
+                  <td>{{ d.item.category | title}}</td>
+                </tr>
+              </tbody>
+            </table>
+            <div class="d-grid gap-2 mb-1 d-md-block">
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="type" search=d.item.slug %}">Show all rolling stock</a>
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_scale_change' d.item.pk %}">Edit</a>{% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
+
diff --git a/ram/portal/templates/cards/scale.html b/ram/portal/templates/cards/scale.html
new file mode 100644
index 0000000..bc370f0
--- /dev/null
+++ b/ram/portal/templates/cards/scale.html
@@ -0,0 +1,36 @@
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text"><strong>{{ d.item }}</strong></p>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">Scale</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <th class="w-33" scope="row">Name</th>
+                  <td>{{ d.item.scale }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Ratio</th>
+                  <td>{{ d.item.ratio }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Gauge</th>
+                  <td>{{ d.item.gauge }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Tracks</th>
+                  <td>{{ d.item.tracks }}</td>
+                </tr>
+              </tbody>
+            </table>
+            <div class="d-grid gap-2 mb-1 d-md-block">
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="scale" search=d.item.slug %}">Show all rolling stock</a>
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_scale_change' d.item.pk %}">Edit</a>{% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
diff --git a/ram/portal/templates/companies.html b/ram/portal/templates/companies.html
index 4b52fe2..3e979f9 100644
--- a/ram/portal/templates/companies.html
+++ b/ram/portal/templates/companies.html
@@ -1,55 +1,4 @@
 {% extends "cards.html" %}
-
-      {% block cards %}
-      {% for d in data  %}
-      <div class="col">
-        <div class="card shadow-sm">
-          <div class="card-body">
-            <p class="card-text" style="position: relative;">
-              <strong>{{ d.name }}</strong>
-            </p>
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Company</th>
-                </tr>
-              </thead>
-              <tbody class="table-group-divider">
-                {% if d.logo %}
-                <tr>
-                  <th class="w-33" scope="row">Logo</th>
-                  <td><img style="max-height: 48px" src="{{ d.logo.url }}" /></td>
-                </tr>
-                {% endif %}
-                <tr>
-                  <th class="w-33" scope="row">Name</th>
-                  <td>{{ d.extended_name }}</td>
-                </tr>
-                <tr>
-                  <th class="w-33" scope="row">Abbreviation</th>
-                  <td>{{ d.name }}</td>
-                </tr>
-                <tr>
-                  <th class="w-33" scope="row">Country</th>
-                  <td>{{ d.country.name }} <img src="{{ d.country.flag }}" alt="{{ d.country }}" />
-                </tr>
-               {% if d.freelance %}
-               <tr>
-                  <th class="w-33" scope="row">Notes</th>
-                  <td>A <em>freelance</em> company</td>
-                </tr>
-               {% endif %}
-              </tbody>
-            </table>
-            <div class="d-grid gap-2 mb-1 d-md-block">
-              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="company" search=d.slug %}">Show all rolling stock</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_company_change' d.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 5adde1f..4328606 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -66,14 +66,12 @@
       <section class="py-4 text-start container">
         <div class="row">
           <div class="mx-auto">
-            <nav>
-              <div class="nav nav-tabs" 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 %}
-               </div>
+            <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
+              <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>
             <div class="tab-content" id="nav-tabContent">
-              <div class="tab-pane fade show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
+              <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                 <table class="table table-striped">
                   <thead>
                     <tr>
@@ -96,7 +94,7 @@
                   </tbody>
                 </table>
               </div>
-              <div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
+              <div class="tab-pane" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
                 <table class="table">
                   <thead>
                     <tr>
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html
index dad67ad..9872364 100644
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -1,68 +1,4 @@
 {% extends "cards.html" %}
-
-      {% block cards %}
-      {% for d in data %}
-      <div class="col">
-        <div class="card shadow-sm">
-          <a href="{{ d.get_absolute_url }}">
-          {% if d.image %}
-            <img src="{{ d.image.url }}" alt="Card image cap">
-          {% else %}
-            {% with d.consist_item.first.rolling_stock as r %}
-            {% for i in r.image.all %}
-              {% if forloop.first %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
-            {% endfor %}
-            {% endwith %}
-          {% endif %}
-          </a>
-          <div class="card-body">
-            <p class="card-text" style="position: relative;">
-              <strong>{{ d }}</strong>
-              <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
-            </p>
-            {% if d.tags.all %}
-            <p class="card-text"><small>Tags:</small>
-              {% for t in d.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
-              {{ t.name }}</a>{# new line is required #}
-              {% endfor %}
-            </p>
-            {% endif %}
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Consist data</th>
-                </tr>
-              </thead>
-              <tbody class="table-group-divider">
-                {% if d.address %}
-                <tr>
-                  <th class="w-33" scope="row">Address</th>
-                  <td>{{ d.address }}</td>
-                </tr>
-                {% endif %}
-                <tr>
-                  <th class="w-33" scope="row">Company</th>
-                  <td><abbr title="{{ d.company.extended_name }}">{{ d.company }}</abbr></td>
-                </tr>
-                <tr>
-                  <th scope="row">Era</th>
-                  <td>{{ d.era }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Length</th>
-                  <td>{{ d.consist_item.all | length }}</td>
-                </tr>
-              </tbody>
-            </table>
-            <div class="d-grid gap-2 mb-1 d-md-block">
-             <a class="btn btn-sm btn-outline-primary" href="{{ d.get_absolute_url }}">Show all data</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:consist_consist_change' d.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
diff --git a/ram/portal/templates/filter.html b/ram/portal/templates/filter.html
index 4cba04e..bb97a66 100644
--- a/ram/portal/templates/filter.html
+++ b/ram/portal/templates/filter.html
@@ -1,5 +1,4 @@
 {% extends "cards.html" %}
-
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
diff --git a/ram/portal/templates/manufacturers.html b/ram/portal/templates/manufacturers.html
index 43253f8..eb2f4a7 100644
--- a/ram/portal/templates/manufacturers.html
+++ b/ram/portal/templates/manufacturers.html
@@ -1,50 +1,7 @@
 {% extends "cards.html" %}
-
-      {% block cards %}
-      {% for d in data %}
-      <div class="col">
-        <div class="card shadow-sm">
-          <div class="card-body">
-            <p class="card-text" style="position: relative;">
-              <strong>{{ d.name }}</strong>
-            </p>
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Manufacturer</th>
-                </tr>
-              </thead>
-              <tbody class="table-group-divider">
-                {% if d.logo %}
-                <tr>
-                  <th class="w-33" scope="row">Logo</th>
-                  <td><img style="max-height: 48px" src="{{ d.logo.url }}" /></td>
-                </tr>
-                {% endif %}
-                {% if d.website %}
-                <tr>
-                  <th class="w-33" 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 class="w-33" scope="row">Category</th>
-                  <td>{{ d.category | title }}</td>
-                </tr>
-              </tbody>
-            </table>
-            <div class="d-grid gap-2 mb-1 d-md-block">
-              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="manufacturer" search=d.slug %}">Show all rolling stock</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_manufacturer_change' d.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
-      {% with data.0.category as c %}
+      {% with data.0.item.category as c %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 38a7c42..18de4ea 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -43,19 +43,17 @@
         <section class="py-4 text-start container">
           <div class="row">
             <div class="mx-auto">
-              <nav>
-                <div class="nav nav-tabs" 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>
-                  <button class="nav-link" id="nav-model-tab" data-bs-toggle="tab" data-bs-target="#nav-model" type="button" role="tab" aria-controls="nav-model" aria-selected="false">Model data</button>
-                  <button class="nav-link" id="nav-class-tab" data-bs-toggle="tab" data-bs-target="#nav-class" type="button" role="tab" aria-controls="nav-class" aria-selected="false">Class data</button>
-                  {% if rolling_stock.decoder %}<button class="nav-link" id="nav-dcc-tab" data-bs-toggle="tab" data-bs-target="#nav-dcc" type="button" role="tab" aria-controls="nav-dcc" aria-selected="false">DCC</button>{% endif %}
-                  {% if rolling_stock.document.count > 0 or rolling_stock.decoder.document.count > 0 %}<button class="nav-link" id="nav-documents-tab" data-bs-toggle="tab" data-bs-target="#nav-documents" type="button" role="tab" aria-controls="nav-documents" aria-selected="false">Documents</button>{% endif %}
-                  {% if rolling_stock_journal.count > 0 %}<button class="nav-link" id="nav-journal-tab" data-bs-toggle="tab" data-bs-target="#nav-journal" type="button" role="tab" aria-controls="nav-journal" aria-selected="false">Journal</button>{% endif %}
-                  {% if rolling_stock.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 %}
-                </div>
+              <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
+                <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>
+                <button class="nav-link" id="nav-model-tab" data-bs-toggle="tab" data-bs-target="#nav-model" type="button" role="tab" aria-controls="nav-model" aria-selected="false">Model data</button>
+                <button class="nav-link" id="nav-class-tab" data-bs-toggle="tab" data-bs-target="#nav-class" type="button" role="tab" aria-controls="nav-class" aria-selected="false">Class data</button>
+                {% if rolling_stock.decoder %}<button class="nav-link" id="nav-dcc-tab" data-bs-toggle="tab" data-bs-target="#nav-dcc" type="button" role="tab" aria-controls="nav-dcc" aria-selected="false">DCC</button>{% endif %}
+                {% if rolling_stock.document.count > 0 or rolling_stock.decoder.document.count > 0 %}<button class="nav-link" id="nav-documents-tab" data-bs-toggle="tab" data-bs-target="#nav-documents" type="button" role="tab" aria-controls="nav-documents" aria-selected="false">Documents</button>{% endif %}
+                {% if rolling_stock_journal.count > 0 %}<button class="nav-link" id="nav-journal-tab" data-bs-toggle="tab" data-bs-target="#nav-journal" type="button" role="tab" aria-controls="nav-journal" aria-selected="false">Journal</button>{% endif %}
+                {% if rolling_stock.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>
               <div class="tab-content" id="nav-tabContent">
-                <div class="tab-pane fade show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
+                <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -136,7 +134,7 @@
                   </table>
                   {% endif %}
                 </div>
-                <div class="tab-pane fade" id="nav-model" role="tabpanel" aria-labelledby="nav-model-tab">
+                <div class="tab-pane" id="nav-model" role="tabpanel" aria-labelledby="nav-model-tab">
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -190,7 +188,7 @@
                   </table>
                   {% endif %}
                 </div>
-                <div class="tab-pane fade" id="nav-class" role="tabpanel" aria-labelledby="nav-class-tab">
+                <div class="tab-pane" id="nav-class" role="tabpanel" aria-labelledby="nav-class-tab">
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -242,7 +240,7 @@
                   </table>
                   {% endif %}
                 </div>
-                <div class="tab-pane fade" id="nav-dcc" role="tabpanel" aria-labelledby="nav-dcc-tab">
+                <div class="tab-pane" id="nav-dcc" role="tabpanel" aria-labelledby="nav-dcc-tab">
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -277,7 +275,7 @@
                     </tbody>
                   </table>
                 </div>
-                <div class="tab-pane fade" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
+                <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
                   {% if rolling_stock.document.count > 0 %}
                   <table class="table table-striped">
                     <thead>
@@ -315,7 +313,7 @@
                   </table>
                   {% endif %}
                 </div>
-                <div class="tab-pane fade" id="nav-journal" role="tabpanel" aria-labelledby="nav-journal-tab">
+                <div class="tab-pane" id="nav-journal" role="tabpanel" aria-labelledby="nav-journal-tab">
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -332,7 +330,7 @@
                     </tbody>
                   </table>
                 </div>
-                <div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
+                <div class="tab-pane" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
                   {{ rolling_stock.notes | safe }}
                 </div>
               </div>
diff --git a/ram/portal/templates/scales.html b/ram/portal/templates/scales.html
index 15612f6..5f85b88 100644
--- a/ram/portal/templates/scales.html
+++ b/ram/portal/templates/scales.html
@@ -1,45 +1,4 @@
 {% extends "cards.html" %}
-
-      {% block cards %}
-      {% for d in data %}
-      <div class="col">
-        <div class="card shadow-sm">
-          <div class="card-body">
-            <p class="card-text"><strong>{{ d }}</strong></p>
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Scale</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <th class="w-33" scope="row">Name</th>
-                  <td>{{ d.scale }}</td>
-                </tr>
-                <tr>
-                  <th class="w-33" scope="row">Ratio</th>
-                  <td>{{ d.ratio }}</td>
-                </tr>
-                <tr>
-                  <th class="w-33" scope="row">Gauge</th>
-                  <td>{{ d.gauge }}</td>
-                </tr>
-                <tr>
-                  <th class="w-33" scope="row">Tracks</th>
-                  <td>{{ d.tracks }}</td>
-                </tr>
-              </tbody>
-            </table>
-            <div class="d-grid gap-2 mb-1 d-md-block">
-              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="scale" search=d.slug %}">Show all rolling stock</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_scale_change' d.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
diff --git a/ram/portal/templates/types.html b/ram/portal/templates/types.html
index 7eb8e01..5f85b88 100644
--- a/ram/portal/templates/types.html
+++ b/ram/portal/templates/types.html
@@ -1,37 +1,4 @@
 {% extends "cards.html" %}
-
-      {% block cards %}
-      {% for d in data %}
-      <div class="col">
-        <div class="card shadow-sm">
-          <div class="card-body">
-            <p class="card-text"><strong>{{ d }}</strong></p>
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Type</th>
-                </tr>
-              </thead>
-              <tbody class="table-group-divider">
-                <tr>
-                  <th class="w-33" scope="row">Type</th>
-                  <td>{{ d.type }}</td>
-                </tr>
-                <tr>
-                  <th class="w-33" scope="row">Category</th>
-                  <td>{{ d.category | title}}</td>
-                </tr>
-              </tbody>
-            </table>
-            <div class="d-grid gap-2 mb-1 d-md-block">
-              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="type" search=d.slug %}">Show all rolling stock</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_scale_change' d.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
diff --git a/ram/portal/urls.py b/ram/portal/urls.py
index 36cb875..a62a6ac 100644
--- a/ram/portal/urls.py
+++ b/ram/portal/urls.py
@@ -18,7 +18,7 @@ from portal.views import (
 )
 
 urlpatterns = [
-    path("", GetData.as_view(), name="index"),
+    path("", GetData.as_view(template="home.html"), name="index"),
     path("roster", GetRoster.as_view(), name="roster"),
     path("roster/<int:page>", GetRoster.as_view(), name="roster_pagination"),
     path(
@@ -36,28 +36,56 @@ urlpatterns = [
         GetConsist.as_view(),
         name="consist_pagination",
     ),
-    path("companies", Companies.as_view(), name="companies"),
+    path(
+        "companies",
+        Companies.as_view(template="companies.html"),
+        name="companies"
+    ),
     path(
         "companies/<int:page>",
-        Companies.as_view(),
+        Companies.as_view(template="companies.html"),
         name="companies_pagination",
     ),
     path(
         "manufacturers/<str:category>",
-        Manufacturers.as_view(),
+        Manufacturers.as_view(template="manufacturers.html"),
         name="manufacturers"
     ),
     path(
         "manufacturers/<str:category>/<int:page>",
-        Manufacturers.as_view(),
+        Manufacturers.as_view(template="manufacturers.html"),
         name="manufacturers_pagination",
     ),
-    path("scales", Scales.as_view(), name="scales"),
-    path("scales/<int:page>", Types.as_view(), name="scales_pagination"),
-    path("types", Types.as_view(), name="types"),
-    path("types/<int:page>", Types.as_view(), name="types_pagination"),
-    path("bookshelf/books", Books.as_view(), name="books"),
-    path("bookshelf/books/<int:page>", Books.as_view(), name="books_pagination"),
+    path(
+        "scales",
+        Scales.as_view(template="scales.html"),
+        name="scales"
+    ),
+    path(
+        "scales/<int:page>",
+        Scales.as_view(template="scales.html"),
+        name="scales_pagination"
+    ),
+    path(
+        "types",
+        Types.as_view(template="types.html"),
+        name="types"
+    ),
+    path(
+        "types/<int:page>",
+        Types.as_view(template="types.html"),
+        name="types_pagination"
+    ),
+    path(
+        "bookshelf/books",
+        Books.as_view(template="bookshelf/books.html"),
+        name="books"
+    ),
+    path(
+        "bookshelf/books/<int:page>",
+        Books.as_view(template="bookshelf/books.html"),
+        name="books_pagination"
+    ),
     path("bookshelf/book/<uuid:uuid>", GetBook.as_view(), name="book"),
     path(
         "search",
diff --git a/ram/portal/views.py b/ram/portal/views.py
index b5ce226..430db98 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -36,15 +36,22 @@ def order_by_fields():
 
 
 class GetData(View):
-    def __init__(self):
-        self.title = "Home"
-        self.template = "home.html"
-        self.data = RollingStock.objects.order_by(*order_by_fields())
+    title = "Home"
+    template = "roster.html"
+    item_type = "rolling_stock"
+    queryset = RollingStock.objects.order_by(*order_by_fields())
 
     def get(self, request, page=1):
         site_conf = get_site_conf()
 
-        paginator = Paginator(self.data, site_conf.items_per_page)
+        data = []
+        for item in self.queryset:
+            data.append({
+                "type": self.item_type,
+                "item": item
+            })
+
+        paginator = Paginator(data, site_conf.items_per_page)
         data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
             data.number, on_each_side=2, on_ends=1
@@ -55,6 +62,7 @@ class GetData(View):
             self.template,
             {
                 "title": self.title,
+                "type": self.item_type,
                 "data": data,
                 "matches": paginator.count,
                 "page_range": page_range,
@@ -63,10 +71,9 @@ class GetData(View):
 
 
 class GetRoster(GetData):
-    def __init__(self):
-        self.title = "Rolling stock"
-        self.template = "roster.html"
-        self.data = RollingStock.objects.order_by(*order_by_fields())
+    title = "Rolling stock"
+    item_type = "rolling_stock"
+    queryset = RollingStock.objects.order_by(*order_by_fields())
 
 
 class SearchRoster(View):
@@ -111,20 +118,45 @@ class SearchRoster(View):
         else:
             raise Http404
 
+        # FIXME duplicated code!
+        data = []
         rolling_stock = (
             RollingStock.objects.filter(query)
             .distinct()
             .order_by(*order_by_fields())
         )
-        matches = rolling_stock.count()
+        for item in rolling_stock:
+            data.append({
+                "type": "rolling_stock",
+                "item": item
+            })
+        if _filter is None:
+            consists = (
+                Consist.objects.filter(identifier__icontains=search)
+                .distinct()
+            )
+            for item in consists:
+                data.append({
+                    "type": "consist",
+                    "item": item
+                })
+            books = (
+                Book.objects.filter(title__icontains=search)
+                .distinct()
+            )
+            for item in books:
+                data.append({
+                    "type": "book",
+                    "item": item
+                })
 
-        paginator = Paginator(rolling_stock, site_conf.items_per_page)
-        rolling_stock = paginator.get_page(page)
+        paginator = Paginator(data, site_conf.items_per_page)
+        data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
-            rolling_stock.number, on_each_side=2, on_ends=1
+            data.number, on_each_side=2, on_ends=1
         )
 
-        return rolling_stock, matches, page_range
+        return data, paginator.count, page_range
 
     def split_search(self, search):
         search = search.strip().split(":")
@@ -149,7 +181,7 @@ class SearchRoster(View):
             encoded_search = base64.b64encode(
                 search.encode()).decode()
         _filter, keyword = self.split_search(search)
-        rolling_stock, matches, page_range = self.run_search(
+        data, matches, page_range = self.run_search(
             request, keyword, _filter, page
         )
 
@@ -160,8 +192,8 @@ class SearchRoster(View):
                 "title": "Search: \"{}\"".format(search),
                 "search": search,
                 "encoded_search": encoded_search,
+                "data": data,
                 "matches": matches,
-                "data": rolling_stock,
                 "page_range": page_range,
             },
         )
@@ -200,15 +232,41 @@ class GetRosterFiltered(View):
             .distinct()
             .order_by(*order_by_fields())
         )
-        matches = rolling_stock.count()
 
-        paginator = Paginator(rolling_stock, site_conf.items_per_page)
-        rolling_stock = paginator.get_page(page)
+        data = []
+        for item in rolling_stock:
+            data.append({
+                "type": "rolling_stock",
+                "item": item
+            })
+
+        if _filter == "tag":
+            consists = (
+                Consist.objects.filter(query)
+                .distinct()
+            )
+            for item in consists:
+                data.append({
+                    "type": "consist",
+                    "item": item
+                })
+            books = (
+                Book.objects.filter(query)
+                .distinct()
+            )
+            for item in books:
+                data.append({
+                    "type": "book",
+                    "item": item
+                })
+
+        paginator = Paginator(data, site_conf.items_per_page)
+        data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
-            rolling_stock.number, on_each_side=2, on_ends=1
+            data.number, on_each_side=2, on_ends=1
         )
 
-        return rolling_stock, title, matches, page_range
+        return data, title, paginator.count, page_range
 
     def get(self, request, search, _filter, page=1):
         data, title, matches, page_range = self.run_filter(
@@ -223,8 +281,8 @@ class GetRosterFiltered(View):
                     _filter.capitalize(), title),
                 "search": search,
                 "filter": _filter,
-                "matches": matches,
                 "data": data,
+                "matches": matches,
                 "page_range": page_range,
             },
         )
@@ -272,8 +330,8 @@ class GetRollingStock(View):
 class Consists(GetData):
     def __init__(self):
         self.title = "Consists"
-        self.template = "consists.html"
-        self.data = Consist.objects.all()
+        self.item_type = "consist"
+        self.queryset = Consist.objects.all()
 
 
 class GetConsist(View):
@@ -283,15 +341,15 @@ class GetConsist(View):
             consist = Consist.objects.get(uuid=uuid)
         except ObjectDoesNotExist:
             raise Http404
-        rolling_stock = [
-            RollingStock.objects.get(uuid=r.rolling_stock_id) for r in
-            consist.consist_item.all()
-        ]
+        data = [{
+            "type": "rolling_stock",
+            "item": RollingStock.objects.get(uuid=r.rolling_stock_id)
+        } for r in consist.consist_item.all()]
 
-        paginator = Paginator(rolling_stock, site_conf.items_per_page)
-        rolling_stock = paginator.get_page(page)
+        paginator = Paginator(data, site_conf.items_per_page)
+        data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
-            rolling_stock.number, on_each_side=2, on_ends=1
+            data.number, on_each_side=2, on_ends=1
         )
 
         return render(
@@ -300,52 +358,47 @@ class GetConsist(View):
             {
                 "title": consist,
                 "consist": consist,
-                "data": rolling_stock,
+                "data": data,
                 "page_range": page_range,
             },
         )
 
 
 class Manufacturers(GetData):
-    def __init__(self):
-        self.title = "Manufacturers"
-        self.template = "manufacturers.html"
-        self.data = None  # Set via method get
+    title = "Manufacturers"
+    item_type = "manufacturer"
+    queryset = None  # Set via method get
 
     # overload get method to filter by category
     def get(self, request, category, page=1):
         if category not in ("real", "model"):
             raise Http404
-        self.data = Manufacturer.objects.filter(category=category)
+        self.queryset = Manufacturer.objects.filter(category=category)
         return super().get(request, page)
 
 
 class Companies(GetData):
-    def __init__(self):
-        self.title = "Companies"
-        self.template = "companies.html"
-        self.data = Company.objects.all()
+    title = "Companies"
+    item_type = "company"
+    queryset = Company.objects.all()
 
 
 class Scales(GetData):
-    def __init__(self):
-        self.title = "Scales"
-        self.template = "scales.html"
-        self.data = Scale.objects.all()
+    title = "Scales"
+    item_type = "scale"
+    queryset = Scale.objects.all()
 
 
 class Types(GetData):
-    def __init__(self):
-        self.title = "Types"
-        self.template = "types.html"
-        self.data = RollingStockType.objects.all()
+    title = "Types"
+    item_type = "rolling_stock_type"
+    queryset = RollingStockType.objects.all()
 
 
 class Books(GetData):
-    def __init__(self):
-        self.title = "Books"
-        self.template = "bookshelf/books.html"
-        self.data = Book.objects.all()
+    title = "Books"
+    item_type = "book"
+    queryset = Book.objects.all()
 
 
 class GetBook(View):
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 6754000..5bb1134 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"
 __version__ += git_suffix(__file__)
diff --git a/ram/ram/admin.py b/ram/ram/admin.py
index 2edd0ff..2289a37 100644
--- a/ram/ram/admin.py
+++ b/ram/ram/admin.py
@@ -1,10 +1,10 @@
 from django.contrib import admin
-from django.db.utils import OperationalError
+from django.db.utils import OperationalError, ProgrammingError
 from portal.utils import get_site_conf
 
 try:
     site_name = get_site_conf().site_name
-except OperationalError:
+except (OperationalError, ProgrammingError):
     site_name = "Train Assets Manager"
 
 admin.site.site_header = site_name