Minor fix

ram/bookshelf/admin.py

@@ -22,6 +22,7 @@ from bookshelf.models import (
     Catalog,
     Magazine,
     MagazineIssue,
+    TocEntry,
 )
 
 
@@ -363,9 +364,23 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
     actions = [publish, unpublish, download_csv]
 
 
+class MagazineIssueToc(admin.TabularInline):
+    model = TocEntry
+    min_num = 0
+    extra = 0
+    fields = (
+        "title",
+        "subtitle",
+        "authors",
+        "page",
+        "featured",
+    )
+
+
 @admin.register(MagazineIssue)
 class MagazineIssueAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
+        MagazineIssueToc,
         BookPropertyInline,
         BookImageInline,
         MagazineIssueDocInline,

ram/bookshelf/migrations/0030_tocentry.py

@@ -0,0 +1,53 @@
+# 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/models.py

@@ -239,3 +239,35 @@ class MagazineIssue(BaseBook):
         return reverse(
             "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(max_length=200)
+    subtitle = models.CharField(max_length=200, blank=True)
+    authors = models.CharField(max_length=256, 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):
+        return f"{self.title} (p. {self.page})"
+
+    def clean(self):
+        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/portal/templates/cards/roster.html

@@ -3,12 +3,19 @@
 
         <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>
-            {% 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 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>
             <div class="card-body">
               <p class="card-text" style="position: relative;">
                 <strong>{{ d }}</strong>

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_pagination' 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' 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_pagination' uuid=magazine.uuid page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'magazine' 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_pagination' 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' 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">

ram/ram/__init__.py

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

ram/roster/models.py

@@ -175,7 +175,12 @@ class RollingStock(BaseModel):
     def clean(self, *args, **kwargs):
         if self.featured:
             MAX = settings.FEATURED_ITEMS_MAX
-            if RollingStock.objects.filter(featured=True).count() > MAX - 1:
+            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)
                 )