Major templates and views refactoring

ram/portal/templates/base.html

@@ -76,18 +76,19 @@
               <a class="navbar-brand" href="{% url 'index' %}">Home</a>
             <div class="navbar-collapse" id="navbarSupportedContent">
               <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                <li class="nav-item">
+                <li class="nav-item dropdown">
-                  <a class="nav-link" href="{% url 'index' %}">Roster</a>
+                  <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    Roster
+                  </a>
+                  <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                    <li><a class="dropdown-item" href="{% url 'roster' %}">All roster</a></li>
+                    <li><a class="dropdown-item" href="{% url 'companies' %}">Companies</a></li>
+                    <li><a class="dropdown-item" href="{% url 'scales' %}">Scales</a></li>
+                  </ul>
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="{% url 'consists' %}">Consists</a>
                 </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="{% url 'companies' %}">Companies</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="{% url 'scales' %}">Scales</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">
                     Manufacturers

ram/portal/templates/cards.html

@@ -1,22 +1,25 @@
 {% extends "base.html" %}
 
+      {% block header %}
+        <p class="lead text-muted">Results found: {{ matches }}</p>
+      {% endblock %}
       {% block cards_layout %}
       <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
       {% block cards %}
-        {% for r in rolling_stock %}
+        {% for d in data %}
         <div class="col">
           <div class="card shadow-sm">
-            {% for i in r.image.all %}
+            {% for i in d.image.all %}
-            {% if forloop.first %}<a href="{{r.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
+            {% if forloop.first %}<a href="{{d.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
             {% endfor %}
             <div class="card-body">
               <p class="card-text" style="position: relative;">
-                <strong>{{ r }}</strong>
+                <strong>{{ d }}</strong>
-                <a class="stretched-link" href="{{ r.get_absolute_url }}"></a>
+                <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
               </p>
-              {% if r.tags.all %}
+              {% if d.tags.all %}
               <p class="card-text"><small>Tags:</small>
-                {% for t in r.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                {% 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>
@@ -30,43 +33,43 @@
                 <tbody>
                   <tr>
                     <th width="35%" scope="row">Type</th>
-                    <td>{{ r.rolling_class.type }}</td>
+                    <td>{{ d.rolling_class.type }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Company</th>
                     <td>
-                      <a href="{% url 'filtered' _filter="company" search=r.rolling_class.company.safe_name %}"><abbr title="{{ r.rolling_class.company.extended_name }}">{{ r.rolling_class.company }}</abbr></a>
+                      <a href="{% url 'filtered' _filter="company" search=d.rolling_class.company.safe_name %}"><abbr title="{{ d.rolling_class.company.extended_name }}">{{ d.rolling_class.company }}</abbr></a>
                     </td>
                   </tr>
                   <tr>
                     <th scope="row">Class</th>
-                    <td>{{ r.rolling_class.identifier }}</td>
+                    <td>{{ d.rolling_class.identifier }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Road number</th>
-                    <td>{{ r.road_number }}</td>
+                    <td>{{ d.road_number }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Era</th>
-                    <td>{{ r.era }}</td>
+                    <td>{{ d.era }}</td>
                   </tr>
                   <tr>
                     <th width="35%" scope="row">Manufacturer</th>
-                    <td>{%if r.manufacturer %}
+                    <td>{%if d.manufacturer %}
-                      <a href="{% url 'filtered' _filter="manufacturer" search=r.manufacturer.safe_name %}">{{ r.manufacturer }}{% if r.manufacturer.website %}</a> <a href="{{ r.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                      <a href="{% url 'filtered' _filter="manufacturer" search=d.manufacturer.safe_name %}">{{ d.manufacturer }}{% if d.manufactured.website %}</a> <a href="{{ d.manufactured.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=r.scale %}"><abbr title="{{ r.scale.ratio }} - {{ r.scale.tracks }}">{{ r.scale }}</abbr></a></td>
+                    <td><a href="{% url 'filtered' _filter="scale" search=d.scale %}"><abbr title="{{ d.scale.ratio }} - {{ d.scale.tracks }}">{{ d.scale }}</abbr></a></td>
                   </tr>
                   <tr>
                     <th scope="row">SKU</th>
-                    <td>{{ r.sku }}</td>
+                    <td>{{ d.sku }}</td>
                   </tr>
                 </tbody>
               </table>
-              {% if r.decoder %}
+              {% if d.decoder %}
               <table class="table table-striped">
                 <thead>
                   <tr>
@@ -76,18 +79,18 @@
                 <tbody>
                   <tr>
                     <th width="35%" scope="row">Decoder</th>
-                    <td>{{ r.decoder }}</td>
+                    <td>{{ d.decoder }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Address</th>
-                    <td>{{ r.address }}</td>
+                    <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="{{r.get_absolute_url}}">Show all data</a>
+               <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' r.pk %}">Edit</a>{% endif %}
+                {% 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>

ram/portal/templates/companies.html

@@ -1,12 +1,12 @@
 {% extends "cards.html" %}
 
       {% block cards %}
-      {% for c in company %}
+      {% for d in data  %}
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
             <p class="card-text" style="position: relative;">
-              <strong>{{ c.name }}</strong>
+              <strong>{{ d.name }}</strong>
             </p>
             <table class="table table-striped">
               <thead>
@@ -15,25 +15,25 @@
                 </tr>
               </thead>
               <tbody>
-                {% if c.logo %}
+                {% if d.logo %}
                 <tr>
                   <th width="35%" scope="row">Logo</th>
-                  <td><img style="max-height: 48px" src="{{ c.logo.url }}" /></td>
+                  <td><img style="max-height: 48px" src="{{ d.logo.url }}" /></td>
                 </tr>
                 {% endif %}
                 <tr>
                   <th width="35%" scope="row">Name</th>
-                  <td>{{ c.extended_name }}</td>
+                  <td>{{ d.extended_name }}</td>
                 </tr>
                 <tr>
                   <th width="35%" scope="row">Abbreviation</th>
-                  <td>{{ c }}</td>
+                  <td>{{ d.name }}</td>
                 </tr>
                 <tr>
                   <th width="35%" scope="row">Country</th>
-                  <td>{{ c.country.name }} <img src="{{ c.country.flag }}" alt="{{ c.country }}" />
+                  <td>{{ d.country.name }} <img src="{{ d.country.flag }}" alt="{{ d.country }}" />
                 </tr>
-               {% if c.freelance %}
+               {% if d.freelance %}
                <tr>
                   <th width="35%" scope="row">Notes</th>
                   <td>A <em>freelance</em> company</td>
@@ -42,8 +42,8 @@
               </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=c %}">Show all rolling stock</a>
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="company" search=d %}">Show all rolling stock</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_company_change' c.pk %}">Edit</a>{% endif %}
+              {% 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>
@@ -51,12 +51,12 @@
       {% endfor %}
       {% endblock %}
       {% block pagination %}
-      {% if company.has_other_pages %}
+      {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if company.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'companies_pagination' page=company.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'companies_pagination' page=data.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -64,21 +64,21 @@
           </li>
           {% endif %}
           {% for i in page_range %}
-            {% if company.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-              {% if i == company.paginator.ELLIPSIS %}
+              {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
               <li class="page-item"><a class="page-link" href="{% url 'companies_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
-          {% if company.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'companies_pagination' page=company.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'companies_pagination' page=data.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/consist.html

@@ -23,105 +23,13 @@
       </div>
       {% endif %}
       {% endblock %}
-      {% block cards %}
-      {% for r in rolling_stock %}
-      <div class="col">
-        <div class="card shadow-sm">
-          {% for i in r.rolling_stock.image.all %}
-          {% if forloop.first %}<a href="{{r.rolling_stock.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
-          {% endfor %}
-          <div class="card-body">
-            <p class="card-text" style="position: relative;">
-              <strong>{{ r }}</strong>
-              <a class="stretched-link" href="{{ r.rolling_stock.get_absolute_url }}"></a>
-            </p>
-            {% if r.rolling_stock.tags.all %}
-            <p class="card-text"><small>Tags:</small>
-              {% for t in r.rolling_stock.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>
-                <tr>
-                  <th width="35%" scope="row">Type</th>
-                  <td>{{ r.rolling_stock.rolling_class.type }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Company</th>
-                  <td>
-                    <a href="{% url 'filtered' _filter="company" search=r.rolling_stock.rolling_class.company %}"><abbr title="{{ r.rolling_stock.rolling_class.company.extended_name }}">{{ r.rolling_stock.rolling_class.company }}</abbr></a>
-                  </td>
-                </tr>
-                <tr>
-                  <th scope="row">Class</th>
-                  <td>{{ r.rolling_stock.rolling_class.identifier }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Road number</th>
-                  <td>{{ r.rolling_stock.road_number }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Era</th>
-                  <td>{{ r.rolling_stock.era }}</td>
-                </tr>
-                <tr>
-                  <th width="35%" scope="row">Manufacturer</th>
-                  <td>{%if r.rolling_stock.manufacturer %}
-                    <a href="{% url 'filtered' _filter="manufacturer" search=r.rolling_stock.manufacturer.safe_name %}">{{ r.rolling_stock.manufacturer }}{% if r.rolling_stock.manufacturer.website %}</a> <a href="{{ r.rolling_stock.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=r.rolling_stock.scale %}"><abbr title="{{ r.rolling_stock.scale.ratio }} - {{ r.rolling_stock.scale.tracks }}">{{ r.rolling_stock.scale }}</abbr></a></td>
-                </tr>
-                <tr>
-                  <th scope="row">SKU</th>
-                  <td>{{ r.rolling_stock.sku }}</td>
-                </tr>
-                </tbody>
-              </table>
-            {% if r.rolling_stock.decoder %}
-              <table class="table table-striped">
-                <thead>
-                  <tr>
-                    <th colspan="2" scope="row">DCC data</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <th width="35%" scope="row">Decoder</th>
-                    <td>{{ r.rolling_stock.decoder }}</td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Address</th>
-                    <td>{{ r.rolling_stock.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="{{r.rolling_stock.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' r.rolling_stock.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
-      {% if rolling_stock.has_other_pages %}
+      {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if rolling_stock.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=rolling_stock.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=data.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -129,21 +37,21 @@
           </li>
           {% endif %}
           {% for i in page_range %}
-            {% if rolling_stock.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-              {% if i == rolling_stock.paginator.ELLIPSIS %}
+              {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
               <li class="page-item"><a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
-          {% if rolling_stock.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=rolling_stock.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=data.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -183,7 +91,7 @@
                     </tr>
                     <tr>
                       <th scope="row">Length</th>
-                      <td>{{ rolling_stock | length }}</td>
+                      <td>{{ data | length }}</td>
                     </tr>
                   </tbody>
                 </table>

ram/portal/templates/consists.html

@@ -1,14 +1,14 @@
 {% extends "cards.html" %}
 
       {% block cards %}
-      {% for c in consist %}
+      {% for d in data %}
       <div class="col">
         <div class="card shadow-sm">
-          <a href="{{ c.get_absolute_url }}">
+          <a href="{{ d.get_absolute_url }}">
-          {% if c.image %}
+          {% if d.image %}
-            <img src="{{ c.image.url }}" alt="Card image cap">
+            <img src="{{ d.image.url }}" alt="Card image cap">
           {% else %}
-            {% with c.consist_item.first.rolling_stock as r %}
+            {% 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 %}
@@ -17,12 +17,12 @@
           </a>
           <div class="card-body">
             <p class="card-text" style="position: relative;">
-              <strong>{{ c }}</strong>
+              <strong>{{ d }}</strong>
-              <a class="stretched-link" href="{{ c.get_absolute_url }}"></a>
+              <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
             </p>
-            {% if c.tags.all %}
+            {% if d.tags.all %}
             <p class="card-text"><small>Tags:</small>
-              {% for t in c.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+              {% 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>
@@ -34,29 +34,29 @@
                 </tr>
               </thead>
               <tbody>
-                {% if c.address %}
+                {% if d.address %}
                 <tr>
                   <th width="35%" scope="row">Address</th>
-                  <td>{{ c.address }}</td>
+                  <td>{{ d.address }}</td>
                 </tr>
                 {% endif %}
                 <tr>
                   <th width="35%" scope="row">Company</th>
-                  <td><abbr title="{{ c.company.extended_name }}">{{ c.company }}</abbr></td>
+                  <td><abbr title="{{ d.company.extended_name }}">{{ d.company }}</abbr></td>
                 </tr>
                 <tr>
                   <th scope="row">Era</th>
-                  <td>{{ c.era }}</td>
+                  <td>{{ d.era }}</td>
                 </tr>
                 <tr>
                   <th scope="row">Length</th>
-                  <td>{{ c.consist_item.all | length }}</td>
+                  <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="{{ c.get_absolute_url }}">Show all data</a>
+             <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' c.pk %}">Edit</a>{% endif %}
+              {% 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>

ram/portal/templates/home.html

@@ -1,44 +1,5 @@
-{% extends "cards.html" %}
+{% extends "roster.html" %}
 
       {% block header %}
         <p class="lead text-muted">{{ site_conf.about | safe }}</p>
       {% endblock %}
-      {% block pagination %}
-      {% if rolling_stock.has_other_pages %}
-      <nav aria-label="Page navigation example">
-        <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if rolling_stock.has_previous %}
-          <li class="page-item">
-            <a class="page-link" href="{% url 'index_pagination' page=rolling_stock.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
-          </li>
-          {% else %}
-          <li class="page-item disabled">
-            <span class="page-link">Previous</span>
-          </li>
-          {% endif %}
-          {% for i in page_range %}
-            {% if rolling_stock.number == i %}
-            <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
-            </li>
-            {% else %}
-              {% if i == rolling_stock.paginator.ELLIPSIS %}
-              <li class="page-item"><span class="page-link">{{ i }}</span></li>
-              {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'index_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
-              {% endif %}
-            {% endif %}
-          {% endfor %}
-          {% if rolling_stock.has_next %}
-          <li class="page-item">
-            <a class="page-link" href="{% url 'index_pagination' page=rolling_stock.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
-          </li>
-          {% else %}
-          <li class="page-item disabled">
-            <span class="page-link">Next</span>
-          </li>
-          {% endif %}
-        </ul>
-      </nav>
-      {% endif %}
-      {% endblock %}

ram/portal/templates/manufacturers.html

@@ -1,12 +1,12 @@
 {% extends "cards.html" %}
 
       {% block cards %}
-      {% for m in manufacturers %}
+      {% for d in data %}
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
             <p class="card-text" style="position: relative;">
-              <strong>{{ m.name }}</strong>
+              <strong>{{ d.name }}</strong>
             </p>
             <table class="table table-striped">
               <thead>
@@ -15,27 +15,27 @@
                 </tr>
               </thead>
               <tbody>
-                {% if m.logo %}
+                {% if d.logo %}
                 <tr>
                   <th width="35%" scope="row">Logo</th>
-                  <td><img style="max-height: 48px" src="{{ m.logo.url }}" /></td>
+                  <td><img style="max-height: 48px" src="{{ d.logo.url }}" /></td>
                 </tr>
                 {% endif %}
-                {% if m.website %}
+                {% if d.website %}
                 <tr>
                   <th width="35%" scope="row">Website</th>
-                  <td><a href="{{ m.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a></td>
+                  <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>
-                  <td>{{ m.category | title }}</td>
+                  <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=m.safe_name %}">Show all rolling stock</a>
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="manufacturer" search=d.safe_name %}">Show all rolling stock</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_manufacturer_change' m.pk %}">Edit</a>{% endif %}
+              {% 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>

ram/portal/templates/roster.html

@@ -0,0 +1,41 @@
+{% extends "cards.html" %}
+
+      {% block pagination %}
+      {% if data.has_other_pages %}
+      <nav aria-label="Page navigation example">
+        <ul class="pagination justify-content-center mt-4 mb-0">
+          {% if data.has_previous %}
+          <li class="page-item">
+            <a class="page-link" href="{% url 'roster_pagination' page=data.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+          </li>
+          {% else %}
+          <li class="page-item disabled">
+            <span class="page-link">Previous</span>
+          </li>
+          {% endif %}
+          {% for i in page_range %}
+            {% if data.number == i %}
+            <li class="page-item active">
+              <span class="page-link">{{ i }}</span></span>
+            </li>
+            {% else %}
+              {% if i == data.paginator.ELLIPSIS %}
+              <li class="page-item"><span class="page-link">{{ i }}</span></li>
+              {% else %}
+              <li class="page-item"><a class="page-link" href="{% url 'roster_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
+              {% endif %}
+            {% endif %}
+          {% endfor %}
+          {% if data.has_next %}
+          <li class="page-item">
+            <a class="page-link" href="{% url 'roster_pagination' page=data.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+          </li>
+          {% else %}
+          <li class="page-item disabled">
+            <span class="page-link">Next</span>
+          </li>
+          {% endif %}
+        </ul>
+      </nav>
+      {% endif %}
+      {% endblock %}

ram/portal/templates/scales.html

@@ -1,11 +1,11 @@
 {% extends "cards.html" %}
 
       {% block cards %}
-      {% for s in scale %}
+      {% for d in data %}
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
-            <p class="card-text"><strong>{{ s }}</strong></p>
+            <p class="card-text"><strong>{{ d }}</strong></p>
             <table class="table table-striped">
               <thead>
                 <tr>
@@ -15,25 +15,25 @@
               <tbody>
                 <tr>
                   <th width="35%" scope="row">Name</th>
-                  <td>{{ s.scale }}</td>
+                  <td>{{ d.scale }}</td>
                 </tr>
                 <tr>
                   <th width="35%" scope="row">Ratio</th>
-                  <td>{{ s.ratio }}</td>
+                  <td>{{ d.ratio }}</td>
                 </tr>
                 <tr>
                   <th width="35%" scope="row">Gauge</th>
-                  <td>{{ s.gauge }}</td>
+                  <td>{{ d.gauge }}</td>
                 </tr>
                 <tr>
                   <th width="35%" scope="row">Tracks</th>
-                  <td>{{ s.tracks }}</td>
+                  <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=s %}">Show all rolling stock</a>
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="scale" search=d %}">Show all rolling stock</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_scale_change' s.pk %}">Edit</a>{% endif %}
+              {% 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>
@@ -41,12 +41,12 @@
       {% endfor %}
       {% endblock %}
       {% block pagination %}
-      {% if scale.has_other_pages %}
+      {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if scale.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'scale_pagination' page=scale.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'scales_pagination' page=data.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -54,21 +54,21 @@
           </li>
           {% endif %}
           {% for i in page_range %}
-            {% if scale.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-              {% if i == scale.paginator.ELLIPSIS %}
+              {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'scale_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'scales_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
-          {% if scale.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'scale_pagination' page=scale.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'scales_pagination' page=data.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/search.html

@@ -4,12 +4,12 @@
         <p class="lead text-muted">Results found: {{ matches }}</p>
       {% endblock %}
       {% block pagination %}
-      {% if rolling_stock.has_other_pages %}
+      {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if rolling_stock.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=rolling_stock.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=data.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -17,21 +17,21 @@
           </li>
           {% endif %}
           {% for i in page_range %}
-            {% if rolling_stock.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-              {% if i == rolling_stock.paginator.ELLIPSIS %}
+              {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
               <li class="page-item"><a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
-          {% if rolling_stock.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=rolling_stock.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=data.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/urls.py

@@ -1,8 +1,9 @@
 from django.urls import path
 
 from portal.views import (
-    GetHome,
+    GetData,
-    GetHomeFiltered,
+    GetRoster,
+    GetRosterFiltered,
     GetFlatpage,
     GetRollingStock,
     GetConsist,
@@ -13,8 +14,9 @@ from portal.views import (
 )
 
 urlpatterns = [
-    path("", GetHome.as_view(), name="index"),
+    path("", GetData.as_view(), name="index"),
-    path("<int:page>", GetHome.as_view(), name="index_pagination"),
+    path("roster", GetRoster.as_view(), name="roster"),
+    path("roster/<int:page>", GetRoster.as_view(), name="roster_pagination"),
     path(
         "page/<str:flatpage>",
         GetFlatpage.as_view(),
@@ -22,7 +24,7 @@ urlpatterns = [
     ),
     path(
         "search",
-        GetHomeFiltered.as_view(http_method_names=["post"]),
+        GetRosterFiltered.as_view(http_method_names=["post"]),
         name="search",
     ),
     path("consists", Consists.as_view(), name="consists"),
@@ -55,12 +57,12 @@ urlpatterns = [
     path("scales/<int:page>", Scales.as_view(), name="scales_pagination"),
     path(
         "<str:_filter>/<str:search>",
-        GetHomeFiltered.as_view(),
+        GetRosterFiltered.as_view(),
         name="filtered",
     ),
     path(
         "<str:_filter>/<str:search>/<int:page>",
-        GetHomeFiltered.as_view(),
+        GetRosterFiltered.as_view(),
         name="filtered_pagination",
     ),
     path("<uuid:uuid>", GetRollingStock.as_view(), name="rolling_stock"),

ram/portal/views.py

@@ -33,29 +33,41 @@ def order_by_fields():
         return (fields[2], fields[0], fields[1], fields[3])
 
 
-class GetHome(View):
+class GetData(View):
+    def __init__(self):
+        self.title = "Home"
+        self.template = "home.html"
+        self.data = RollingStock.objects.order_by(*order_by_fields())
+
     def get(self, request, page=1):
         site_conf = get_site_conf()
-        rolling_stock = RollingStock.objects.order_by(*order_by_fields())
 
-        paginator = Paginator(rolling_stock, site_conf.items_per_page)
+        paginator = Paginator(self.data, site_conf.items_per_page)
-        rolling_stock = paginator.get_page(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(
             request,
-            "home.html",
+            self.template,
             {
-                "title": "Home",
+                "title": self.title,
-                "rolling_stock": rolling_stock,
+                "data": data,
+                "matches": paginator.count,
                 "page_range": page_range,
             },
         )
 
 
-class GetHomeFiltered(View):
+class GetRoster(GetData):
+    def __init__(self):
+        self.title = "Roster"
+        self.template = "roster.html"
+        self.data = RollingStock.objects.order_by(*order_by_fields())
+
+
+class GetRosterFiltered(View):
     def run_search(self, request, search, _filter, page=1):
         site_conf = get_site_conf()
         if _filter == "search":
@@ -93,12 +105,13 @@ class GetHomeFiltered(View):
             query = Q(tags__slug__iexact=search)
         else:
             raise Http404
+
         rolling_stock = (
             RollingStock.objects.filter(query)
             .distinct()
             .order_by(*order_by_fields())
         )
-        matches = len(rolling_stock)
+        matches = rolling_stock.count()
 
         paginator = Paginator(rolling_stock, site_conf.items_per_page)
         rolling_stock = paginator.get_page(page)
@@ -124,7 +137,7 @@ class GetHomeFiltered(View):
                 "search_unsafe": search_unsafe,
                 "filter": _filter,
                 "matches": matches,
-                "rolling_stock": rolling_stock,
+                "data": rolling_stock,
                 "page_range": page_range,
             },
         )
@@ -148,7 +161,7 @@ class GetHomeFiltered(View):
                 # "search_unsafe": search_unsafe,
                 "filter": _filter,
                 "matches": matches,
-                "rolling_stock": rolling_stock,
+                "data": rolling_stock,
                 "page_range": page_range,
             },
         )
@@ -193,26 +206,11 @@ class GetRollingStock(View):
         )
 
 
-class Consists(View):
+class Consists(GetData):
-    def get(self, request, page=1):
+    def __init__(self):
-        site_conf = get_site_conf()
+        self.title = "Consists"
-        consist = Consist.objects.all()
+        self.template = "consists.html"
-
+        self.data = Consist.objects.all()
-        paginator = Paginator(consist, site_conf.items_per_page)
-        consist = paginator.get_page(page)
-        page_range = paginator.get_elided_page_range(
-            consist.number, on_each_side=2, on_ends=1
-        )
-
-        return render(
-            request,
-            "consists.html",
-            {
-                "title": "Consists",
-                "consist": consist,
-                "page_range": page_range,
-            },
-        )
 
 
 class GetConsist(View):
@@ -222,7 +220,10 @@ class GetConsist(View):
             consist = Consist.objects.get(uuid=uuid)
         except ObjectDoesNotExist:
             raise Http404
-        rolling_stock = consist.consist_item.all()
+        rolling_stock = [
+            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)
@@ -236,75 +237,38 @@ class GetConsist(View):
             {
                 "title": consist,
                 "consist": consist,
-                "rolling_stock": rolling_stock,
+                "data": rolling_stock,
                 "page_range": page_range,
             },
         )
 
 
-class Manufacturers(View):
+class Manufacturers(GetData):
+    def __init__(self):
+        self.title = "Manufacturers"
+        self.template = "manufacturers.html"
+        self.data = None  # Set via method get
+
+    # overload get method to filter by category
     def get(self, request, category, page=1):
-        site_conf = get_site_conf()
         if category not in ("real", "model"):
             raise Http404
-        manufacturers = Manufacturer.objects.filter(category=category)
+        self.data = Manufacturer.objects.filter(category=category)
-
+        return super().get(request, page)
-        paginator = Paginator(manufacturers, site_conf.items_per_page)
-        manufacturers = paginator.get_page(page)
-        page_range = paginator.get_elided_page_range(
-            manufacturers.number, on_each_side=2, on_ends=1
-        )
-
-        return render(
-            request,
-            "manufacturers.html",
-            {
-                "title": "Manufacturers",
-                "category": category,
-                "manufacturers": manufacturers,
-                "page_range": page_range,
-            },
-        )
 
 
-class Companies(View):
+class Companies(GetData):
-    def get(self, request, page=1):
+    def __init__(self):
-        site_conf = get_site_conf()
+        self.title = "Companies"
-        company = Company.objects.all()
+        self.template = "companies.html"
-
+        self.data = Company.objects.all()
-        paginator = Paginator(company, site_conf.items_per_page)
-        company = paginator.get_page(page)
-        page_range = paginator.get_elided_page_range(
-            company.number, on_each_side=2, on_ends=1
-        )
-
-        return render(
-            request,
-            "companies.html",
-            {
-                "title": "Companies",
-                "company": company,
-                "page_range": page_range,
-            },
-        )
 
 
-class Scales(View):
+class Scales(GetData):
-    def get(self, request, page=1):
+    def __init__(self):
-        site_conf = get_site_conf()
+        self.title = "Scales"
-        scale = Scale.objects.all()
+        self.template = "scales.html"
-
+        self.data = Scale.objects.all()
-        paginator = Paginator(scale, site_conf.items_per_page)
-        scale = paginator.get_page(page)
-        page_range = paginator.get_elided_page_range(
-            scale.number, on_each_side=2, on_ends=1
-        )
-
-        return render(
-            request,
-            "scales.html",
-            {"title": "Scales", "scale": scale, "page_range": page_range},
-        )
 
 
 class GetFlatpage(View):

ram/ram/__init__.py

@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.0.29"
+__version__ = "0.1.0"
 __version__ += git_suffix(__file__)