Fully implement UI for magazines

.gitignore

@@ -127,11 +127,6 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# node.js / npm stuff
-node_modules
-package-lock.json
-
-# our own stuff
 *.swp
 ram/storage/
 !ram/storage/.gitignore

docs/nginx/nginx.conf

@@ -1,43 +0,0 @@
-server {
-    listen       [::]:443 ssl;
-    listen       443 ssl;
-    server_name  myhost;
-
-    # ssl_certificate ...;
-
-    add_header X-Xss-Protection "1; mode=block";
-    add_header Strict-Transport-Security "max-age=15768000";
-    add_header Permissions-Policy "geolocation=(),midi=(),sync-xhr=(),microphone=(),camera=(),magnetometer=(),gyroscope=(),fullscreen=(self),payment=()";
-    add_header Content-Security-Policy "child-src 'none'; object-src 'none'";
-
-    client_max_body_size 250M;
-    error_page  403 404 https://$server_name/404;
-
-    location / {
-        proxy_pass               http://127.0.0.1:8000;
-        proxy_set_header         Host              $host;
-        proxy_set_header         X-Real-IP         $remote_addr;
-        proxy_set_header         X-Forwarded-For   $proxy_add_x_forwarded_for;
-        proxy_set_header         X-Forwarded-Proto $scheme;
-        proxy_redirect           http:// https://;
-        proxy_connect_timeout    1800;
-        proxy_read_timeout       1800;
-        proxy_max_temp_file_size 8192m;
-    }
-
-    # static files
-    location /static {
-        root /myroot/ram/storage;
-    }
-
-    # media files
-    location ~ ^/media/(images|uploads) {
-        root /myroot/ram/storage;
-    }
-
-    # protected filed to be served via X-Accel-Redirect
-    location /private {
-    	internal;
-        alias /myroot/ram/storage/media;
-    }
-}

package.json

@@ -1,6 +0,0 @@
-{
-  "dependencies": {
-    "clean-css-cli": "^5.6.3",
-    "terser": "^5.44.1"
-  }
-}

ram/bookshelf/admin.py

@@ -2,12 +2,7 @@ import html
 
 from django.conf import settings
 from django.contrib import admin
-from django.utils.html import (
-    format_html,
-    format_html_join,
-    strip_tags,
-    mark_safe,
-)
+from django.utils.html import format_html, format_html_join, strip_tags
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
 from ram.admin import publish, unpublish
@@ -16,7 +11,7 @@ from portal.utils import get_site_conf
 from repository.models import (
     BookDocument,
     CatalogDocument,
-    MagazineIssueDocument,
+    MagazineIssueDocument
 )
 from bookshelf.models import (
     BaseBookProperty,
@@ -27,14 +22,13 @@ from bookshelf.models import (
     Catalog,
     Magazine,
     MagazineIssue,
-    TocEntry,
 )
 
 
 class BookImageInline(SortableInlineAdminMixin, admin.TabularInline):
     model = BaseBookImage
     min_num = 0
-    extra = 1
+    extra = 0
     readonly_fields = ("image_thumbnail",)
     classes = ["collapse"]
     verbose_name = "Image"
@@ -52,7 +46,7 @@ class BookPropertyInline(admin.TabularInline):
 class BookDocInline(admin.TabularInline):
     model = BookDocument
     min_num = 0
-    extra = 1
+    extra = 0
     classes = ["collapse"]
 
 
@@ -64,23 +58,9 @@ class MagazineIssueDocInline(BookDocInline):
     model = MagazineIssueDocument
 
 
-class BookTocInline(admin.TabularInline):
-    model = TocEntry
-    min_num = 0
-    extra = 0
-    fields = (
-        "title",
-        "subtitle",
-        "authors",
-        "page",
-        "featured",
-    )
-
-
 @admin.register(Book)
 class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
-        BookTocInline,
         BookPropertyInline,
         BookImageInline,
         BookDocInline,
@@ -154,9 +134,9 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     def invoices(self, obj):
         if obj.invoice.exists():
             html = format_html_join(
-                mark_safe("<br>"),
-                '<a href="{}" target="_blank">{}</a>',
-                ((i.file.url, i) for i in obj.invoice.all()),
+                "<br>",
+                "<a href=\"{}\" target=\"_blank\">{}</a>",
+                ((i.file.url, i) for i in obj.invoice.all())
             )
         else:
             html = "-"
@@ -232,11 +212,11 @@ class AuthorAdmin(admin.ModelAdmin):
 
 @admin.register(Publisher)
 class PublisherAdmin(admin.ModelAdmin):
-    list_display = ("name", "country_flag_name")
+    list_display = ("name", "country_flag")
     search_fields = ("name",)
 
     @admin.display(description="Country")
-    def country_flag_name(self, obj):
+    def country_flag(self, obj):
         return format_html(
             '<img src="{}" /> {}', obj.country.flag, obj.country.name
         )
@@ -260,10 +240,10 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
     readonly_fields = ("invoices", "creation_time", "updated_time")
     search_fields = ("manufacturer__name", "years", "scales__scale")
     list_filter = (
-        "published",
         "manufacturer__name",
         "publication_year",
         "scales__scale",
+        "published",
     )
 
     fieldsets = (
@@ -322,9 +302,9 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
     def invoices(self, obj):
         if obj.invoice.exists():
             html = format_html_join(
-                mark_safe("<br>"),
-                '<a href="{}" target="_blank">{}</a>',
-                ((i.file.url, i) for i in obj.invoice.all()),
+                "<br>",
+                "<a href=\"{}\" target=\"_blank\">{}</a>",
+                ((i.file.url, i) for i in obj.invoice.all())
             )
         else:
             html = "-"
@@ -386,7 +366,6 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
 @admin.register(MagazineIssue)
 class MagazineIssueAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
-        BookTocInline,
         BookPropertyInline,
         BookImageInline,
         MagazineIssueDocInline,
@@ -470,12 +449,14 @@ class MagazineIssueInline(admin.TabularInline):
     readonly_fields = ("preview",)
 
     class Media:
-        js = ("admin/js/magazine_issue_defaults.js",)
+        js = ('admin/js/magazine_issue_defaults.js',)
 
 
 @admin.register(Magazine)
 class MagazineAdmin(SortableAdminBase, admin.ModelAdmin):
-    inlines = (MagazineIssueInline,)
+    inlines = (
+        MagazineIssueInline,
+    )
 
     list_display = (
         "__str__",
@@ -485,10 +466,7 @@ class MagazineAdmin(SortableAdminBase, admin.ModelAdmin):
     autocomplete_fields = ("publisher",)
     readonly_fields = ("creation_time", "updated_time")
     search_fields = ("name", "publisher__name")
-    list_filter = (
-        "published",
-        "publisher__name",
-    )
+    list_filter = ("publisher__name", "published")
 
     fieldsets = (
         (
@@ -497,7 +475,6 @@ class MagazineAdmin(SortableAdminBase, admin.ModelAdmin):
                 "fields": (
                     "published",
                     "name",
-                    "website",
                     "publisher",
                     "ISBN",
                     "language",

ram/bookshelf/migrations/0027_magazine_website.py

@@ -1,18 +0,0 @@
-# Generated by Django 6.0 on 2025-12-12 14:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0026_alter_basebook_language_alter_magazine_image_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="magazine",
-            name="website",
-            field=models.URLField(blank=True),
-        ),
-    ]

ram/bookshelf/migrations/0028_alter_magazine_options_alter_magazineissue_options.py

@@ -1,29 +0,0 @@
-# Generated by Django 6.0 on 2025-12-21 21:56
-
-import django.db.models.functions.text
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0027_magazine_website"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="magazine",
-            options={"ordering": [django.db.models.functions.text.Lower("name")]},
-        ),
-        migrations.AlterModelOptions(
-            name="magazineissue",
-            options={
-                "ordering": [
-                    "magazine",
-                    "publication_year",
-                    "publication_month",
-                    "issue_number",
-                ]
-            },
-        ),
-    ]

ram/bookshelf/migrations/0029_alter_catalog_manufacturer_alter_catalog_scales.py

@@ -1,29 +0,0 @@
-# Generated by Django 6.0 on 2025-12-23 11:18
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0028_alter_magazine_options_alter_magazineissue_options"),
-        ("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="catalog",
-            name="manufacturer",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="catalogs",
-                to="metadata.manufacturer",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="catalog",
-            name="scales",
-            field=models.ManyToManyField(related_name="catalogs", to="metadata.scale"),
-        ),
-    ]

ram/bookshelf/migrations/0030_tocentry.py

@@ -1,53 +0,0 @@
-# Generated by Django 6.0 on 2025-12-29 11:02
-
-import django.db.models.deletion
-import tinymce.models
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0029_alter_catalog_manufacturer_alter_catalog_scales"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="TocEntry",
-            fields=[
-                (
-                    "uuid",
-                    models.UUIDField(
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                    ),
-                ),
-                ("description", tinymce.models.HTMLField(blank=True)),
-                ("notes", tinymce.models.HTMLField(blank=True)),
-                ("creation_time", models.DateTimeField(auto_now_add=True)),
-                ("updated_time", models.DateTimeField(auto_now=True)),
-                ("published", models.BooleanField(default=True)),
-                ("title", models.CharField(max_length=200)),
-                ("subtitle", models.CharField(blank=True, max_length=200)),
-                ("authors", models.CharField(blank=True, max_length=256)),
-                ("page", models.SmallIntegerField()),
-                ("featured", models.BooleanField(default=False)),
-                (
-                    "book",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="toc",
-                        to="bookshelf.basebook",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Table of Contents Entry",
-                "verbose_name_plural": "Table of Contents Entries",
-                "ordering": ["page"],
-            },
-        ),
-    ]

ram/bookshelf/migrations/0031_alter_tocentry_authors_alter_tocentry_subtitle_and_more.py

@@ -1,28 +0,0 @@
-# Generated by Django 6.0 on 2025-12-31 13:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0030_tocentry"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="tocentry",
-            name="authors",
-            field=models.CharField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name="tocentry",
-            name="subtitle",
-            field=models.CharField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name="tocentry",
-            name="title",
-            field=models.CharField(),
-        ),
-    ]

ram/bookshelf/models.py

@@ -1,11 +1,9 @@
 import os
 import shutil
-from urllib.parse import urlparse
 from django.db import models
 from django.conf import settings
 from django.urls import reverse
 from django.utils.dates import MONTHS
-from django.db.models.functions import Lower
 from django.core.exceptions import ValidationError
 from django_countries.fields import CountryField
 
@@ -60,24 +58,36 @@ class BaseBook(BaseModel):
         blank=True,
     )
     purchase_date = models.DateField(null=True, blank=True)
-    tags = models.ManyToManyField(Tag, related_name="bookshelf", blank=True)
+    tags = models.ManyToManyField(
+        Tag, related_name="bookshelf", blank=True
+    )
 
     def delete(self, *args, **kwargs):
         shutil.rmtree(
             os.path.join(
                 settings.MEDIA_ROOT, "images", "books", str(self.uuid)
             ),
-            ignore_errors=True,
+            ignore_errors=True
         )
         super(BaseBook, self).delete(*args, **kwargs)
 
 
 def book_image_upload(instance, filename):
-    return os.path.join("images", "books", str(instance.book.uuid), filename)
+    return os.path.join(
+        "images",
+        "books",
+        str(instance.book.uuid),
+        filename
+    )
 
 
 def magazine_image_upload(instance, filename):
-    return os.path.join("images", "magazines", str(instance.uuid), filename)
+    return os.path.join(
+        "images",
+        "magazines",
+        str(instance.uuid),
+        filename
+    )
 
 
 class BaseBookImage(Image):
@@ -121,7 +131,8 @@ class Book(BaseBook):
 
     def get_absolute_url(self):
         return reverse(
-            "bookshelf_item", kwargs={"selector": "book", "uuid": self.uuid}
+            "bookshelf_item",
+            kwargs={"selector": "book", "uuid": self.uuid}
         )
 
 
@@ -129,10 +140,9 @@ class Catalog(BaseBook):
     manufacturer = models.ForeignKey(
         Manufacturer,
         on_delete=models.CASCADE,
-        related_name="catalogs",
     )
     years = models.CharField(max_length=12)
-    scales = models.ManyToManyField(Scale, related_name="catalogs")
+    scales = models.ManyToManyField(Scale)
 
     class Meta:
         ordering = ["manufacturer", "publication_year"]
@@ -147,19 +157,18 @@ class Catalog(BaseBook):
 
     def get_absolute_url(self):
         return reverse(
-            "bookshelf_item", kwargs={"selector": "catalog", "uuid": self.uuid}
+            "bookshelf_item",
+            kwargs={"selector": "catalog", "uuid": self.uuid}
         )
 
     def get_scales(self):
         return "/".join([s.scale for s in self.scales.all()])
-
     get_scales.short_description = "Scales"
 
 
 class Magazine(BaseModel):
     name = models.CharField(max_length=200)
     publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
-    website = models.URLField(blank=True)
     ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
     image = models.ImageField(
         blank=True,
@@ -169,40 +178,32 @@ class Magazine(BaseModel):
     language = models.CharField(
         max_length=7,
         choices=sorted(settings.LANGUAGES, key=lambda s: s[1]),
-        default="en",
+        default='en'
+    )
+    tags = models.ManyToManyField(
+        Tag, related_name="magazine", blank=True
     )
-    tags = models.ManyToManyField(Tag, related_name="magazine", blank=True)
 
     def delete(self, *args, **kwargs):
         shutil.rmtree(
             os.path.join(
                 settings.MEDIA_ROOT, "images", "magazines", str(self.uuid)
             ),
-            ignore_errors=True,
+            ignore_errors=True
         )
         super(Magazine, self).delete(*args, **kwargs)
 
     class Meta:
-        ordering = [Lower("name")]
+        ordering = ["name"]
 
     def __str__(self):
         return self.name
 
     def get_absolute_url(self):
-        return reverse("magazine", kwargs={"uuid": self.uuid})
-
-    def get_cover(self):
-        if self.image:
-            return self.image
-        else:
-            cover_issue = self.issue.filter(published=True).first()
-            if cover_issue and cover_issue.image.exists():
-                return cover_issue.image.first().image
-        return None
-
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
+        return reverse(
+            "magazine",
+            kwargs={"uuid": self.uuid}
+        )
 
 
 class MagazineIssue(BaseBook):
@@ -211,17 +212,14 @@ class MagazineIssue(BaseBook):
     )
     issue_number = models.CharField(max_length=100)
     publication_month = models.SmallIntegerField(
-        null=True, blank=True, choices=MONTHS.items()
+        null=True,
+        blank=True,
+        choices=MONTHS.items()
     )
 
     class Meta:
         unique_together = ("magazine", "issue_number")
-        ordering = [
-            "magazine",
-            "publication_year",
-            "publication_month",
-            "issue_number",
-        ]
+        ordering = ["magazine", "issue_number"]
 
     def __str__(self):
         return f"{self.magazine.name} - {self.issue_number}"
@@ -233,10 +231,6 @@ class MagazineIssue(BaseBook):
                 "published."
             )
 
-    @property
-    def obj_label(self):
-        return "Magazine Issue"
-
     def preview(self):
         return self.image.first().image_thumbnail(100)
 
@@ -246,43 +240,9 @@ class MagazineIssue(BaseBook):
 
     def get_absolute_url(self):
         return reverse(
-            "issue", kwargs={"uuid": self.uuid, "magazine": self.magazine.uuid}
+            "issue",
+            kwargs={
+                "uuid": self.uuid,
+                "magazine": self.magazine.uuid
+            }
         )
-
-
-class TocEntry(BaseModel):
-    book = models.ForeignKey(
-        BaseBook, on_delete=models.CASCADE, related_name="toc"
-    )
-    title = models.CharField()
-    subtitle = models.CharField(blank=True)
-    authors = models.CharField(blank=True)
-    page = models.SmallIntegerField()
-    featured = models.BooleanField(
-        default=False,
-    )
-
-    class Meta:
-        ordering = ["page"]
-        verbose_name = "Table of Contents Entry"
-        verbose_name_plural = "Table of Contents Entries"
-
-    def __str__(self):
-        if self.subtitle:
-            title = f"{self.title}: {self.subtitle}"
-        else:
-            title = self.title
-        return f"{title} (p. {self.page})"
-
-    def clean(self):
-        if self.page is None:
-            raise ValidationError("Page number is required.")
-        if self.page < 1:
-            raise ValidationError("Page number is invalid.")
-        try:
-            if self.page > self.book.number_of_pages:
-                raise ValidationError(
-                    "Page number exceeds the publication's number of pages."
-                )
-        except TypeError:
-            pass  # number_of_pages is None

ram/bookshelf/serializers.py

@@ -49,5 +49,3 @@ class CatalogSerializer(serializers.ModelSerializer):
             "price",
         )
         read_only_fields = ("creation_time", "updated_time")
-
-# FIXME: add Magazine and MagazineIssue serializers

ram/bookshelf/views.py

@@ -38,5 +38,3 @@ class CatalogGet(RetrieveAPIView):
 
     def get_queryset(self):
         return Book.objects.get_published(self.request.user)
-
-# FIXME: add Magazine and MagazineIssue views

ram/consist/admin.py

@@ -2,7 +2,6 @@ import html
 
 from django.conf import settings
 from django.contrib import admin
-
 # from django.forms import BaseInlineFormSet  # for future reference
 from django.utils.html import format_html, strip_tags
 from adminsortable2.admin import (
@@ -47,22 +46,15 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
         "creation_time",
         "updated_time",
     )
-    list_filter = ("published", "company__name", "era", "scale__scale")
-    list_display = (
-        "__str__",
-        "company__name",
-        "era",
-        "scale",
-        "country_flag",
-        "published",
-    )
+    list_filter = ("company__name", "era", "scale", "published")
+    list_display = ("__str__",) + list_filter + ("country_flag",)
     search_fields = ("identifier",) + list_filter
     save_as = True
 
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" title="{}" />', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}', obj.country.flag, obj.country
         )
 
     fieldsets = (
@@ -146,7 +138,6 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
                 )
 
         return generate_csv(header, data, "consists.csv")
-
     download_csv.short_description = "Download selected items as CSV"
 
     actions = [publish, unpublish, download_csv]

ram/consist/migrations/0019_consistitem_load.py

@@ -1,18 +0,0 @@
-# Generated by Django 6.0 on 2026-01-03 12:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0018_alter_consist_scale"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="consistitem",
-            name="load",
-            field=models.BooleanField(default=False),
-        ),
-    ]

ram/consist/models.py

@@ -43,10 +43,10 @@ class Consist(BaseModel):
 
     @property
     def length(self):
-        return self.consist_item.filter(load=False).count()
+        return self.consist_item.count()
 
     def get_type_count(self):
-        return self.consist_item.filter(load=False).annotate(
+        return self.consist_item.annotate(
             type=models.F("rolling_stock__rolling_class__type__type")
         ).values(
             "type"
@@ -56,15 +56,6 @@ class Consist(BaseModel):
             order=models.Max("order"),
         ).order_by("order")
 
-    def get_cover(self):
-        if self.image:
-            return self.image
-        else:
-            consist_item = self.consist_item.first()
-            if consist_item and consist_item.rolling_stock.image.exists():
-                return consist_item.rolling_stock.image.first().image
-        return None
-
     @property
     def country(self):
         return self.company.country
@@ -78,7 +69,6 @@ class ConsistItem(models.Model):
         Consist, on_delete=models.CASCADE, related_name="consist_item"
     )
     rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
-    load = models.BooleanField(default=False)
     order = models.PositiveIntegerField(blank=False, null=False)
 
     class Meta:
@@ -102,15 +92,10 @@ class ConsistItem(models.Model):
         # because the consist is not saved yet and it must be moved
         # to the admin form validation via InlineFormSet.clean()
         consist = self.consist
-        # Scale must match, but allow loads of any scale
-        if rolling_stock.scale != consist.scale and not self.load:
+        if rolling_stock.scale != consist.scale:
             raise ValidationError(
                 "The rolling stock and consist must be of the same scale."
             )
-        if self.load and rolling_stock.scale.ratio != consist.scale.ratio:
-            raise ValidationError(
-                "The load and consist must be of the same scale ratio."
-            )
         if self.consist.published and not rolling_stock.published:
             raise ValidationError(
                 "You must unpublish the the consist before using this item."

ram/metadata/admin.py

@@ -24,7 +24,7 @@ class PropertyAdmin(admin.ModelAdmin):
 class DecoderDocInline(admin.TabularInline):
     model = DecoderDocument
     min_num = 0
-    extra = 1
+    extra = 0
     classes = ["collapse"]
 
 
@@ -47,12 +47,12 @@ class ScaleAdmin(admin.ModelAdmin):
 @admin.register(Company)
 class CompanyAdmin(admin.ModelAdmin):
     readonly_fields = ("logo_thumbnail",)
-    list_display = ("name", "country_flag_name")
+    list_display = ("name", "country_flag")
     list_filter = ("name", "country")
     search_fields = ("name",)
 
     @admin.display(description="Country")
-    def country_flag_name(self, obj):
+    def country_flag(self, obj):
         return format_html(
             '<img src="{}" /> {}', obj.country.flag, obj.country.name
         )
@@ -61,12 +61,12 @@ class CompanyAdmin(admin.ModelAdmin):
 @admin.register(Manufacturer)
 class ManufacturerAdmin(admin.ModelAdmin):
     readonly_fields = ("logo_thumbnail",)
-    list_display = ("name", "category", "country_flag_name")
+    list_display = ("name", "category", "country_flag")
     list_filter = ("category",)
     search_fields = ("name",)
 
     @admin.display(description="Country")
-    def country_flag_name(self, obj):
+    def country_flag(self, obj):
         return format_html(
             '<img src="{}" /> {}', obj.country.flag, obj.country.name
         )
@@ -88,12 +88,6 @@ class RollingStockTypeAdmin(SortableAdminMixin, admin.ModelAdmin):
 
 @admin.register(Shop)
 class ShopAdmin(admin.ModelAdmin):
-    list_display = ("name", "on_line", "active", "country_flag_name")
+    list_display = ("name", "on_line", "active")
     list_filter = ("on_line", "active")
     search_fields = ("name",)
-
-    @admin.display(description="Country")
-    def country_flag_name(self, obj):
-        return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
-        )

ram/metadata/models.py

@@ -1,5 +1,4 @@
 import os
-from urllib.parse import urlparse
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
@@ -7,12 +6,11 @@ from django.dispatch.dispatcher import receiver
 from django.core.exceptions import ValidationError
 from django_countries.fields import CountryField
 
-from ram.models import SimpleBaseModel
 from ram.utils import DeduplicatedStorage, get_image_preview, slugify
 from ram.managers import PublicManager
 
 
-class Property(SimpleBaseModel):
+class Property(models.Model):
     name = models.CharField(max_length=128, unique=True)
     private = models.BooleanField(
         default=False,
@@ -29,7 +27,7 @@ class Property(SimpleBaseModel):
     objects = PublicManager()
 
 
-class Manufacturer(SimpleBaseModel):
+class Manufacturer(models.Model):
     name = models.CharField(max_length=128, unique=True)
     slug = models.CharField(max_length=128, unique=True, editable=False)
     category = models.CharField(
@@ -59,17 +57,13 @@ class Manufacturer(SimpleBaseModel):
             },
         )
 
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
-
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 
     logo_thumbnail.short_description = "Preview"
 
 
-class Company(SimpleBaseModel):
+class Company(models.Model):
     name = models.CharField(max_length=64, unique=True)
     slug = models.CharField(max_length=64, unique=True, editable=False)
     extended_name = models.CharField(max_length=128, blank=True)
@@ -107,7 +101,7 @@ class Company(SimpleBaseModel):
     logo_thumbnail.short_description = "Preview"
 
 
-class Decoder(SimpleBaseModel):
+class Decoder(models.Model):
     name = models.CharField(max_length=128, unique=True)
     manufacturer = models.ForeignKey(
         Manufacturer,
@@ -143,7 +137,7 @@ def calculate_ratio(ratio):
         raise ValidationError("Invalid ratio format")
 
 
-class Scale(SimpleBaseModel):
+class Scale(models.Model):
     scale = models.CharField(max_length=32, unique=True)
     slug = models.CharField(max_length=32, unique=True, editable=False)
     ratio = models.CharField(max_length=16, validators=[calculate_ratio])
@@ -178,7 +172,7 @@ def scale_save(sender, instance, **kwargs):
     instance.ratio_int = calculate_ratio(instance.ratio)
 
 
-class RollingStockType(SimpleBaseModel):
+class RollingStockType(models.Model):
     type = models.CharField(max_length=64)
     order = models.PositiveSmallIntegerField()
     category = models.CharField(
@@ -208,7 +202,7 @@ class RollingStockType(SimpleBaseModel):
         return "{0} {1}".format(self.type, self.category)
 
 
-class Tag(SimpleBaseModel):
+class Tag(models.Model):
     name = models.CharField(max_length=128, unique=True)
     slug = models.CharField(max_length=128, unique=True)
 
@@ -228,7 +222,7 @@ class Tag(SimpleBaseModel):
         )
 
 
-class Shop(SimpleBaseModel):
+class Shop(models.Model):
     name = models.CharField(max_length=128, unique=True)
     country = CountryField(blank=True)
     website = models.URLField(blank=True)

ram/portal/admin.py

@@ -20,7 +20,6 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                     "about",
                     "items_per_page",
                     "items_ordering",
-                    "featured_items_ordering",
                     "currency",
                     "footer",
                     "footer_extended",

ram/portal/migrations/0021_siteconfiguration_featured_items_ordering_and_more.py

@@ -1,43 +0,0 @@
-# Generated by Django 6.0 on 2026-01-02 23:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("portal", "0020_alter_flatpage_options"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="siteconfiguration",
-            name="featured_items_ordering",
-            field=models.CharField(
-                choices=[
-                    ("type", "By rolling stock type and company"),
-                    ("class", "By rolling stock type and class"),
-                    ("company", "By company and type"),
-                    ("country", "By country and type"),
-                    ("cou+com", "By country and company"),
-                ],
-                default="type",
-                max_length=11,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="siteconfiguration",
-            name="items_ordering",
-            field=models.CharField(
-                choices=[
-                    ("type", "By rolling stock type and company"),
-                    ("class", "By rolling stock type and class"),
-                    ("company", "By company and type"),
-                    ("country", "By country and type"),
-                    ("cou+com", "By country and company"),
-                ],
-                default="type",
-                max_length=11,
-            ),
-        ),
-    ]

ram/portal/models.py

@@ -22,17 +22,14 @@ class SiteConfiguration(SingletonModel):
         default="6",
     )
     items_ordering = models.CharField(
-        max_length=11,
+        max_length=10,
         choices=[
-            ("type", "By rolling stock type and company"),
-            ("class", "By rolling stock type and class"),
-            ("company", "By company and type"),
-            ("country", "By country and type"),
-            ("cou+com", "By country and company"),
+            ("type", "By rolling stock type"),
+            ("company", "By company name"),
+            ("identifier", "By rolling stock class"),
         ],
         default="type",
     )
-    featured_items_ordering = items_ordering.clone()
     currency = models.CharField(max_length=3, default="EUR")
     footer = tinymce.HTMLField(blank=True)
     footer_extended = tinymce.HTMLField(blank=True)

ram/portal/static/css/main.min.css

@@ -1 +0,0 @@
-html[data-bs-theme=dark] .navbar svg{fill:#fff}.card>a>img{width:100%}td>img.logo{max-width:200px;max-height:48px}td>img.logo-xl{max-width:400px;max-height:96px}td>p:last-child{margin-bottom:0}.btn>span{display:inline-block}a.badge,a.badge:hover{text-decoration:none;color:#fff}.img-thumbnail{padding:0}.w-33{width:33%!important}.table-group-divider{border-top:calc(var(--bs-border-width) * 3) solid var(--bs-border-color)}#nav-journal ol,#nav-journal ul{padding-left:1rem}#nav-journal ol:last-child,#nav-journal p:last-child,#nav-journal ul:last-child{margin-bottom:0}#footer>p{display:inline}

ram/portal/static/css/src/README.md

@@ -1,7 +0,0 @@
-# Compile main.min.css
-
-```bash
-$ npm install clean-css-cli 
-$ npx cleancss -o ../main.min.css main.css
-```
-

ram/portal/static/js/main.min.js

@@ -1,6 +0,0 @@
-/*!
-* Color mode toggler for Bootstrap's docs (https://getbootstrap.com/)
-* Copyright 2011-2023 The Bootstrap Authors
-* Licensed under the Creative Commons Attribution 3.0 Unported License.
-*/
-(()=>{"use strict";const e=()=>localStorage.getItem("theme"),t=()=>{const t=e();return t||(window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light")},a=e=>{"auto"===e&&window.matchMedia("(prefers-color-scheme: dark)").matches?document.documentElement.setAttribute("data-bs-theme","dark"):document.documentElement.setAttribute("data-bs-theme",e)};a(t());const r=(e,t=!1)=>{const a=document.querySelector("#bd-theme");if(!a)return;const r=document.querySelector(".theme-icon-active i"),o=document.querySelector(`[data-bs-theme-value="${e}"]`),s=o.querySelector(".theme-icon i").getAttribute("class");document.querySelectorAll("[data-bs-theme-value]").forEach(e=>{e.classList.remove("active"),e.setAttribute("aria-pressed","false")}),o.classList.add("active"),o.setAttribute("aria-pressed","true"),r.setAttribute("class",s),t&&a.focus()};window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change",()=>{const r=e();"light"!==r&&"dark"!==r&&a(t())}),window.addEventListener("DOMContentLoaded",()=>{r(t()),document.querySelectorAll("[data-bs-theme-value]").forEach(e=>{e.addEventListener("click",()=>{const t=e.getAttribute("data-bs-theme-value");(e=>{localStorage.setItem("theme",e)})(t),a(t),r(t,!0)})})})})(),document.addEventListener("DOMContentLoaded",function(){const e=document.getElementById("tabSelector"),t=window.location.hash.substring(1);if(t){const a=`#nav-${t}`,r=document.querySelector(`[data-bs-target="${a}"]`);r&&(bootstrap.Tab.getOrCreateInstance(r).show(),e.value=a)}document.querySelectorAll('button[data-bs-toggle="tab"]').forEach(e=>{e.addEventListener("shown.bs.tab",e=>{const t=e.target.getAttribute("data-bs-target").replace("nav-","");history.replaceState(null,null,t)})}),e&&(e.addEventListener("change",function(){const e=this.value,t=document.querySelector(`[data-bs-target="${e}"]`);if(t){bootstrap.Tab.getOrCreateInstance(t).show()}}),document.querySelectorAll('[data-bs-toggle="tab"]').forEach(t=>{t.addEventListener("shown.bs.tab",t=>{const a=t.target.getAttribute("data-bs-target");e.value=a})}))});

ram/portal/static/js/src/README.md

@@ -1,7 +0,0 @@
-# Compile main.min.js
-
-```bash
-$ npm install terser
-$ npx terser theme_selector.js tabs_selector.js -c -m -o ../main.min.js 
-```
-

ram/portal/static/js/src/tabs_selector.js

@@ -1,41 +0,0 @@
-// use Bootstrap 5's Tab component to manage tab navigation and synchronize with URL hash
-document.addEventListener("DOMContentLoaded", function () {
-  const selectElement = document.getElementById('tabSelector');
-  // code to handle tab selection and URL hash synchronization
-  const hash = window.location.hash.substring(1) // remove the '#' prefix
-  if (hash) {
-    const target = `#nav-${hash}`;
-    const trigger = document.querySelector(`[data-bs-target="${target}"]`);
-    if (trigger) {
-      bootstrap.Tab.getOrCreateInstance(trigger).show();
-      selectElement.value = target // keep the dropdown in sync
-    }
-  }
-
-  // update the URL hash when a tab is shown
-  document.querySelectorAll('button[data-bs-toggle="tab"]').forEach(btn => {
-    btn.addEventListener('shown.bs.tab', event => {
-      const newHash = event.target.getAttribute('data-bs-target').replace('nav-', '');
-      history.replaceState(null, null, newHash);
-    });
-  });
-
-  // allow tab selection via a dropdown on small screens
-  if (!selectElement) return;
-  selectElement.addEventListener('change', function () {
-    const target = this.value;
-    const trigger = document.querySelector(`[data-bs-target="${target}"]`);
-    if (trigger) {
-      const tabInstance = bootstrap.Tab.getOrCreateInstance(trigger);
-      tabInstance.show();
-    }
-  });
-
-  // keep the dropdown in sync if the user clicks a tab button
-  document.querySelectorAll('[data-bs-toggle="tab"]').forEach(btn => {
-    btn.addEventListener('shown.bs.tab', event => {
-      const target = event.target.getAttribute('data-bs-target');
-      selectElement.value = target
-    });
-  });
-});

ram/portal/static/js/src/theme_selector.js

@@ -1,76 +0,0 @@
-/*!
-* Color mode toggler for Bootstrap's docs (https://getbootstrap.com/)
-* Copyright 2011-2023 The Bootstrap Authors
-* Licensed under the Creative Commons Attribution 3.0 Unported License.
-*/
-
-(() => {
-  'use strict'
-
-  const getStoredTheme = () => localStorage.getItem('theme')
-  const setStoredTheme = theme => localStorage.setItem('theme', theme)
-
-  const getPreferredTheme = () => {
-    const storedTheme = getStoredTheme()
-    if (storedTheme) {
-      return storedTheme
-    }
-
-    return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
-  }
-
-  const setTheme = theme => {
-    if (theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-      document.documentElement.setAttribute('data-bs-theme', 'dark')
-    } else {
-      document.documentElement.setAttribute('data-bs-theme', theme)
-    }
-  }
-
-  setTheme(getPreferredTheme())
-
-  const showActiveTheme = (theme, focus = false) => {
-    const themeSwitcher = document.querySelector('#bd-theme')
-
-    if (!themeSwitcher) {
-      return
-    }
-
-    const activeThemeIcon = document.querySelector('.theme-icon-active i')
-    const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
-    const biOfActiveBtn = btnToActive.querySelector('.theme-icon i').getAttribute('class')
-
-    document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
-      element.classList.remove('active')
-      element.setAttribute('aria-pressed', 'false')
-    })
-
-    btnToActive.classList.add('active')
-    btnToActive.setAttribute('aria-pressed', 'true')
-    activeThemeIcon.setAttribute('class', biOfActiveBtn)
-
-    if (focus) {
-      themeSwitcher.focus()
-    }
-  }
-
-  window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
-    const storedTheme = getStoredTheme()
-    if (storedTheme !== 'light' && storedTheme !== 'dark') {
-      setTheme(getPreferredTheme())
-    }
-  })
-
-  window.addEventListener('DOMContentLoaded', () => {
-    showActiveTheme(getPreferredTheme())
-    document.querySelectorAll('[data-bs-theme-value]')
-      .forEach(toggle => {
-        toggle.addEventListener('click', () => {
-          const theme = toggle.getAttribute('data-bs-theme-value')
-          setStoredTheme(theme)
-          setTheme(theme)
-          showActiveTheme(theme, true)
-        })
-      })
-    })
- })()

ram/portal/templates/_includes/documents.html

@@ -1,26 +0,0 @@
-                  {% if documents %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="3" scope="row">{{ header|default:"Documents" }}</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for d in documents.all %}
-                      <tr>
-                        <td class="w-33">{{ d.description }}</td>
-                        <td class="text-nowrap">
-                          {% if d.private %}
-                            <i class="bi bi-file-earmark-lock2"></i>
-                          {% else %}
-                            <i class="bi bi-file-earmark-text"></i>
-                          {% endif %}
-                          <a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a>
-                        </td>
-                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
-

ram/portal/templates/_modules/documents.html

@@ -1,26 +0,0 @@
-                  {% if documents %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="3" scope="row">{{ header|default:"Documents" }}</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for d in documents.all %}
-                      <tr>
-                        <td class="w-33">{{ d.description }}</td>
-                        <td class="text-nowrap">
-                          {% if d.private %}
-                            <i class="bi bi-file-earmark-lock2"></i>
-                          {% else %}
-                            <i class="bi bi-file-earmark-text"></i>
-                          {% endif %}
-                          <a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a>
-                        </td>
-                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
-

ram/portal/templates/_modules/properties.html

@@ -1,18 +0,0 @@
-                  {% if properties %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Properties</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for p in properties %}
-                      <tr>
-                        <th class="w-33" scope="row">{{ p.property }}</th>
-                        <td>{{ p.value }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
-

ram/portal/templates/_modules/purchase_data.html

@@ -1,29 +0,0 @@
-                  {% if request.user.is_staff %}
-                    {% if data.shop or data.purchase_date or data.price %}
-                    <table class="table table-striped">
-                      <thead>
-                        <tr>
-                          <th colspan="2" scope="row">Purchase</th>
-                        </tr>
-                      </thead>
-                      <tbody class="table-group-divider">
-                        <tr>
-                          <th class="w-33" scope="row">Shop</th>
-                          <td>
-                            {{ data.shop|default:"-" }}
-                            {% if data.shop.website %} <a href="{{ data.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                          </td>
-                        </tr>
-                        <tr>
-                          <th class="w-33" scope="row">Purchase date</th>
-                          <td>{{ data.purchase_date|default:"-" }}</td>
-                        </tr>
-                        <tr>
-                          <th scope="row">Price ({{ site_conf.currency }})</th>
-                          <td>{{ data.price|default:"-" }}</td>
-                        </tr>
-                      </tbody>
-                    </table>
-                    {% endif %}
-                  {% endif %}
-

ram/portal/templates/base.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="color-scheme" content="light dark">
-    <meta name="description" content="{{ site_conf.about|striptags }}">
+    <meta name="description" content="{{ site_conf.about}}">
     <meta name="author" content="{{ site_conf.site_author }}">
     <meta name="generator" content="Django Framework">
     <title>{% block title %}{{ title }}{% endblock %} - {{ site_conf.site_name }}</title>
@@ -22,8 +22,114 @@
     <link href="{% static "bootstrap@5.3.8/dist/css/bootstrap.min.css" %}" rel="stylesheet">
     <link href="{% static "bootstrap-icons@1.13.1/font/bootstrap-icons.css" %}" rel="stylesheet">
     {% endif %}
-    <link href="{% static "css/main.min.css" %}?v={{ site_conf.version }}" rel="stylesheet">
-    <script src="{% static "js/main.min.js" %}"></script>
+    <link href="{% static "css/main.css" %}?v={{ site_conf.version }}" rel="stylesheet">
+    <style>
+      .bd-placeholder-img {
+        font-size: 1.125rem;
+        text-anchor: middle;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        user-select: none;
+      }
+      @media (min-width: 768px) {
+        .bd-placeholder-img-lg {
+          font-size: 3.5rem;
+        }
+      }
+    </style>
+    <script>
+      /*!
+      * Color mode toggler for Bootstrap's docs (https://getbootstrap.com/)
+      * Copyright 2011-2023 The Bootstrap Authors
+      * Licensed under the Creative Commons Attribution 3.0 Unported License.
+      */
+
+      (() => {
+        'use strict'
+
+        const getStoredTheme = () => localStorage.getItem('theme')
+        const setStoredTheme = theme => localStorage.setItem('theme', theme)
+
+        const getPreferredTheme = () => {
+          const storedTheme = getStoredTheme()
+          if (storedTheme) {
+            return storedTheme
+          }
+
+          return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+        }
+
+        const setTheme = theme => {
+          if (theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+            document.documentElement.setAttribute('data-bs-theme', 'dark')
+          } else {
+            document.documentElement.setAttribute('data-bs-theme', theme)
+          }
+        }
+
+        setTheme(getPreferredTheme())
+
+        const showActiveTheme = (theme, focus = false) => {
+          const themeSwitcher = document.querySelector('#bd-theme')
+
+          if (!themeSwitcher) {
+            return
+          }
+
+          const activeThemeIcon = document.querySelector('.theme-icon-active i')
+          const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
+          const biOfActiveBtn = btnToActive.querySelector('.theme-icon i').getAttribute('class')
+
+          document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
+            element.classList.remove('active')
+            element.setAttribute('aria-pressed', 'false')
+          })
+
+          btnToActive.classList.add('active')
+          btnToActive.setAttribute('aria-pressed', 'true')
+          activeThemeIcon.setAttribute('class', biOfActiveBtn)
+
+          if (focus) {
+            themeSwitcher.focus()
+          }
+        }
+
+        window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
+          const storedTheme = getStoredTheme()
+          if (storedTheme !== 'light' && storedTheme !== 'dark') {
+            setTheme(getPreferredTheme())
+          }
+        })
+
+        window.addEventListener('DOMContentLoaded', () => {
+          showActiveTheme(getPreferredTheme())
+          document.querySelectorAll('[data-bs-theme-value]')
+            .forEach(toggle => {
+              toggle.addEventListener('click', () => {
+                const theme = toggle.getAttribute('data-bs-theme-value')
+                setStoredTheme(theme)
+                setTheme(theme)
+                showActiveTheme(theme, true)
+              })
+            })
+          })
+       })()
+    </script>
+    <script>
+      document.addEventListener('DOMContentLoaded', function () {
+      var selectElement = document.getElementById('tabSelector');
+        try {
+          selectElement.addEventListener('change', function () {
+            var selectedTabId = this.value;
+            var tabs = document.querySelectorAll('.tab-pane');
+            tabs.forEach(function (tab) {
+            tab.classList.remove('show', 'active');
+            });
+            document.getElementById(selectedTabId).classList.add('show', 'active');
+          });
+        } catch (TypeError) { /* pass */ }
+      });
+    </script>
     {% block extra_head %}
     {{ site_conf.extra_head | safe }}
     {% endblock %}
@@ -42,7 +148,7 @@
               <strong>{{ site_conf.site_name }}</strong>
             </a>
          </div>
-         {% include '_includes/login.html' %}
+         {% include 'includes/login.html' %}
         </div>
       </nav>
     </header>
@@ -80,7 +186,7 @@
                 {% show_bookshelf_menu %}
                 {% show_flatpages_menu user %}
               </ul>
-              {% include '_includes/search.html' %}
+              {% include 'includes/search.html' %}
             </div>
           </div>
         </nav>
@@ -105,9 +211,9 @@
         <div class="container">{% block pagination %}{% endblock %}</div>
       </div>
       {% block extra_content %}{% endblock %}
-      {% include '_includes/symbols.html' %}
+      {% include 'includes/symbols.html' %}
     </main>
-    {% include '_includes/footer.html' %}
+    {% include 'includes/footer.html' %}
     {% if site_conf.use_cdn %}
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js"></script>
     {% else %}

ram/portal/templates/bookshelf/book.html

@@ -2,23 +2,23 @@
 {% load dynamic_url %}
 
         {% block header %}
-        {% if data.tags.all %}
+        {% if book.tags.all %}
         <p><small>Tags:</small>
-          {% for t in data.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+          {% for t in book.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 %}
-        {% if not data.published %}
+        {% if not book.published %}
         <span class="badge text-bg-warning">Unpublished</span> |
         {% endif %}
-        <small class="text-body-secondary">Updated {{ data.updated_time | date:"M d, Y H:i" }}</small>
+        <small class="text-body-secondary">Updated {{ book.updated_time | date:"M d, Y H:i" }}</small>
         {% endblock %}
         {% block carousel %}
         <div class="row">
           <div id="carouselControls" class="carousel carousel-dark slide" data-bs-ride="carousel" data-bs-interval="10000">
             <div class="carousel-inner">
-              {% for t in data.image.all %}
+              {% for t in book.image.all %}
               {% if forloop.first %}
               <div class="carousel-item active">
               {% else %}
@@ -28,7 +28,7 @@
               </div>
               {% endfor %}
             </div>
-            {% if data.image.count > 1 %}
+            {% if book.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"><i class="bi bi-chevron-left"></i></span>
@@ -49,13 +49,11 @@
             <div class="mx-auto">
               <nav class="nav nav-tabs d-none d-lg-flex flex-row mb-2" id="nav-tab" role="tablist">
                 <button class="nav-link active" id="nav-summary-tab" data-bs-toggle="tab" data-bs-target="#nav-summary" type="button" role="tab" aria-controls="nav-summary" aria-selected="true">Summary</button>
-                {% if data.toc.all %}<button class="nav-link" id="nav-toc-tab" data-bs-toggle="tab" data-bs-target="#nav-toc" type="button" role="tab" aria-controls="nav-toc" aria-selected="true">Table of contents</button>{% endif %}
                 {% if documents %}<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 %}
               </nav>
               <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
-                <option value="#nav-summary" selected>Summary</option>
-                {% if data.toc.all %}<option value="#nav-toc">Table of contents</option>{% endif %}
-                {% if documents %}<option value="#nav-documents">Documents</option>{% endif %}
+                <option value="nav-summary" selected>Summary</option>
+                {% if documents %}<option value="nav-documents">Documents</option>{% endif %}
               </select>
               <div class="tab-content" id="nav-tabContent">
                 <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
@@ -63,123 +61,151 @@
                     <thead>
                       <tr>
                         <th colspan="2" scope="row">
-                          {{ data.obj_label|capfirst }}
+                          {% if type == "catalog" %}Catalog
+                          {% elif type == "book" %}Book{% endif %}
                         </th>
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
-                      {% if data.obj_type == "catalog" %}
+                      {% if type == "catalog" %}
                       <tr>
                         <th class="w-33" scope="row">Manufacturer</th>
-                        <td>
-                          <a href="{% url 'filtered' _filter="manufacturer" search=data.manufacturer.slug %}">{{ data.manufacturer }}{% if data.manufacturer.website %}</a> <a href="{{ data.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
+                        <td>{{ book.manufacturer }}</td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Scales</th>
-                        <td>{{ data.get_scales }}</td>
+                        <td>{{ book.get_scales }}</td>
                       </tr>
-                      {% elif data.obj_type == "book" %}
+                      {% elif type == "book" %}
                       <tr>
                         <th class="w-33" scope="row">Title</th>
-                        <td>{{ data.title }}</td>
+                        <td>{{ book.title }}</td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Authors</th>
                         <td>
-                          <ul class="mb-0 list-unstyled">{% for a in data.authors.all %}<li>{{ a }}</li>{% endfor %}</ul>
+                          <ul class="mb-0 list-unstyled">{% for a in book.authors.all %}<li>{{ a }}</li>{% endfor %}</ul>
                         </td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Publisher</th>
                         <td>
-                          <img src="{{ data.publisher.country.flag }}" alt="{{ data.publisher.country }}"> {{ data.publisher }}
-                          {% if data.publisher.website %} <a href="{{ data.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                          <img src="{{ book.publisher.country.flag }}" alt="{{ book.publisher.country }}"> {{ book.publisher }}
+                          {% if book.publisher.website %} <a href="{{ book.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                         </td>
                       </tr>
-                      {% elif data.obj_type == "magazineissue" %}
+                      {% elif type == "magazineissue" %}
                       <tr>
                         <th class="w-33" scope="row">Magazine</th>
-                        <td>
-                          <a href="{% url 'magazine' data.magazine.pk %}">{{ data.magazine }}</a>
-                          {% if data.magazine.website %} <a href="{{ data.magazine.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
+                        <td><a href="{% url 'magazine' book.magazine.pk %}">{{ book.magazine }}</a></td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Publisher</th>
                         <td>
-                          <img src="{{ data.publisher.country.flag }}" alt="{{ data.publisher.country }}"> {{ data.publisher }}
-                          {% if data.publisher.website %} <a href="{{ data.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                          <img src="{{ book.publisher.country.flag }}" alt="{{ book.publisher.country }}"> {{ book.publisher }}
+                          {% if book.publisher.website %} <a href="{{ book.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                         </td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Issue</th>
-                        <td>{{ data.issue_number }}</td>
+                        <td>{{ book.issue_number }}</td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Date</th>
-                        <td>{{ data.publication_year|default:"-" }} / {{ data.get_publication_month_display|default:"-" }}</td>
+                        <td>{{ book.publication_year|default:"-" }} / {{ book.publication_month|default:"-" }}</td>
                       </tr>
                       {% endif %}
                       <tr>
                         <th scope="row">ISBN</th>
-                        <td>{{ data.ISBN|default:"-" }}</td>
+                        <td>{{ book.ISBN|default:"-" }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Language</th>
-                        <td>{{ data.get_language_display }}</td>
+                        <td>{{ book.get_language_display }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Number of pages</th>
-                        <td>{{ data.number_of_pages|default:"-" }}</td>
+                        <td>{{ book.number_of_pages|default:"-" }}</td>
                       </tr>
-                      {% if data.obj_type == "book" or data.obj_type == "catalog" %}
+                      {% if type == "boook" or type == "catalog" %}
                       <tr>
                         <th scope="row">Publication year</th>
-                        <td>{{ data.publication_year|default:"-" }}</td>
+                        <td>{{ book.publication_year|default:"-" }}</td>
                       </tr>
                       {% endif %}
-                      {% if data.description %}
+                      {% if book.description %}
                       <tr>
                         <th class="w-33" scope="row">Description</th>
-                        <td>{{ data.description | safe }}</td>
+                        <td>{{ book.description | safe }}</td>
                       </tr>
                       {% endif %}
                     </tbody>
                   </table>
-                  {% include "_modules/purchase_data.html" %}
-                  {% include "_modules/properties.html" %}
-                </div>
-                <div class="tab-pane table-responsive" id="nav-toc" role="tabpanel" aria-labelledby="nav-toc-tab">
+                  {% if request.user.is_staff %}
                   <table class="table table-striped">
                     <thead>
                       <tr>
-                        <th scope="row">Title</th>
-                        <th scope="row">Subtitle</th>
-                        <th scope="row">Authors</th>
-                        <th scope="row">Page</th>
-                        <th scope="row"><abbr title="Featured article"><i class="bi bi-star-fill"></i></abbr></th>
+                        <th colspan="2" scope="row">Purchase</th>
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
-                      {% for toc in data.toc.all %}
                       <tr>
-                        <td class="w-33">{{ toc.title }}</td>
-                        <td class="w-33">{{ toc.subtitle }}</td>
-                        <td>{{ toc.authors }}</td>
-                        <td>{{ toc.page }}</td>
-                          <td>{% if toc.featured %}<abbr title="Featured article"><i class="bi bi-star-fill text-warning"></i></abbr>{% endif %}</td>
+                        <th class="w-33" scope="row">Shop</th>
+                        <td>
+                          {{ book.shop|default:"-" }}
+                          {% if book.shop.website %} <a href="{{ book.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                        </td>
                       </tr>
-                      {% endfor %}
+                      <tr>
+                        <th class="w-33" scope="row">Purchase date</th>
+                        <td>{{ book.purchase_date|default:"-" }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Price ({{ site_conf.currency }})</th>
+                        <td>{{ book.price|default:"-" }}</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                  {% endif %}
+                  {% if properties %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Properties</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for p in properties %}
+                      <tr>
+                        <th class="w-33" scope="row">{{ p.property }}</th>
+                        <td>{{ p.value }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
+                </div>
+                <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="3" scope="row">Documents</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for d in documents.all %}
+                      <tr>
+                        <td class="w-33">{{ d.description }}</td>
+                        <td><a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a></td>
+                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
+                      </tr>
+                    {% endfor %}
                     </tbody>
                   </table>
                 </div>
-                <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
-                  {% include "_modules/documents.html" %}
-                </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="{% dynamic_admin_url 'bookshelf' data.obj_type data.pk %}">Edit</a>{% endif %}
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% dynamic_admin_url 'bookshelf' type book.pk %}">Edit</a>{% endif %}
               </div>
             </div>
           </div>

ram/portal/templates/cards.html

@@ -6,21 +6,21 @@
       <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
       {% block cards %}
         {% for d in data %}
-        {% if d.obj_type == "rollingstock" %}
+        {% if d.type == "roster" %}
         {% include "cards/roster.html" %}
-        {% elif d.obj_type == "company" %}
+        {% elif d.type == "company" %}
         {% include "cards/company.html" %}
-        {% elif d.obj_type == "rollingstocktype" %}
+        {% elif d.type == "rolling_stock_type" %}
         {% include "cards/rolling_stock_type.html" %}
-        {% elif d.obj_type == "scale" %}
+        {% elif d.type == "scale" %}
         {% include "cards/scale.html" %}
-        {% elif d.obj_type == "consist" %}
+        {% elif d.type == "consist" %}
         {% include "cards/consist.html" %}
-        {% elif d.obj_type == "manufacturer" %}
+        {% elif d.type == "manufacturer" %}
         {% include "cards/manufacturer.html" %}
-        {% elif d.obj_type == "magazine"  or d.obj_type == "magazineissue" %}
+        {% elif d.type == "magazine"  or d.type == "magazineissue" %}
         {% include "cards/magazine.html" %}
-        {% elif d.obj_type == "book" or d.obj_type == "catalog" %}
+        {% elif d.type == "book" or d.type == "catalog" %}
         {% include "cards/book.html" %}
         {% endif %}
         {% endfor %}

ram/portal/templates/cards/book.html

@@ -2,31 +2,31 @@
 {% load dynamic_url %}
         <div class="col">
           <div class="card shadow-sm">
-            {% if d.image.exists %}
-            <a href="{{d.get_absolute_url}}"><img class="card-img-top" src="{{ d.image.first.image.url }}" alt="{{ d }}"></a>
+            {% if d.item.image.exists %}
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d.item }}"></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>
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d.item }}"></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>
+                <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.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                {% 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 #}
-                {% empty %}
-                <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
                 {% endfor %}
               </p>
+              {% endif %}
               <table class="table table-striped">
                 <thead>
                   <tr>
                     <th colspan="2" scope="row">
-                      {{ d.obj_label|capfirst }}
+                      {{ d.type | capfirst }}
                       <div class="float-end">
-                        {% if not d.published %}
+                        {% if not d.item.published %}
                         <span class="badge text-bg-warning">Unpublished</span>
                         {% endif %}
                       </div>
@@ -34,46 +34,44 @@
                   </tr>
                 </thead>
                 <tbody class="table-group-divider">
-                  {% if d.obj_type == "catalog" %}
+                  {% if d.type == "catalog" %}
                   <tr>
                     <th class="w-33" scope="row">Manufacturer</th>
-                    <td>
-                      <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 %}
-                    </td>
+                    <td>{{ d.item.manufacturer }}</td>
                   </tr>
                   <tr>
                     <th class="w-33" scope="row">Scales</th>
-                    <td>{{ d.get_scales }}</td>
+                    <td>{{ d.item.get_scales }}</td>
                   </tr>
-                  {% elif d.obj_type == "book" %}
+                  {% elif d.type == "book" %}
                   <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>
+                      <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><img src="{{ d.publisher.country.flag }}" alt="{{ d.publisher.country }}"> {{ d.publisher }}</td>
+                    <td><img src="{{ d.item.publisher.country.flag }}" alt="{{ d.item.publisher.country }}"> {{ d.item.publisher }}</td>
                   </tr>
                   {% endif %}
                   <tr>
                     <th scope="row">Language</th>
-                    <td>{{ d.get_language_display }}</td>
+                    <td>{{ d.item.get_language_display }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Pages</th>
-                    <td>{{ d.number_of_pages|default:"-" }}</td>
+                    <td>{{ d.item.number_of_pages|default:"-" }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Year</th>
-                    <td>{{ d.publication_year|default:"-" }}</td>
+                    <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.get_absolute_url }}">Show all data</a>
-                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% dynamic_admin_url 'bookshelf' d.obj_type d.pk %}">Edit</a>{% endif %}
+                <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="{% dynamic_admin_url 'bookshelf' d.type d.item.pk %}">Edit</a>{% endif %}
               </div>
             </div>
           </div>

ram/portal/templates/cards/company.html

@@ -2,7 +2,7 @@
         <div class="card shadow-sm">
           <div class="card-body">
             <p class="card-text" style="position: relative;">
-              <strong>{{ d.name }}</strong>
+              <strong>{{ d.item.name }}</strong>
             </p>
             <table class="table table-striped">
               <thead>
@@ -10,7 +10,7 @@
                   <th colspan="2" scope="row">
                     Company
                     <div class="float-end">
-                      {% if d.freelance %}
+                      {% if d.item.freelance %}
                       <span class="badge text-bg-secondary">Freelance</span>
                       {% endif %}
                     </div>
@@ -18,30 +18,30 @@
                 </tr>
               </thead>
               <tbody class="table-group-divider">
-                {% if d.logo %}
+                {% if d.item.logo %}
                 <tr>
                   <th class="w-33" scope="row">Logo</th>
-                  <td><img class="logo" src="{{ d.logo.url }}" alt="{{ d.name }} logo"></td>
+                  <td><img class="logo" src="{{ d.item.logo.url }}" alt="{{ d.item.name }} logo"></td>
                 </tr>
                 {% endif %}
                 <tr>
                   <th class="w-33" scope="row">Name</th>
-                  <td>{{ d.extended_name }}</td>
+                  <td>{{ d.item.extended_name }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Abbreviation</th>
-                  <td>{{ d.name }}</td>
+                  <td>{{ d.item.name }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Country</th>
-                  <td><img src="{{ d.country.flag }}" alt="{{ d.country }}"> {{ d.country.name }}</td>
+                  <td><img src="{{ d.item.country.flag }}" alt="{{ d.item.country }}"> {{ d.item.country.name }}</td>
                 </tr>
               </tbody>
             </table>
             <div class="d-grid gap-2 mb-1 d-md-block">
-              {% with items=d.num_items %}
-              <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="company" search=d.slug %}">Show {{ items }} item{{ items | pluralize}}</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 %}
+              {% with items=d.item.num_items %}
+              <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="company" search=d.item.slug %}">Show {{ items }} item{{ items | pluralize}}</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 %}
               {% endwith %}
             </div>
           </div>

ram/portal/templates/cards/consist.html

@@ -1,37 +1,36 @@
-{% load static %}
-
       <div class="col">
         <div class="card shadow-sm">
-          <a href="{{ d.get_absolute_url }}">
-          {% if d.get_cover %}
-            <img class="card-img-top" src="{{ d.get_cover.url }}" alt="{{ d }}">
+          <a href="{{ d.item.get_absolute_url }}">
+          {% if d.item.image %}
+            <img class="card-img-top" src="{{ d.item.image.url }}" alt="{{ d.item }}">
           {% 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>
+            {% with d.item.consist_item.first.rolling_stock as r %}
+            <img class="card-img-top" src="{{ r.image.first.image.url }}" alt="{{ d.item }}">
+            {% 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>
+              <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.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+              {% 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 #}
-              {% empty %}
-              <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
               {% endfor %}
             </p>
+            {% endif %}
             <table class="table table-striped">
               <thead>
                 <tr>
                   <th colspan="2" scope="row">
                     Consist
                     <div class="float-end">
-                      {% if not d.published %}
+                      {% if not d.item.published %}
                       <span class="badge text-bg-warning">Unpublished</span>
                       {% endif %}
-                      {% if d.company.freelance %}
+                      {% if d.item.company.freelance %}
                       <span class="badge text-bg-secondary">Freelance</span>
                       {% endif %}
                     </div>
@@ -39,32 +38,32 @@
                 </tr>
               </thead>
               <tbody class="table-group-divider">
-                {% if d.address %}
+                {% if d.item.address %}
                 <tr>
                   <th class="w-33" scope="row">Address</th>
-                  <td>{{ d.address }}</td>
+                  <td>{{ d.item.address }}</td>
                 </tr>
                 {% endif %}
                 <tr>
                   <th class="w-33" scope="row">Company</th>
                   <td>
-                    <img src="{{ d.company.country.flag }}" alt="{{ d.company.country }}">
-                    <abbr title="{{ d.company.extended_name }}">{{ d.company }}</abbr>
+                    <img src="{{ d.item.company.country.flag }}" alt="{{ d.item.company.country }}">
+                    <abbr title="{{ d.item.company.extended_name }}">{{ d.item.company }}</abbr>
                   </td>
                 </tr>
                 <tr>
                   <th scope="row">Era</th>
-                  <td>{{ d.era }}</td>
+                  <td>{{ d.item.era }}</td>
                 </tr>
                 <tr>
                   <th scope="row">Length</th>
-                  <td>{{ d.length }}</td>
+                  <td>{{ d.item.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 %}
+             <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>

ram/portal/templates/cards/magazine.html

@@ -1,47 +1,49 @@
 {% load static %}
-{% load dynamic_url %}
       <div class="col">
         <div class="card shadow-sm">
-          {% if d.obj_type == "magazine" %}
-          <a href="{{ d.get_absolute_url }}">
-            {% if d.get_cover %}
-            <img class="card-img-top" src="{{ d.get_cover.url }}" alt="{{ d }}">
+          {% if d.type == "magazine" %}
+          <a href="{{ d.item.get_absolute_url }}">
+            {% if d.item.image and d.type == "magazine" %}
+            <img class="card-img-top" src="{{ d.item.image.url }}" alt="{{ d.item }}">
+            {% elif d.item.issue.first.image.exists %}
+            {% with d.item.issue.first as i %}
+            <img class="card-img-top" src="{{ i.image.first.image.url }}" alt="{{ d.item }}">
+            {% endwith %}
             {% else %}
             <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
-            <img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}">
+            <img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d.item }}">
             {% endif %}
           </a>
-          {% elif d.obj_type == "magazineissue" %}
-          <a href="{{ d.get_absolute_url }}">
-            {% if d.image.exists %}
-            <img class="card-img-top" src="{{ d.image.first.image.url }}" alt="{{ d }}">
+          {% elif d.type == "magazineissue" %}
+          <a href="{{ d.item.get_absolute_url }}">
+            {% if d.item.image.exists %}
+            <img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d.item }}">
             {% else %}
             <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
-            <img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}">
+            <img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d.item }}">
             {% endif %}
           </a>
           {% 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>
+              <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.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+              {% 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 #}
-              {% empty %}
-              <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
               {% endfor %}
             </p>
+            {% endif %}
             <table class="table table-striped">
               <thead>
                 <tr>
                   <th colspan="2" scope="row">
-                    {{ d.obj_label|capfirst }}
-
+                    {{ d.type | capfirst }}
                     <div class="float-end">
-                      {% if not d.published %}
+                      {% if not d.item.published %}
                       <span class="badge text-bg-warning">Unpublished</span>
                       {% endif %}
                     </div>
@@ -49,51 +51,46 @@
                 </tr>
               </thead>
               <tbody class="table-group-divider">
-                {% if d.obj_type == "magazineissue" %}
+                {% if d.type == "magazineissue" %}
                 <tr>
                   <th class="w-33" scope="row">Magazine</th>
-                  <td>{{ d.magazine }}</td>
-                </tr>
-                {% else %}
-                <tr>
-                  <th class="w-33" scope="row">Website</th>
-                  <td>{% if d.website %}<a href="{{ d.website }}" target="_blank">{{ d.website_short }}</td>{% else %}-{% endif %}</td>
+                  <td>{{ d.item.magazine }}</td>
                 </tr>
                 {% endif %}
                 <tr>
                   <th class="w-33" scope="row">Publisher</th>
                   <td>
-                    <img src="{{ d.publisher.country.flag }}" alt="{{ d.publisher.country }}"> {{ d.publisher }}
-                    {% if d.publisher.website %} <a href="{{ d.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                    <img src="{{ d.item.publisher.country.flag }}" alt="{{ d.item.publisher.country }}"> {{ d.item.publisher }}
+                    {% if d.item.publisher.website %} <a href="{{ d.item.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                   </td>
                 </tr>
-                {% if d.obj_type == "magazineissue" %}
+                {% if d.type == "magazineissue" %}
                 <tr>
                   <th class="w-33" scope="row">Issue</th>
-                  <td>{{ d.issue_number }}</td>
+                  <td>{{ d.item.issue_number }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Date</th>
-                  <td>{{ d.publication_year|default:"-" }} / {{ d.get_publication_month_display|default:"-" }}</td>
+                  <td>{{ d.item.publication_year|default:"-" }} / {{ d.item.publication_month|default:"-" }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Pages</th>
-                  <td>{{ d.number_of_pages|default:"-" }}</td>
+                  <td>{{ d.item.number_of_pages|default:"-" }}</td>
                 </tr>
                 {% endif %}
                 <tr>
                   <th class="w-33" scope="row">Language</th>
-                  <td>{{ d.get_language_display }}</td>
+                  <td>{{ d.item.get_language_display }}</td>
                 </tr>
               </tbody>
             </table>
             <div class="d-grid gap-2 mb-1 d-md-block">
-              {% if d.obj_type == "magazine" %}
-              <a class="btn btn-sm btn-outline-primary{% if d.issues == 0 %} disabled{% endif %}" href="{{ d.get_absolute_url }}">Show {{ d.issues }} issue{{ d.issues|pluralize }}</a>
+              {% if d.type == "magazine" %}
+              <a class="btn btn-sm btn-outline-primary{% if d.item.issues == 0 %} disabled{% endif %}" href="{{ d.item.get_absolute_url }}">Show {{ d.item.issues }} issue{{ d.item.issues|pluralize }}</a>
               {% else %}
-              <a class="btn btn-sm btn-outline-primary" href="{{ d.get_absolute_url }}">Show all data</a>
+              <a class="btn btn-sm btn-outline-primary" href="{{ d.item.get_absolute_url }}">Show all data</a>
               {% endif %}
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% dynamic_admin_url 'bookshelf' d.obj_type d.pk %}">Edit</a>{% endif %}
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:bookshelf_magazineissue_change'  d.item.pk %}">Edit</a>{% endif %}
             </div>
           </div>
         </div>

ram/portal/templates/cards/manufacturer.html

@@ -2,7 +2,7 @@
           <div class="card shadow-sm">
             <div class="card-body">
               <p class="card-text" style="position: relative;">
-                <strong>{{ d.name }}</strong>
+                <strong>{{ d.item.name }}</strong>
               </p>
               <table class="table table-striped">
                 <thead>
@@ -11,26 +11,28 @@
                   </tr>
                 </thead>
                 <tbody class="table-group-divider">
-                  {% if d.logo %}
+                  {% if d.item.logo %}
                   <tr>
                     <th class="w-33" scope="row">Logo</th>
-                    <td><img class="logo" src="{{ d.logo.url }}" alt="{{ d.name }} logo"></td>
+                    <td><img class="logo" src="{{ d.item.logo.url }}" alt="{{ d.item.name }} logo"></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">Website</th>
-                    <td>{% if d.website %}<a href="{{ d.website }}" target="_blank">{{ d.website_short }}</td>{% else %}-{% endif %}</td>
-                  </tr>
                   <tr>
                     <th class="w-33" scope="row">Category</th>
-                    <td>{{ d.category | title }}</td>
+                    <td>{{ d.item.category | title }}</td>
                   </tr>
                 </tbody>
               </table>
               <div class="d-grid gap-2 mb-1 d-md-block">
-                {% with items=d.num_items %}
-                <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="manufacturer" search=d.slug %}">Show {{ items }} item{{ items|pluralize }}</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 %}
+                {% with items=d.item.num_items %}
+                <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="manufacturer" search=d.item.slug %}">Show {{ items }} item{{ items|pluralize }}</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 %}
                 {% endwith %}
               </div>
             </div>

ram/portal/templates/cards/rolling_stock_type.html

@@ -1,7 +1,7 @@
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
-            <p class="card-text"><strong>{{ d }}</strong></p>
+            <p class="card-text"><strong>{{ d.item }}</strong></p>
             <table class="table table-striped">
               <thead>
                 <tr>
@@ -11,18 +11,18 @@
               <tbody class="table-group-divider">
                 <tr>
                   <th class="w-33" scope="row">Type</th>
-                  <td>{{ d.type }}</td>
+                  <td>{{ d.item.type }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Category</th>
-                  <td>{{ d.category | title}}</td>
+                  <td>{{ d.item.category | title}}</td>
                 </tr>
               </tbody>
             </table>
             <div class="d-grid gap-2 mb-1 d-md-block">
-              {% with items=d.num_items %}
-              <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="type" search=d.slug %}">Show {{ items }} item{{ items | pluralize}}</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_rollingstocktype_change' d.pk %}">Edit</a>{% endif %}
+              {% with items=d.item.num_items %}
+              <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="type" search=d.item.slug %}">Show {{ items }} item{{ items | pluralize}}</a>
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:metadata_rollingstocktype_change' d.item.pk %}">Edit</a>{% endif %}
               {% endwith %}
             </div>
           </div>

ram/portal/templates/cards/roster.html

@@ -3,41 +3,34 @@
 
         <div class="col">
           <div class="card shadow-sm">
-            <div id="card-img-container" class="position-relative">
-              {% if d.featured %}
-              <span class="position-absolute translate-middle top-0 start-0 m-3 text-danger">
-                <abbr title="Featured item"><i class="bi bi-heart-fill"></i></abbr>
-              </span>
-              {% endif %}
-              {% if d.image.exists %}
-              <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>
+            {% if d.item.image.exists %}
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d.item }}"></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.item }}"></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>
+                <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.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                {% 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 #}
-                {% empty %}
-                <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
                 {% endfor %}
               </p>
+              {% endif %}
               <table class="table table-striped">
                 <thead>
                   <tr>
                     <th colspan="2" scope="row">
                       Rolling stock
                       <div class="float-end">
-                        {% if not d.published %}
+                        {% if not d.item.published %}
                         <span class="badge text-bg-warning">Unpublished</span>
                         {% endif %}
-                        {% if d.company.freelance %}
+                        {% if d.item.company.freelance %}
                         <span class="badge text-bg-secondary">Freelance</span>
                         {% endif %}
                       </div>
@@ -47,50 +40,50 @@
                 <tbody class="table-group-divider">
                   <tr>
                     <th class="w-33" scope="row">Type</th>
-                    <td>{{ d.rolling_class.type }}</td>
+                    <td>{{ d.item.rolling_class.type }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Company</th>
                     <td>
-                      <img src="{{ d.company.country.flag }}" alt="{{ d.company.country }}">
-                      <a href="{% url 'filtered' _filter="company" search=d.company.slug %}"><abbr title="{{ d.company.extended_name }}">{{ d.company }}</abbr></a>
+                      <img src="{{ d.item.company.country.flag }}" alt="{{ d.item.company.country }}">
+                      <a href="{% url 'filtered' _filter="company" search=d.item.company.slug %}"><abbr title="{{ d.item.company.extended_name }}">{{ d.item.company }}</abbr></a>
                     </td>
                   </tr>
                   <tr>
                     <th scope="row">Class</th>
-                    <td>{{ d.rolling_class.identifier }}</td>
+                    <td>{{ d.item.rolling_class.identifier }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Road number</th>
-                    <td>{{ d.road_number }}</td>
+                    <td>{{ d.item.road_number }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Era</th>
-                    <td>{{ d.era }}</td>
+                    <td>{{ d.item.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 %}
+                    <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.scale.slug %}"><abbr title="{{ d.scale.ratio }} - {{ d.scale.tracks }} mm">{{ d.scale }}</abbr></a></td>
+                    <td><a href="{% url 'filtered' _filter="scale" search=d.item.scale.slug %}"><abbr title="{{ d.item.scale.ratio }} - {{ d.item.scale.tracks }} mm">{{ d.item.scale }}</abbr></a></td>
                   </tr>
                   <tr>
                     <th scope="row">Item number</th>
-                    <td>{{ d.item_number }}{%if d.set %} | <a class="badge text-bg-primary" href="{% url 'manufacturer' manufacturer=d.manufacturer.slug search=d.item_number_slug %}">SET</a>{% endif %}</td>
+                    <td>{{ d.item.item_number }}{%if d.item.set %} | <a class="badge text-bg-primary" href="{% url 'manufacturer' manufacturer=d.item.manufacturer.slug search=d.item.item_number_slug %}">SET</a>{% endif %}</td>
                   </tr>
                   <tr>
                     <th scope="row">DCC</th>
-                    <td><a class="text-reset text-decoration-none" title="Symbols" href="" data-bs-toggle="modal" data-bs-target="#symbolsModal">{% dcc d %}</a></td>
+                    <td><a class="text-reset text-decoration-none" title="Symbols" href="" data-bs-toggle="modal" data-bs-target="#symbolsModal">{% dcc d.item %}</a></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:roster_rollingstock_change' d.pk %}">Edit</a>{% endif %}
+               <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>

ram/portal/templates/cards/scale.html

@@ -1,7 +1,7 @@
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
-            <p class="card-text"><strong>{{ d }}</strong></p>
+            <p class="card-text"><strong>{{ d.item }}</strong></p>
             <table class="table table-striped">
               <thead>
                 <tr>
@@ -11,26 +11,26 @@
               <tbody>
                 <tr>
                   <th class="w-33" scope="row">Name</th>
-                  <td>{{ d.scale }}</td>
+                  <td>{{ d.item.scale }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Ratio</th>
-                  <td>{{ d.ratio }}</td>
+                  <td>{{ d.item.ratio }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Tracks</th>
-                  <td>{{ d.tracks }} mm</td>
+                  <td>{{ d.item.tracks }} mm</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Gauge</th>
-                  <td>{{ d.gauge }}</td>
+                  <td>{{ d.item.gauge }}</td>
                 </tr>
               </tbody>
             </table>
             <div class="d-grid gap-2 mb-1 d-md-block">
-              {% with items=d.num_items %}
-              <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="scale" search=d.slug %}">Show {{ items }} item{{ items | pluralize}}</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 %}
+              {% with items=d.item.num_items %}
+              <a class="btn btn-sm btn-outline-primary{% if items == 0 %} disabled{% endif %}" href="{% url 'filtered' _filter="scale" search=d.item.slug %}">Show {{ items }} item{{ items | pluralize}}</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 %}
               {% endwith %}
             </div>
           </div>

ram/portal/templates/consist.html

@@ -7,11 +7,11 @@
         {{ t.name }}</a>{# new line is required #}
         {% endfor %}
       </p>
-      {% endif %}
       {% if not consist.published %}
       <span class="badge text-bg-warning">Unpublished</span> |
       {% endif %}
       <small class="text-body-secondary">Updated {{ consist.updated_time | date:"M d, Y H:i" }}</small>
+      {% endif %}
       {% endblock %}
       {% block carousel %}
       {% if consist.image %}
@@ -26,42 +26,13 @@
       </div>
       {% endif %}
       {% endblock %}
-      {% block cards_layout %}
-      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
-      {% block cards %}
-        {% for d in data %}
-        {% include "cards/roster.html" %}
-        {% endfor %}
-      {% endblock %}
-      </div>
-      {% if loads %}
-      <div class="accordion shadow-sm mt-4" id="accordionLoads">
-        <div class="accordion-item">
-          <h2 class="accordion-header">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseLoads" aria-expanded="false" aria-controls="collapseLoads">
-              <i class="bi bi-download"></i>&nbsp;Rolling Stock loaded on freight cars
-            </button>
-          </h2>
-          <div id="collapseLoads" class="accordion-collapse collapse" data-bs-parent="#accordionLoads">
-            <div class="accordion-body">
-              <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
-                {% for l in loads %}
-                {% include "cards/roster.html" with d=l %}
-                {% endfor %}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endif %}
-      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation">
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'consist' uuid=consist.uuid page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -77,13 +48,13 @@
               {% 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' uuid=consist.uuid page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'consist' uuid=consist.uuid page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -102,10 +73,10 @@
               <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>
             </nav>
             <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
-              <option value="#nav-summary" selected>Summary</option>
+              <option value="nav-summary" selected>Summary</option>
             </select>
             <div class="tab-content" id="nav-tabContent">
-              <div class="tab-pane show active table-responsive" 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>
@@ -142,7 +113,7 @@
                     </tr>
                     <tr>
                       <th scope="row">Composition</th>
-                      <td>{% for t in consist.get_type_count %}{{ t.count }}x {{ t.type }} {{t.category }}{% if not forloop.last %} &raquo; {% endif %}{% endfor %}{% if loads %} | <i class="bi bi-download"></i> {{ loads|length }}x Load{{ loads|pluralize }}{% endif %}</td>
+                      <td>{% for t in consist.get_type_count %}{{ t.count }}x {{ t.type }} {{t.category }}{% if not forloop.last %} &raquo; {% endif %}{% endfor %}</td>
                     </tr>
                   </tbody>
                 </table>

ram/portal/templates/filter.html

@@ -5,7 +5,7 @@
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'filtered' _filter=filter search=search page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -21,13 +21,13 @@
               {% 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' _filter=filter search=search page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'filtered' _filter=filter search=search page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/home.html

@@ -3,18 +3,3 @@
       {% block header %}
         <div class="text-body-secondary">{{ site_conf.about | safe }}</div>
       {% endblock %}
-      {% block cards %}
-        {% for d in data %}
-        {% include "cards/roster.html" %}
-        {% endfor %}
-      {% endblock %}
-
-      {% block pagination %}
-      <nav aria-label="Page navigation">
-        <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
-          <li class="page-item">
-            <a class="page-link" href="{% url "roster" %}#main-content" tabindex="-1">Go to the roster <i class="bi bi-chevron-right"></i></a>
-          </li>
-        </ul>
-      </nav>
-      {% endblock %}

ram/portal/templates/magazine.html

@@ -32,7 +32,7 @@
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'magazine' uuid=magazine.uuid page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% url 'magazine_pagination' uuid=magazine.uuid page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -48,13 +48,13 @@
               {% 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 'magazine' uuid=magazine.uuid page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'magazine_pagination' uuid=magazine.uuid page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'magazine' uuid=magazine.uuid page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% url 'magazine_pagination' uuid=magazine.uuid page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -73,7 +73,7 @@
               <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>
             </nav>
             <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
-              <option value="#nav-summary" selected>Summary</option>
+              <option value="nav-summary" selected>Summary</option>
             </select>
             <div class="tab-content" id="nav-tabContent">
               <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
@@ -88,7 +88,7 @@
                   <tbody class="table-group-divider">
                     <tr>
                       <th class="w-33" scope="row">Name</th>
-                      <td>{{ magazine }}</td>
+                      <td>{{ magazine }} </td>
                     </tr>
                     <tr>
                       <th class="w-33" scope="row">Publisher</th>
@@ -97,14 +97,6 @@
                         {% if magazine.publisher.website %} <a href="{{ magazine.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                       </td>
                     </tr>
-                    <tr>
-                      <th class="w-33" scope="row">Website</th>
-                      <td>{% if magazine.website %}<a href="{{ magazine.website }}" target="_blank">{{ magazine.website_short }}</td>{% else %}-{% endif %}</td>
-                    </tr>
-                    <tr>
-                      <th class="w-33" scope="row">Language</th>
-                      <td>{{ magazine.get_language_display }}</td>
-                    </tr>
                     <tr>
                       <th scope="row">ISBN</th>
                       <td>{{ magazine.ISBN | default:"-" }}</td>

ram/portal/templates/manufacturer.html

@@ -5,7 +5,7 @@
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturer' manufacturer=manufacturer.slug search=search page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% url 'manufacturer_pagination' manufacturer=manufacturer.slug search=search page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -21,13 +21,13 @@
               {% 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 'manufacturer' manufacturer=manufacturer.slug search=search page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'manufacturer_pagination' manufacturer=manufacturer.slug search=search page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturer' manufacturer=manufacturer.slug search=search page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% url 'manufacturer_pagination' manufacturer=manufacturer.slug search=search page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/pagination.html

@@ -7,7 +7,7 @@
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url request.resolver_match.url_name page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% dynamic_pagination type page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -23,13 +23,13 @@
               {% 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 request.resolver_match.url_name page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% dynamic_pagination type page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url request.resolver_match.url_name page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% dynamic_pagination type page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/pagination_manufacturers.html

@@ -1,12 +1,12 @@
 {% extends "cards.html" %}
       {% 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">
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturers' category=c page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% url 'manufacturers_pagination' category=c page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -22,13 +22,13 @@
               {% 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 'manufacturers' category=c page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'manufacturers_pagination' category=c page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturers' category=c page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% url 'manufacturers_pagination' category=c page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/rollingstock.html

@@ -59,15 +59,15 @@
                 {% if consists %}<button class="nav-link" id="nav-consists-tab" data-bs-toggle="tab" data-bs-target="#nav-consists" type="button" role="tab" aria-controls="nav-consists" aria-selected="false">Consists</button>{% endif %}
               </nav>
               <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
-                <option value="#nav-summary" selected>Summary</option>
-                <option value="#nav-model">Model</option>
-                <option value="#nav-class">Class</option>
-                <option value="#nav-company">Company</option>
-                {% if rolling_stock.decoder or rolling_stock.decoder_interface %}<option value="#nav-dcc">DCC</option>{% endif %}
-                {% if documents or decoder_documents %}<option value="#nav-documents">Documents</option>{% endif %}
-                {% if journal %}<option value="#nav-journal">Journal</option>{% endif %}
-                {% if set %}<option value="#nav-set">Set</option>{% endif %}
-                {% if consists %}<option value="#nav-consists">Consists</option>{% endif %}
+                <option value="nav-summary" selected>Summary</option>
+                <option value="nav-model">Model</option>
+                <option value="nav-class">Class</option>
+                <option value="nav-company">Company</option>
+                {% if rolling_stock.decoder or rolling_stock.decoder_interface %}<option value="nav-dcc">DCC</option>{% endif %}
+                {% if documents or decoder_documents %}<option value="nav-documents">Documents</option>{% endif %}
+                {% if journal %}<option value="nav-journal">Journal</option>{% endif %}
+                {% if set %}<option value="nav-set">Set</option>{% endif %}
+                {% if consists %}<option value="nav-consists">Consists</option>{% endif %}
               </select>
               {% with class=rolling_stock.rolling_class company=rolling_stock.rolling_class.company %}
               <div class="tab-content" id="nav-tabContent">
@@ -217,8 +217,49 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% include "_modules/purchase_data.html" with data=rolling_stock %}
-                  {% include "_modules/properties.html" %}
+                  {% if request.user.is_staff %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Purchase</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                      <tr>
+                        <th class="w-33" scope="row">Shop</th>
+                        <td>
+                          {{ rolling_stock.shop | default:"-" }}
+                          {% if rolling_stock.shop.website %} <a href="{{ rolling_stock.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                        </td>
+                      </tr>
+                      <tr>
+                        <th class="w-33" scope="row">Purchase date</th>
+                        <td>{{ rolling_stock.purchase_date | default:"-" }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Price ({{ site_conf.currency }})</th>
+                        <td>{{ rolling_stock.price | default:"-" }}</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                  {% endif %}
+                  {% if properties %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Properties</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for p in properties %}
+                      <tr>
+                        <th class="w-33" scope="row">{{ p.property }}</th>
+                        <td>{{ p.value }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
                 </div>
                 <div class="tab-pane" id="nav-class" role="tabpanel" aria-labelledby="nav-class-tab">
                   <table class="table table-striped">
@@ -255,7 +296,23 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% include "_modules/properties.html" with properties=class_properties %}
+                  {% if class_properties %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Properties</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for p in class_properties %}
+                      <tr>
+                        <th class="w-33" scope="row">{{ p.property }}</th>
+                        <td>{{ p.value }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
                 </div>
                 <div class="tab-pane" id="nav-company" role="tabpanel" aria-labelledby="nav-company-tab">
                   <table class="table table-striped">
@@ -345,9 +402,43 @@
                     </tbody>
                   </table>
                 </div>
-                <div class="tab-pane table-responsive" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
-                  {% include "_modules/documents.html" %}
-                  {% include "_modules/documents.html" with documents=decoder_documents header="Decoder documents" %}
+                <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
+                  {% if documents %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="3" scope="row">Documents</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for d in documents.all %}
+                      <tr>
+                        <td class="w-33">{{ d.description }}</td>
+                        <td><a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a></td>
+                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
+                  {% if decoder_documents %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="3" scope="row">Decoder documents</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for d in decoder_documents.all %}
+                      <tr>
+                        <td class="w-33">{{ d.description }}</td>
+                        <td><a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a></td>
+                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
                 </div>
                 <div class="tab-pane" id="nav-journal" role="tabpanel" aria-labelledby="nav-journal-tab">
                   <table class="table table-striped">

ram/portal/templates/search.html

@@ -6,7 +6,7 @@
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'search' search=encoded_search page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% url 'search_pagination' search=encoded_search page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -22,13 +22,13 @@
               {% 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 'search' search=encoded_search page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'search_pagination' search=encoded_search page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'search' search=encoded_search page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% url 'search_pagination' search=encoded_search page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templatetags/dcc.py

@@ -17,13 +17,15 @@ def dcc(object):
             f'<i class="bi bi-dice-6"></i></abbr>'
         )
     if object.decoder:
-        decoder = mark_safe(f'<abbr title="{object.decoder}">')
         if object.decoder.sound:
-            decoder += mark_safe(
+            decoder = mark_safe(
+                f'<abbr title="{object.decoder}">'
                 '<i class="bi bi-volume-up-fill"></i></abbr>'
             )
         else:
-            decoder += mark_safe(
+            decoder = mark_safe(
+                f'<abbr title="{object.decoder}'
+                f'({object.get_decoder_interface()})">'
                 '<i class="bi bi-cpu-fill"></i></abbr>'
             )
     if decoder:

ram/portal/templatetags/dynamic_url.py

@@ -12,3 +12,10 @@ def dynamic_admin_url(app_name, model_name, object_id=None):
             args=[object_id]
         )
     return reverse(f'admin:{app_name}_{model_name}_changelist')
+
+
+@register.simple_tag
+def dynamic_pagination(reverse_name, page):
+    if reverse_name.endswith('y'):
+        return reverse(f'{reverse_name[:-1]}ies_pagination', args=[page])
+    return reverse(f'{reverse_name}s_pagination', args=[page])

ram/portal/templatetags/shuffle.py

@@ -1,11 +0,0 @@
-import random
-from django import template
-
-register = template.Library()
-
-
-@register.filter
-def shuffle(items):
-    shuffled_items = list(items)
-    random.shuffle(shuffled_items)
-    return shuffled_items

ram/portal/urls.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 from portal.views import (
-    GetHome,
+    GetData,
     GetRoster,
     GetObjectsFiltered,
     GetManufacturerItem,
@@ -23,75 +23,123 @@ from portal.views import (
 )
 
 urlpatterns = [
-    path("", GetHome.as_view(), name="index"),
+    path("", GetData.as_view(template="home.html"), name="index"),
     path("roster", GetRoster.as_view(), name="roster"),
-    path("roster/page/<int:page>", GetRoster.as_view(), name="roster"),
+    path(
+        "roster/page/<int:page>",
+        GetRoster.as_view(),
+        name="rosters_pagination"
+    ),
     path(
         "page/<str:flatpage>",
         GetFlatpage.as_view(),
         name="flatpage",
     ),
-    path("consists", Consists.as_view(), name="consists"),
-    path("consists/page/<int:page>", Consists.as_view(), name="consists"),
+    path(
+        "consists",
+        Consists.as_view(),
+        name="consists"
+    ),
+    path(
+        "consists/page/<int:page>",
+        Consists.as_view(),
+        name="consists_pagination"
+    ),
     path("consist/<uuid:uuid>", GetConsist.as_view(), name="consist"),
     path(
         "consist/<uuid:uuid>/page/<int:page>",
         GetConsist.as_view(),
-        name="consist",
+        name="consist_pagination",
+    ),
+    path(
+        "companies",
+        Companies.as_view(),
+        name="companies"
     ),
-    path("companies", Companies.as_view(), name="companies"),
     path(
         "companies/page/<int:page>",
         Companies.as_view(),
-        name="companies",
+        name="companies_pagination",
     ),
     path(
         "manufacturers/<str:category>",
         Manufacturers.as_view(template="pagination_manufacturers.html"),
-        name="manufacturers",
+        name="manufacturers"
     ),
     path(
         "manufacturers/<str:category>/page/<int:page>",
         Manufacturers.as_view(template="pagination_manufacturers.html"),
-        name="manufacturers",
+        name="manufacturers_pagination",
+    ),
+    path(
+        "scales",
+        Scales.as_view(),
+        name="scales"
+    ),
+    path(
+        "scales/page/<int:page>",
+        Scales.as_view(),
+        name="scales_pagination"
+    ),
+    path(
+        "types",
+        Types.as_view(),
+        name="rolling_stock_types"
+    ),
+    path(
+        "types/page/<int:page>",
+        Types.as_view(),
+        name="rolling_stock_types_pagination"
+    ),
+    path(
+        "bookshelf/books",
+        Books.as_view(),
+        name="books"
+    ),
+    path(
+        "bookshelf/books/page/<int:page>",
+        Books.as_view(),
+        name="books_pagination"
     ),
-    path("scales", Scales.as_view(), name="scales"),
-    path("scales/page/<int:page>", Scales.as_view(), name="scales"),
-    path("types", Types.as_view(), name="rolling_stock_types"),
-    path("types/page/<int:page>", Types.as_view(), name="rolling_stock_types"),
-    path("bookshelf/books", Books.as_view(), name="books"),
-    path("bookshelf/books/page/<int:page>", Books.as_view(), name="books"),
     path(
         "bookshelf/magazine/<uuid:uuid>",
         GetMagazine.as_view(),
-        name="magazine",
+        name="magazine"
     ),
     path(
         "bookshelf/magazine/<uuid:uuid>/page/<int:page>",
         GetMagazine.as_view(),
-        name="magazine",
+        name="magazine_pagination",
     ),
     path(
         "bookshelf/magazine/<uuid:magazine>/issue/<uuid:uuid>",
         GetMagazineIssue.as_view(),
         name="issue",
     ),
-    path("bookshelf/magazines", Magazines.as_view(), name="magazines"),
+    path(
+        "bookshelf/magazines",
+        Magazines.as_view(),
+        name="magazines"
+    ),
     path(
         "bookshelf/magazines/page/<int:page>",
         Magazines.as_view(),
-        name="magazines",
+        name="magazines_pagination"
     ),
     path(
         "bookshelf/<str:selector>/<uuid:uuid>",
         GetBookCatalog.as_view(),
-        name="bookshelf_item",
+        name="bookshelf_item"
+    ),
+    path(
+        "bookshelf/catalogs",
+        Catalogs.as_view(),
+        name="catalogs"
     ),
-    path("bookshelf/catalogs", Catalogs.as_view(), name="catalogs"),
     path(
         "bookshelf/catalogs/page/<int:page>",
         Catalogs.as_view(),
-        name="catalogs",
+        name="catalogs_pagination"
     ),
     path(
         "search",
@@ -101,7 +149,7 @@ urlpatterns = [
     path(
         "search/<str:search>/page/<int:page>",
         SearchObjects.as_view(),
-        name="search",
+        name="search_pagination",
     ),
     path(
         "manufacturer/<str:manufacturer>",
@@ -111,7 +159,7 @@ urlpatterns = [
     path(
         "manufacturer/<str:manufacturer>/page/<int:page>",
         GetManufacturerItem.as_view(),
-        name="manufacturer",
+        name="manufacturer_pagination",
     ),
     path(
         "manufacturer/<str:manufacturer>/<str:search>",
@@ -121,7 +169,7 @@ urlpatterns = [
     path(
         "manufacturer/<str:manufacturer>/<str:search>/page/<int:page>",
         GetManufacturerItem.as_view(),
-        name="manufacturer",
+        name="manufacturer_pagination",
     ),
     path(
         "<str:_filter>/<str:search>",
@@ -131,7 +179,7 @@ urlpatterns = [
     path(
         "<str:_filter>/<str:search>/page/<int:page>",
         GetObjectsFiltered.as_view(),
-        name="filtered",
+        name="filtered_pagination",
     ),
     path("<uuid:uuid>", GetRollingStock.as_view(), name="rolling_stock"),
 ]

ram/portal/views.py

@@ -4,13 +4,10 @@ from itertools import chain
 from functools import reduce
 from urllib.parse import unquote
 
-from django.conf import settings
 from django.views import View
-from django.urls import Resolver404
 from django.http import Http404, HttpResponseBadRequest
 from django.db.utils import OperationalError, ProgrammingError
 from django.db.models import F, Q, Count
-from django.db.models.functions import Lower
 from django.shortcuts import render, get_object_or_404, get_list_or_404
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.paginator import Paginator
@@ -34,67 +31,53 @@ def get_items_per_page():
         items_per_page = get_site_conf().items_per_page
     except (OperationalError, ProgrammingError):
         items_per_page = 6
-    return int(items_per_page)
+    return items_per_page
 
 
-def get_items_ordering(config="items_ordering"):
+def get_order_by_field():
     try:
-        order_by = getattr(get_site_conf(), config)
+        order_by = get_site_conf().items_ordering
     except (OperationalError, ProgrammingError):
         order_by = "type"
 
     fields = [
-        "rolling_class__type",              # 0
-        "rolling_class__company",           # 1
-        "rolling_class__company__country",  # 2
-        "rolling_class__identifier",        # 3
-        "road_number_int",                  # 4
+        "rolling_class__type",
+        "rolling_class__company",
+        "rolling_class__identifier",
+        "road_number_int",
     ]
 
-    order_map = {
-        "type": (0, 1, 3, 4),
-        "company": (1, 0, 3, 4),
-        "country": (2, 0, 1, 3, 4),
-        "cou+com": (2, 1, 0, 3, 4),
-        "class": (0, 3, 1, 4),
-    }
-
-    return tuple(fields[i] for i in order_map.get(order_by, "type"))
+    if order_by == "type":
+        return (fields[0], fields[1], fields[2], fields[3])
+    elif order_by == "company":
+        return (fields[1], fields[0], fields[2], fields[3])
+    elif order_by == "identifier":
+        return (fields[2], fields[0], fields[1], fields[3])
 
 
 class Render404(View):
     def get(self, request, exception):
-        generic_message = "Page not found"
-        if isinstance(exception, Resolver404):
-            message = generic_message
-        else:
-            message = str(exception) if exception else generic_message
-
-        return render(
-            request,
-            "base.html",
-            {"title": message},
-            status=404,
-        )
+        return render(request, "base.html", {"title": "404 page not found"})
 
 
 class GetData(View):
-    title = None
+    title = "Home"
     template = "pagination.html"
+    item_type = "roster"
     filter = Q()  # empty filter by default
 
     def get_data(self, request):
         return (
             RollingStock.objects.get_published(request.user)
-            .order_by(*get_items_ordering())
+            .order_by(*get_order_by_field())
             .filter(self.filter)
         )
 
-    def get(self, request, page=1):
-        if self.title is None or self.template is None:
-            raise Exception("title and template must be defined")
-
-        data = list(self.get_data(request))
+    def get(self, request, filter=Q(), page=1):
+        self.filter = filter
+        data = []
+        for item in self.get_data(request):
+            data.append({"type": self.item_type, "item": item})
 
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -107,6 +90,7 @@ class GetData(View):
             self.template,
             {
                 "title": self.title,
+                "type": self.item_type,
                 "data": data,
                 "matches": paginator.count,
                 "page_range": page_range,
@@ -114,38 +98,18 @@ class GetData(View):
         )
 
 
-class GetHome(GetData):
-    title = "Home"
-    template = "home.html"
-
-    def get_data(self, request):
-        max_items = min(settings.FEATURED_ITEMS_MAX, get_items_per_page())
-        return (
-            RollingStock.objects.get_published(request.user)
-            .filter(featured=True)
-            .order_by(*get_items_ordering(config="featured_items_ordering"))[
-                :max_items
-            ]
-        ) or super().get_data(request)
-
-
 class GetRoster(GetData):
     title = "The Roster"
+    item_type = "roster"
+
+    def get_data(self, request):
+        return RollingStock.objects.get_published(request.user).order_by(
+            *get_order_by_field()
+        )
 
 
 class SearchObjects(View):
     def run_search(self, request, search, _filter, page=1):
-        """
-        Run the search query on the database and return the results.
-        param request: HTTP request
-        param search: search string
-        param _filter: filter to apply (type, company, manufacturer, scale)
-        param page: page number for pagination
-        return: tuple (data, matches, page_range)
-        1. data: list of dicts with keys "type" and "item"
-        2. matches: total number of matches
-        3. page_range: elided page range for pagination
-        """
         if _filter is None:
             query = reduce(
                 operator.or_,
@@ -188,13 +152,15 @@ class SearchObjects(View):
         # FIXME duplicated code!
         # FIXME see if it makes sense to filter calatogs and books by scale
         #       and manufacturer as well
+        data = []
         roster = (
             RollingStock.objects.get_published(request.user)
             .filter(query)
             .distinct()
-            .order_by(*get_items_ordering())
+            .order_by(*get_order_by_field())
         )
-        data = list(roster)
+        for item in roster:
+            data.append({"type": "roster", "item": item})
 
         if _filter is None:
             consists = (
@@ -207,41 +173,20 @@ class SearchObjects(View):
                 )
                 .distinct()
             )
-            data = list(chain(data, consists))
+            for item in consists:
+                data.append({"type": "consist", "item": item})
             books = (
                 Book.objects.get_published(request.user)
-                .filter(
-                    Q(
-                        Q(title__icontains=search)
-                        | Q(description__icontains=search)
-                        | Q(toc__title__icontains=search)
-                    )
-                )
+                .filter(title__icontains=search)
                 .distinct()
             )
             catalogs = (
                 Catalog.objects.get_published(request.user)
-                .filter(
-                    Q(
-                        Q(manufacturer__name__icontains=search)
-                        | Q(description__icontains=search)
-                    )
-                )
+                .filter(manufacturer__name__icontains=search)
                 .distinct()
             )
-            data = list(chain(data, books, catalogs))
-            magazine_issues = (
-                MagazineIssue.objects.get_published(request.user)
-                .filter(
-                    Q(
-                        Q(magazine__name__icontains=search)
-                        | Q(description__icontains=search)
-                        | Q(toc__title__icontains=search)
-                    )
-                )
-                .distinct()
-            )
-            data = list(chain(data, magazine_issues))
+            for item in list(chain(books, catalogs)):
+                data.append({"type": "book", "item": item})
 
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -297,36 +242,20 @@ class SearchObjects(View):
 
 class GetManufacturerItem(View):
     def get(self, request, manufacturer, search="all", page=1):
-        """
-        Get all items from a specific manufacturer. If `search` is not "all",
-        filter by item number as well, for example to get all itmes from the
-        same set.
-        The view returns both rolling stock and catalogs.
-        param request: HTTP request
-        param manufacturer: Manufacturer slug
-        param search: item number slug or "all"
-        param page: page number for pagination
-        return: rendered template
-        1. manufacturer: Manufacturer object
-        2. search: item number slug or "all"
-        3. data: list of dicts with keys "type" and "item"
-        4. matches: total number of matches
-        5. page_range: elided page range for pagination
-        """
         manufacturer = get_object_or_404(
             Manufacturer, slug__iexact=manufacturer
         )
+
         if search != "all":
             roster = get_list_or_404(
                 RollingStock.objects.get_published(request.user).order_by(
-                    *get_items_ordering()
+                    *get_order_by_field()
                 ),
                 Q(
                     Q(manufacturer=manufacturer)
                     & Q(item_number_slug__exact=search)
                 ),
             )
-            catalogs = []  # no catalogs when searching for a specific item
             title = "{0}: {1}".format(
                 manufacturer,
                 # all returned records must have the same `item_number``;
@@ -341,14 +270,14 @@ class GetManufacturerItem(View):
                     | Q(rolling_class__manufacturer=manufacturer)
                 )
                 .distinct()
-                .order_by(*get_items_ordering())
-            )
-            catalogs = Catalog.objects.get_published(request.user).filter(
-                manufacturer=manufacturer
+                .order_by(*get_order_by_field())
             )
             title = "Manufacturer: {0}".format(manufacturer)
 
-        data = list(chain(roster, catalogs))
+        data = []
+        for item in roster:
+            data.append({"type": "roster", "item": item})
+
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
@@ -394,18 +323,12 @@ class GetObjectsFiltered(View):
             RollingStock.objects.get_published(request.user)
             .filter(query)
             .distinct()
-            .order_by(*get_items_ordering())
+            .order_by(*get_order_by_field())
         )
 
-        data = list(roster)
-
-        if _filter == "scale":
-            catalogs = (
-                Catalog.objects.get_published(request.user)
-                .filter(scales__slug=search)
-                .distinct()
-            )
-            data = list(chain(data, catalogs))
+        data = []
+        for item in roster:
+            data.append({"type": "roster", "item": item})
 
         try:  # Execute only if query_2nd is defined
             consists = (
@@ -413,24 +336,23 @@ class GetObjectsFiltered(View):
                 .filter(query_2nd)
                 .distinct()
             )
-            data = list(chain(data, consists))
+            for item in consists:
+                data.append({"type": "consist", "item": item})
             if _filter == "tag":  # Books can be filtered only by tag
                 books = (
                     Book.objects.get_published(request.user)
                     .filter(query_2nd)
                     .distinct()
                 )
+                for item in books:
+                    data.append({"type": "book", "item": item})
                 catalogs = (
                     Catalog.objects.get_published(request.user)
                     .filter(query_2nd)
                     .distinct()
                 )
-                magazine_issues = (
-                    MagazineIssue.objects.get_published(request.user)
-                    .filter(query_2nd)
-                    .distinct()
-                )
-                data = list(chain(data, books, catalogs, magazine_issues))
+                for item in catalogs:
+                    data.append({"type": "catalog", "item": item})
         except NameError:
             pass
 
@@ -484,22 +406,24 @@ class GetRollingStock(View):
                 request.user
             )
 
-        consists = list(
-            Consist.objects.get_published(request.user).filter(
+        consists = [
+            {"type": "consist", "item": c}
+            for c in Consist.objects.get_published(request.user).filter(
                 consist_item__rolling_stock=rolling_stock
             )
-        )
+        ]  # A dict with "item" is required by the consists card
 
-        trainset = list(
-            RollingStock.objects.get_published(request.user)
+        set = [
+            {"type": "set", "item": s}
+            for s in RollingStock.objects.get_published(request.user)
             .filter(
                 Q(
                     Q(item_number__exact=rolling_stock.item_number)
                     & Q(set=True)
                 )
             )
-            .order_by(*get_items_ordering())
-        )
+            .order_by(*get_order_by_field())
+        ]
 
         return render(
             request,
@@ -512,7 +436,7 @@ class GetRollingStock(View):
                 "decoder_documents": decoder_documents,
                 "documents": documents,
                 "journal": journal,
-                "set": trainset,
+                "set": set,
                 "consists": consists,
             },
         )
@@ -520,6 +444,7 @@ class GetRollingStock(View):
 
 class Consists(GetData):
     title = "Consists"
+    item_type = "consist"
 
     def get_data(self, request):
         return Consist.objects.get_published(request.user).all()
@@ -533,19 +458,16 @@ class GetConsist(View):
             )
         except ObjectDoesNotExist:
             raise Http404
+        data = [
+            {
+                "type": "roster",
+                "item": RollingStock.objects.get_published(request.user).get(
+                    uuid=r.rolling_stock_id
+                ),
+            }
+            for r in consist.consist_item.all()
+        ]
 
-        data = list(
-            RollingStock.objects.get_published(request.user).get(
-                uuid=r.rolling_stock_id
-            )
-            for r in consist.consist_item.filter(load=False)
-        )
-        loads = list(
-            RollingStock.objects.get_published(request.user).get(
-                uuid=r.rolling_stock_id
-            )
-            for r in consist.consist_item.filter(load=True)
-        )
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
@@ -559,7 +481,6 @@ class GetConsist(View):
                 "title": consist,
                 "consist": consist,
                 "data": data,
-                "loads": loads,
                 "page_range": page_range,
             },
         )
@@ -567,6 +488,7 @@ class GetConsist(View):
 
 class Manufacturers(GetData):
     title = "Manufacturers"
+    item_type = "manufacturer"
 
     def get_data(self, request):
         return (
@@ -601,26 +523,7 @@ class Manufacturers(GetData):
                     )
                 )
             )
-            .annotate(
-                num_catalogs=(
-                    Count(
-                        "catalogs",
-                        filter=Q(
-                            catalogs__in=(
-                                Catalog.objects.get_published(request.user)
-                            ),
-                        ),
-                        distinct=True,
-                    )
-                )
-            )
-            .annotate(
-                num_items=(
-                    F("num_rollingstock")
-                    + F("num_rollingclass")
-                    + F("num_catalogs")
-                )
-            )
+            .annotate(num_items=F("num_rollingstock") + F("num_rollingclass"))
             .order_by("name")
         )
 
@@ -635,6 +538,7 @@ class Manufacturers(GetData):
 
 class Companies(GetData):
     title = "Companies"
+    item_type = "company"
 
     def get_data(self, request):
         return (
@@ -673,6 +577,7 @@ class Companies(GetData):
 
 class Scales(GetData):
     title = "Scales"
+    item_type = "scale"
 
     def get_data(self, request):
         return (
@@ -693,21 +598,15 @@ class Scales(GetData):
                     ),
                     distinct=True,
                 ),
-                num_catalogs=Count("catalogs", distinct=True),
-            )
-            .annotate(
-                num_items=(
-                    F("num_rollingstock")
-                    + F("num_consists")
-                    + F("num_catalogs")
-                )
             )
+            .annotate(num_items=F("num_rollingstock") + F("num_consists"))
             .order_by("-ratio_int", "-tracks", "scale")
         )
 
 
 class Types(GetData):
     title = "Types"
+    item_type = "rolling_stock_type"
 
     def get_data(self, request):
         return RollingStockType.objects.annotate(
@@ -724,6 +623,7 @@ class Types(GetData):
 
 class Books(GetData):
     title = "Books"
+    item_type = "book"
 
     def get_data(self, request):
         return Book.objects.get_published(request.user).all()
@@ -731,6 +631,7 @@ class Books(GetData):
 
 class Catalogs(GetData):
     title = "Catalogs"
+    item_type = "catalog"
 
     def get_data(self, request):
         return Catalog.objects.get_published(request.user).all()
@@ -738,11 +639,12 @@ class Catalogs(GetData):
 
 class Magazines(GetData):
     title = "Magazines"
+    item_type = "magazine"
 
     def get_data(self, request):
         return (
             Magazine.objects.get_published(request.user)
-            .order_by(Lower("name"))
+            .all()
             .annotate(
                 issues=Count(
                     "issue",
@@ -764,7 +666,13 @@ class GetMagazine(View):
             )
         except ObjectDoesNotExist:
             raise Http404
-        data = list(magazine.issue.get_published(request.user).all())
+        data = [
+            {
+                "type": "magazineissue",
+                "item": i,
+            }
+            for i in magazine.issue.get_published(request.user).all()
+        ]
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
@@ -773,7 +681,7 @@ class GetMagazine(View):
 
         return render(
             request,
-            "bookshelf/magazine.html",
+            "magazine.html",
             {
                 "title": magazine,
                 "magazine": magazine,
@@ -800,9 +708,10 @@ class GetMagazineIssue(View):
             "bookshelf/book.html",
             {
                 "title": issue,
-                "data": issue,
+                "book": issue,
                 "documents": documents,
                 "properties": properties,
+                "type": "magazineissue",
             },
         )
 
@@ -829,9 +738,10 @@ class GetBookCatalog(View):
             "bookshelf/book.html",
             {
                 "title": book,
-                "data": book,
+                "book": book,
                 "documents": documents,
                 "properties": properties,
+                "type": selector,
             },
         )
 

ram/ram/__init__.py

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

ram/ram/admin.py

@@ -1,60 +1,22 @@
-from django.conf import settings
 from django.contrib import admin
-from django.core.cache import cache
+from django.conf import settings
 
 admin.site.site_header = settings.SITE_NAME
 
 
 def publish(modeladmin, request, queryset):
-    queryset.update(published=True)
-    cache.clear()
+    for obj in queryset:
+        obj.published = True
+        obj.save()
 
 
 publish.short_description = "Publish selected items"
 
 
 def unpublish(modeladmin, request, queryset):
-    queryset.update(published=False)
-    cache.clear()
+    for obj in queryset:
+        obj.published = False
+        obj.save()
 
 
 unpublish.short_description = "Unpublish selected items"
-
-
-def set_featured(modeladmin, request, queryset):
-    count = queryset.count()
-    if count > settings.FEATURED_ITEMS_MAX:
-        modeladmin.message_user(
-            request,
-            "You can only mark up to {} items as featured.".format(
-                settings.FEATURED_ITEMS_MAX
-            ),
-            level="error",
-        )
-        return
-    featured = modeladmin.model.objects.filter(featured=True).count()
-    if featured + count > settings.FEATURED_ITEMS_MAX:
-        modeladmin.message_user(
-            request,
-            "There are already {} featured items. You can only mark {} more items as featured.".format(  # noqa: E501
-                featured,
-                settings.FEATURED_ITEMS_MAX - featured,
-            ),
-            level="error",
-        )
-        return
-    queryset.update(featured=True)
-    cache.clear()
-
-
-set_featured.short_description = "Mark selected items as featured"
-
-
-def unset_featured(modeladmin, request, queryset):
-    queryset.update(featured=False)
-    cache.clear()
-
-
-unset_featured.short_description = (
-    "Unmark selected items as featured"
-)

ram/ram/local_settings.py.tmpl

@@ -34,4 +34,3 @@ ALLOWED_HOSTS = ["127.0.0.1", "myhost"]
 CSRF_TRUSTED_ORIGINS = ["https://myhost"]
 STATIC_URL = "static/"
 MEDIA_URL = "media/"
-USE_X_ACCEL_REDIRECT = True

ram/ram/models.py

@@ -9,19 +9,6 @@ from ram.utils import DeduplicatedStorage, get_image_preview
 from ram.managers import PublicManager
 
 
-class SimpleBaseModel(models.Model):
-    class Meta:
-        abstract = True
-
-    @property
-    def obj_type(self):
-        return self._meta.model_name
-
-    @property
-    def obj_label(self):
-        return self._meta.object_name
-
-
 class BaseModel(models.Model):
     uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     description = tinymce.HTMLField(blank=True)
@@ -33,14 +20,6 @@ class BaseModel(models.Model):
     class Meta:
         abstract = True
 
-    @property
-    def obj_type(self):
-        return self._meta.model_name
-
-    @property
-    def obj_label(self):
-        return self._meta.object_name
-
     objects = PublicManager()
 
 

ram/ram/settings.py

@@ -1,7 +1,17 @@
 """
 Django settings for ram project.
+
+Generated by 'django-admin startproject' using Django 4.0.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/4.0/ref/settings/
 """
 
+import os
+import time
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -13,7 +23,7 @@ STORAGE_DIR = BASE_DIR / "storage"
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = (
-    "django-ram-insecure-Chang3m3-1n-Pr0duct10n!"
+    "django-insecure-1fgtf05rwp0qp05@ef@a7%x#o+t6vk6063py=vhdmut0j!8s4u"
 )
 
 # SECURITY WARNING: don't run with debug turned on in production!
@@ -21,6 +31,9 @@ DEBUG = True
 
 ALLOWED_HOSTS = ["*"]
 
+
+# Application definition
+
 INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.auth",
@@ -74,6 +87,10 @@ TEMPLATES = [
 
 WSGI_APPLICATION = "ram.wsgi.application"
 
+
+# Database
+# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
+
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
@@ -81,38 +98,54 @@ DATABASES = {
     }
 }
 
+
+# Password validation
+# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
+
 AUTH_PASSWORD_VALIDATORS = [
     {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",  # noqa: E501
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
     },
     {
-        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",  # noqa: E501
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
     },
     {
-        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",  # noqa: E501
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
     },
     {
-        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",  # noqa: E501
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
     },
 ]
 
 
+# Internationalization
+# https://docs.djangoproject.com/en/4.0/topics/i18n/
+
 LANGUAGE_CODE = "en-us"
+
 TIME_ZONE = "UTC"
+
 USE_I18N = True
+
 USE_TZ = True
 
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/4.0/howto/static-files/
+
 STATIC_URL = "static/"
 
+# Default primary key field type
+# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
+
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 MEDIA_URL = "media/"
 MEDIA_ROOT = STORAGE_DIR / "media"
 
-# django-ram REST API settings
 REST_ENABLED = False  # Set to True to enable the REST API
 REST_FRAMEWORK = {
-    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",  # noqa: E501
+    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
     "PAGE_SIZE": 5,
 }
 
@@ -138,7 +171,7 @@ COUNTRIES_OVERRIDE = {
     "XX": "None",
 }
 
-SITE_NAME = "Railroad Assets Manager"
+SITE_NAME = "Railroad Assets Manger"
 
 # Image used on cards without a custom image uploaded.
 # The file must be placed in the root of the 'static' folder
@@ -151,10 +184,9 @@ DECODER_INTERFACES = [
     (0, "Built-in"),
     (1, "NEM651"),
     (2, "NEM652"),
-    (3, "NEM658 (Plux22)"),
-    (4, "NEM660 (21MTC)"),
-    (5, "NEM662 (Next18/Next18S)"),
-    (3, "NEM658 (Plux16)"),
+    (3, "PluX"),
+    (4, "21MTC"),
+    (5, "Next18/Next18S"),
 ]
 
 MANUFACTURER_TYPES = [
@@ -172,21 +204,6 @@ ROLLING_STOCK_TYPES = [
     ("other", "Other"),
 ]
 
-FEATURED_ITEMS_MAX = 6
-
-# If True, use X-Accel-Redirect (Nginx)
-# when using X-Accel-Redirect, we don't serve the file
-# directly from Django, but let Nginx handle it
-# in Nginx config, we need to map /private/ to
-# the actual media files location with internal directive
-# eg:
-#   location /private {
-#       internal;
-#       alias /path/to/media;
-#   }
-# make also sure that the entire /media is _not_ mapped directly in Nginx
-USE_X_ACCEL_REDIRECT = False
-
 try:
     from ram.local_settings import *
 except ImportError:

ram/ram/urls.py

@@ -21,22 +21,17 @@ from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import include, path
 
-from ram.views import UploadImage, DownloadFile
+from ram.views import UploadImage
 from portal.views import Render404
 
 handler404 = Render404.as_view()
 
 urlpatterns = [
     path("", lambda r: redirect("portal/")),
-    path("admin/", admin.site.urls),
     path("tinymce/", include("tinymce.urls")),
     path("tinymce/upload_image", UploadImage.as_view(), name="upload_image"),
-    path(
-        "media/files/<path:filename>",
-        DownloadFile.as_view(),
-        name="download_file",
-    ),
     path("portal/", include("portal.urls")),
+    path("admin/", admin.site.urls),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # Enable the "/dcc" routing only if the "driver" app is active
@@ -60,7 +55,6 @@ if settings.DEBUG:
     if settings.REST_ENABLED:
         from django.views.generic import TemplateView
         from rest_framework.schemas import get_schema_view
-
         urlpatterns += [
             path(
                 "swagger/",

ram/ram/views.py

@@ -5,26 +5,19 @@ import posixpath
 from pathlib import Path
 from PIL import Image, UnidentifiedImageError
 
-from django.apps import apps
+from django.views import View
 from django.conf import settings
 from django.http import (
-    Http404,
-    HttpResponse,
     HttpResponseBadRequest,
     HttpResponseForbidden,
-    FileResponse,
     JsonResponse,
 )
-from django.views import View
 from django.utils.text import slugify as slugify
-from django.utils.encoding import smart_str
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 
 from rest_framework.pagination import LimitOffsetPagination
 
-from ram.models import PrivateDocument
-
 
 class CustomLimitOffsetPagination(LimitOffsetPagination):
     default_limit = 10
@@ -74,50 +67,3 @@ class UploadImage(View):
                     ),
                 }
             )
-
-
-class DownloadFile(View):
-    def get(self, request, filename, disposition="inline"):
-        # Clean up the filename to prevent directory traversal attacks
-        filename = os.path.basename(filename)
-
-        # Find a document where the stored file name matches
-        # Find all models inheriting from PublishableFile
-        for model in apps.get_models():
-            if issubclass(model, PrivateDocument) and not model._meta.abstract:
-                try:
-                    doc = model.objects.get(file__endswith=filename)
-                    if doc.private and not request.user.is_staff:
-                        break
-
-                    file = doc.file
-                    if not os.path.exists(file.path):
-                        break
-
-                    # in Nginx config, we need to map /private/ to
-                    # the actual media files location with internal directive
-                    # eg:
-                    #   location /private {
-                    #       internal;
-                    #       alias /path/to/media;
-                    #   }
-                    if getattr(settings, "USE_X_ACCEL_REDIRECT", False):
-                        response = HttpResponse()
-                        response["Content-Type"] = ""
-                        response["X-Accel-Redirect"] = f"/private/{file.name}"
-                    else:
-                        response = FileResponse(
-                            open(file.path, "rb"), as_attachment=True
-                        )
-
-                    response["Content-Disposition"] = (
-                        '{}; filename="{}"'.format(
-                            disposition,
-                            smart_str(os.path.basename(file.path))
-                        )
-                    )
-                    return response
-                except model.DoesNotExist:
-                    continue
-
-        raise Http404("File not found")

ram/roster/admin.py

@@ -2,16 +2,12 @@ import html
 
 from django.conf import settings
 from django.contrib import admin
-from django.utils.html import (
-    format_html,
-    format_html_join,
-    strip_tags,
-    mark_safe,
-)
+from django.utils.html import format_html, format_html_join, strip_tags
+
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
+from ram.admin import publish, unpublish
 from ram.utils import generate_csv
-from ram.admin import publish, unpublish, set_featured, unset_featured
 from repository.models import RollingStockDocument
 from portal.utils import get_site_conf
 from roster.models import (
@@ -48,23 +44,21 @@ class RollingClass(admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" title="{}" />',
-            obj.company.country.flag,
-            obj.company.country.name,
+            '<img src="{}" /> {}', obj.country.flag, obj.country.name
         )
 
 
 class RollingStockDocInline(admin.TabularInline):
     model = RollingStockDocument
     min_num = 0
-    extra = 1
+    extra = 0
     classes = ["collapse"]
 
 
 class RollingStockImageInline(SortableInlineAdminMixin, admin.TabularInline):
     model = RollingStockImage
     min_num = 0
-    extra = 1
+    extra = 0
     readonly_fields = ("image_thumbnail",)
     classes = ["collapse"]
 
@@ -134,12 +128,9 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
         "item_number",
         "company",
         "country_flag",
-        "featured",
         "published",
     )
     list_filter = (
-        "featured",
-        "published",
         "rolling_class__type__category",
         "rolling_class__type",
         "rolling_class__company__name",
@@ -161,7 +152,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" title="{}" />', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}', obj.country.flag, obj.country.name
         )
 
     fieldsets = (
@@ -171,7 +162,6 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
                 "fields": (
                     "preview",
                     "published",
-                    "featured",
                     "rolling_class",
                     "road_number",
                     "scale",
@@ -233,9 +223,9 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
     def invoices(self, obj):
         if obj.invoice.exists():
             html = format_html_join(
-                mark_safe("<br>"),
-                '<a href="{}" target="_blank">{}</a>',
-                ((i.file.url, i) for i in obj.invoice.all()),
+                "<br>",
+                "<a href=\"{}\" target=\"_blank\">{}</a>",
+                ((i.file.url, i) for i in obj.invoice.all())
             )
         else:
             html = "-"
@@ -306,5 +296,4 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
         return generate_csv(header, data, "rolling_stock.csv")
 
     download_csv.short_description = "Download selected items as CSV"
-
-    actions = [publish, unpublish, set_featured, unset_featured, download_csv]
+    actions = [publish, unpublish, download_csv]

ram/roster/migrations/0039_rollingstock_featured.py

@@ -1,21 +0,0 @@
-# Generated by Django 6.0 on 2025-12-24 13:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("roster", "0038_alter_rollingstock_rolling_class"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="rollingstock",
-            name="featured",
-            field=models.BooleanField(
-                default=False,
-                help_text="Featured rolling stock will appear on the homepage",
-            ),
-        ),
-    ]

ram/roster/migrations/0040_alter_rollingstock_decoder_interface.py

@@ -1,30 +0,0 @@
-# Generated by Django 6.0 on 2026-01-08 11:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("roster", "0039_rollingstock_featured"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="rollingstock",
-            name="decoder_interface",
-            field=models.PositiveSmallIntegerField(
-                blank=True,
-                choices=[
-                    (0, "Built-in"),
-                    (1, "NEM651"),
-                    (2, "NEM652"),
-                    (3, "NEM658 (Plux22)"),
-                    (4, "NEM660 (21MTC)"),
-                    (5, "NEM662 (Next18/Next18S)"),
-                    (3, "NEM658 (Plux16)"),
-                ],
-                null=True,
-            ),
-        ),
-    ]

ram/roster/models.py

@@ -5,7 +5,6 @@ from django.db import models
 from django.urls import reverse
 from django.conf import settings
 from django.dispatch import receiver
-from django.core.exceptions import ValidationError
 
 from tinymce import models as tinymce
 
@@ -83,7 +82,9 @@ class RollingStock(BaseModel):
         help_text="Catalog item number or code",
     )
     item_number_slug = models.CharField(
-        max_length=32, blank=True, editable=False
+        max_length=32,
+        blank=True,
+        editable=False
     )
     set = models.BooleanField(
         default=False,
@@ -112,10 +113,6 @@ class RollingStock(BaseModel):
         null=True,
         blank=True,
     )
-    featured = models.BooleanField(
-        default=False,
-        help_text="Featured rolling stock will appear on the homepage",
-    )
     tags = models.ManyToManyField(
         Tag, related_name="rolling_stock", blank=True
     )
@@ -168,23 +165,10 @@ class RollingStock(BaseModel):
             os.path.join(
                 settings.MEDIA_ROOT, "images", "rollingstock", str(self.uuid)
             ),
-            ignore_errors=True,
+            ignore_errors=True
         )
         super(RollingStock, self).delete(*args, **kwargs)
 
-    def clean(self, *args, **kwargs):
-        if self.featured:
-            MAX = settings.FEATURED_ITEMS_MAX
-            featured_count = (
-                RollingStock.objects.filter(featured=True)
-                .exclude(uuid=self.uuid)
-                .count()
-            )
-            if featured_count > MAX - 1:
-                raise ValidationError(
-                    "There are already {} featured items".format(MAX)
-                )
-
 
 @receiver(models.signals.pre_save, sender=RollingStock)
 def pre_save_internal_fields(sender, instance, *args, **kwargs):
@@ -201,7 +185,10 @@ def pre_save_internal_fields(sender, instance, *args, **kwargs):
 
 def rolling_stock_image_upload(instance, filename):
     return os.path.join(
-        "images", "rollingstock", str(instance.rolling_stock.uuid), filename
+        "images",
+        "rollingstock",
+        str(instance.rolling_stock.uuid),
+        filename
     )
 
 

sample_data/cards/generate_card.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-mkdir -p output
-
-for img in input/*.{jpg,png}; do
-  [ -e "$img" ] || continue  # skip if no files
-  name=$(basename "${img%.*}").jpg
-  magick convert background.png \
-    \( "$img" -resize x820 \) \
-    -gravity center -composite \
-    -quality 85 -sampling-factor 4:4:4 \
-    "output/$name"
-done