Replace thumbnails with carousels in rolling stock pages (#15)

* Replace thumbnails with carousels in rolling stock pages

* Add consist data and notes in page

.github/workflows/django.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: ['3.9', '3.10']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v3

README.md

@@ -21,7 +21,7 @@ it has been developed with a commitment of few minutes a day;
 it lacks any kind of documentation, code review, architectural review,
 security assesment, pentest, ISO certification, etc.
 
-This project probably doesn't match you needs nor expectations. Be aware.
+This project probably doesn't match your needs nor expectations. Be aware.
 
 Your model train may also catch fire while using this software.
 
@@ -49,7 +49,7 @@ It has been developed with:
 
 ## Requirements
 
-- Python 3.8+
+- Python 3.9+
 - A USB port when running Arduino hardware (and adaptors if you have a Mac)
 
 ## Web portal installation

ram/consist/migrations/0008_alter_consist_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.3 on 2023-01-02 15:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("consist", "0007_alter_consist_image"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="consist",
+            options={"ordering": ["company", "-creation_time"]},
+        ),
+    ]

ram/consist/models.py

@@ -32,7 +32,7 @@ class Consist(models.Model):
         return reverse("consist", kwargs={"uuid": self.uuid})
 
     class Meta:
-        ordering = ["creation_time"]
+        ordering = ["company", "-creation_time"]
 
 
 class ConsistItem(models.Model):

ram/portal/templates/base.html

@@ -49,7 +49,7 @@
             </svg>
             <strong>{{ site_conf.site_name }}</strong>
           </a>
-          <div class="btn-group" role="group" aria-label="Basic example">
+          <div class="btn-group" role="group" aria-label="Login menu">
             {% include 'includes/login.html' %}
             <a id="darkmode-button" class="btn btn-sm btn-outline-dark"><i class="fa fa-moon-o fa-fw d-none d-light-inline" title="Switch to dark mode"></i><i class="fa fa-sun-o fa-fw d-none d-dark-inline" title="Switch to light mode"></i></a>
          </div>
@@ -94,96 +94,10 @@
       <div class="album py-4 bg-light">
         <div class="container">
           <a id="rolling-stock"></a>
-          <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
-            {% block cards %}
-            {% for r in rolling_stock %}
-            <div class="col">
-              <div class="card shadow-sm">
-                {% for i in r.image.all %}
-                {% if i.is_thumbnail %}<a href="{{r.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.get_absolute_url }}"></a>
-                  </p>
-                  {% if r.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">
-                    {{ 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_class.type }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Company</th>
-                        <td><abbr title="{{ r.rolling_class.company.extended_name }}">{{ r.rolling_class.company }}</abbr></td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Class</th>
-                        <td>{{ r.rolling_class.identifier }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Road number</th>
-                        <td>{{ r.road_number }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Era</th>
-                        <td>{{ r.era }}</td>
-                      </tr>
-                      <tr>
-                        <th width="35%" scope="row">Manufacturer</th>
-                        <td>{% if r.manufacturer.website %}<a href="{{ r.manufacturer.website }}">{% endif %}{{ r.manufacturer }}{% if r.manufacturer.website %}</a>{% endif %}</th>
-                      </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>
-                      </tr>
-                      <tr>
-                        <th scope="row">SKU</th>
-                        <td>{{ r.sku }}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  {% if r.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.decoder }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Address</th>
-                        <td>{{ r.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>
-                    {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' r.pk %}">Edit</a>{% endif %}
-                  </div>
-                </div>
-              </div>
-            </div>
-            {% endfor %}
+          {% block carousel %}
+          {% endblock %}
+          {% block cards_layout %}
           {% endblock %}
-          </div>
         </div>
         <div class="container">{% block pagination %}{% endblock %}</div>
       </div>

ram/portal/templates/cards.html

@@ -0,0 +1,94 @@
+{% extends "base.html" %}
+
+      {% 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 %}
+        <div class="col">
+          <div class="card shadow-sm">
+            {% for i in r.image.all %}
+            {% if forloop.first %}<a href="{{r.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.get_absolute_url }}"></a>
+              </p>
+              {% if r.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">
+                {{ 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_class.type }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Company</th>
+                    <td><abbr title="{{ r.rolling_class.company.extended_name }}">{{ r.rolling_class.company }}</abbr></td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Class</th>
+                    <td>{{ r.rolling_class.identifier }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Road number</th>
+                    <td>{{ r.road_number }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Era</th>
+                    <td>{{ r.era }}</td>
+                  </tr>
+                  <tr>
+                    <th width="35%" scope="row">Manufacturer</th>
+                    <td>{% if r.manufacturer.website %}<a href="{{ r.manufacturer.website }}">{% endif %}{{ r.manufacturer }}{% if r.manufacturer.website %}</a>{% endif %}</th>
+                  </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>
+                  </tr>
+                  <tr>
+                    <th scope="row">SKU</th>
+                    <td>{{ r.sku }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              {% if r.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.decoder }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Address</th>
+                    <td>{{ r.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>
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' r.pk %}">Edit</a>{% endif %}
+              </div>
+            </div>
+          </div>
+        </div>
+        {% endfor %}
+      {% endblock %}
+      </div>
+      {% endblock %}

ram/portal/templates/companies.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "cards.html" %}
 
       {% block cards %}
       {% for c in company %}

ram/portal/templates/consist.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "cards.html" %}
 
       {% block header %}
       {% if consist.tags.all %}
@@ -15,7 +15,7 @@
       <div class="col">
         <div class="card shadow-sm">
           {% for i in r.rolling_stock.image.all %}
-          {% if i.is_thumbnail %}<a href="{{r.rolling_stock.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
+          {% 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;">
@@ -141,6 +141,51 @@
       <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>
+            <div class="tab-content" id="nav-tabContent">
+              <div class="tab-pane fade show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
+                <table class="table table-striped">
+                  <thead>
+                    <tr>
+                      <th colspan="2" scope="row">Data</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <th width="35%" scope="row">Company</th>
+                      <td><abbr title="{{ consist.company.extended_name }}">{{ consist.company }}</abbr></td>
+                    </tr>
+                    <tr>
+                      <th scope="row">Era</th>
+                      <td>{{ consist.era }}</td>
+                    </tr>
+                    <tr>
+                      <th scope="row">Length</th>
+                      <td>{{ rolling_stock | length }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
+                <table class="table">
+                  <thead>
+                    <tr>
+                      <th scope="row">Notes</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td>{{ consist.notes | safe }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
             <div class="d-grid gap-2 d-md-flex justify-content-md-end">
               {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:consist_consist_change' consist.pk %}">Edit</a>{% endif %}
             </div>

ram/portal/templates/consists.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "cards.html" %}
 
       {% block cards %}
       {% for c in consist %}
@@ -10,7 +10,7 @@
           {% else %}
             {% with c.consist_item.first.rolling_stock as r %}
             {% for i in r.image.all %}
-              {% if i.is_thumbnail %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
+              {% if forloop.first %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
             {% endfor %}
             {% endwith %}
           {% endif %}

ram/portal/templates/home.html

@@ -1,9 +1,8 @@
-{% extends "base.html" %}
+{% extends "cards.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">

ram/portal/templates/includes/login.html

@@ -1,9 +1,8 @@
       {% if request.user.is_staff %}
-      <div class="dropdown">
       <button class="btn btn-sm btn-outline-dark dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
         Welcome back, <strong>{{ request.user }}</strong>
       </button>
-        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenu2">
+      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
         <li><a class="dropdown-item" href="{% url 'admin:roster_rollingstock_changelist' %}">Rolling stock</a></li>
         <li><a class="dropdown-item" href="{% url 'admin:consist_consist_changelist' %}">Consists</a></li>
         <li><a class="dropdown-item" href="{% url 'admin:app_list' 'metadata' %}">Metadata</a></li>
@@ -15,7 +14,6 @@
         <li><hr class="dropdown-divider"></li>
         <li><a class="dropdown-item text-danger" href="{% url 'admin:logout' %}?next={{ request.path }}">Logout</a></li>
       </ul>
-      </div>
       {% else %}
       <a class="btn btn-sm btn-outline-dark" href="{% url 'admin:login' %}?next={{ request.path }}">Log in</a>
       {% endif %}

ram/portal/templates/page.html

@@ -10,29 +10,32 @@
         {% endif %}
         <small class="text-muted">Updated {{ rolling_stock.updated_time | date:"M d, Y H:i" }}</small>
         {% endblock %}
-        {% block cards %}
+        {% block carousel %}
+        <div id="carouselControls" class="carousel carousel-dark slide" data-bs-ride="carousel">
+          <div class="carousel-inner">
             {% for t in rolling_stock.image.all %}
-        <div class="col">
-            <a href="" data-bs-toggle="modal" data-bs-target="#pictureModal{{ forloop.counter }}"><img class="img-thumbnail" src="{{ t.image.url }}" alt="Rolling stock image"></a>
-        </div>
-        <!-- Modal -->
-        <div class="modal fade" id="pictureModal{{ forloop.counter }}" tabindex="-1" aria-labelledby="pictureModalLabel{{ forloop.counter }}" aria-hidden="true">
-          <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-              <div class="modal-header">
-                <h5 class="modal-title" id="pictureModalLabel{{ forloop.counter }}">{{ rolling_stock }}</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-              </div>
-              <div class="modal-body text-center">
-                  <img class="rounded img-fluid" src="{{ t.image.url }}" alt="Rolling stock image">
-              </div>
-              <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-              </div>
-            </div>
-          </div>
+            {% if forloop.first %}
+            <div class="carousel-item active">
+        	{% else %}
+            <div class="carousel-item">
+            {% endif %}
+              <img src="{{ t.image.url }}" class="d-block w-100 rounded img-thumbnail" alt="...">
             </div>
             {% endfor %}
+          </div>
+          {% if rolling_stock.image.count > 1 %}
+          <button class="carousel-control-prev" type="button" data-bs-target="#carouselControls" data-bs-slide="prev">
+            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+            <span class="visually-hidden">Previous</span>
+          </button>
+          <button class="carousel-control-next" type="button" data-bs-target="#carouselControls" data-bs-slide="next">
+            <span class="carousel-control-next-icon" aria-hidden="true"></span>
+            <span class="visually-hidden">Next</span>
+          </button>
+          {% endif %}
+        </div>
+        {% endblock %}
+        {% block cards %}
         {% endblock %}
         {% block extra_content %}
         <section class="py-4 text-start container">
@@ -263,7 +266,18 @@
                   </table>
                 </div>
                 <div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
-                  {{ rolling_stock.notes | safe }}
+                  <table class="table">
+                    <thead>
+                      <tr>
+                        <th scope="row">Notes</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td>{{ rolling_stock.notes | safe }}</td>
+                      </tr>
+                    </tbody>
+                  </table>
                 </div>
                 <div class="tab-pane fade" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
                   <table class="table table-striped">

ram/portal/templates/scales.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "cards.html" %}
 
       {% block cards %}
       {% for s in scale %}

ram/portal/templates/search.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "cards.html" %}
 
       {% block header %}
         <p class="lead text-muted">Results found: {{ matches }}</p>

ram/ram/__init__.py

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

ram/roster/admin.py

@@ -1,4 +1,6 @@
 from django.contrib import admin
+from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
+
 from roster.models import (
     RollingClass,
     RollingClassProperty,
@@ -35,7 +37,7 @@ class RollingStockDocInline(admin.TabularInline):
     classes = ["collapse"]
 
 
-class RollingStockImageInline(admin.TabularInline):
+class RollingStockImageInline(SortableInlineAdminMixin, admin.TabularInline):
     model = RollingStockImage
     min_num = 0
     extra = 0
@@ -93,7 +95,7 @@ class RollingJournalDocumentAdmin(admin.ModelAdmin):
 
 
 @admin.register(RollingStock)
-class RollingStockAdmin(admin.ModelAdmin):
+class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
         RollingStockPropertyInline,
         RollingStockImageInline,

ram/roster/migrations/0016_alter_rollingstockimage_options_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.1.3 on 2023-01-02 12:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("roster", "0015_alter_rollingstockimage_options"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="rollingstockimage",
+            options={"ordering": ["order"]},
+        ),
+        migrations.AddField(
+            model_name="rollingstockimage",
+            name="order",
+            field=models.PositiveIntegerField(default=0),
+        ),
+    ]

ram/roster/migrations/0017_remove_rollingstockimage_is_thumbnail.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.3 on 2023-01-02 15:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("roster", "0016_alter_rollingstockimage_options_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="rollingstockimage",
+            name="is_thumbnail",
+        ),
+    ]

ram/roster/models.py

@@ -155,13 +155,13 @@ class RollingStockDocument(models.Model):
 
 
 class RollingStockImage(models.Model):
+    order = models.PositiveIntegerField(default=0, blank=False, null=False)
     rolling_stock = models.ForeignKey(
         RollingStock, on_delete=models.CASCADE, related_name="image"
     )
     image = models.ImageField(
         upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
     )
-    is_thumbnail = models.BooleanField()
 
     def image_thumbnail(self):
         return get_image_preview(self.image.url)
@@ -171,15 +171,8 @@ class RollingStockImage(models.Model):
     def __str__(self):
         return "{0}".format(os.path.basename(self.image.name))
 
-    def save(self, **kwargs):
-        if self.is_thumbnail:
-            RollingStockImage.objects.filter(
-                rolling_stock=self.rolling_stock
-            ).update(is_thumbnail=False)
-        super().save(**kwargs)
-
     class Meta:
-        ordering = ["-is_thumbnail"]
+        ordering = ["order"]
 
 
 class RollingStockProperty(models.Model):