Add some utils to generate cards via imagemagick

* Work in progress to implement magazines and issues UI

* Fully implement UI for magazines

ram/bookshelf/admin.py

@@ -475,6 +475,7 @@ class MagazineAdmin(SortableAdminBase, admin.ModelAdmin):
                 "fields": (
                     "published",
                     "name",
+                    "website",
                     "publisher",
                     "ISBN",
                     "language",

ram/bookshelf/migrations/0026_alter_basebook_language_alter_magazine_image_and_more.py

@@ -0,0 +1,244 @@
+# Generated by Django 6.0 on 2025-12-10 20:59
+
+import bookshelf.models
+import ram.utils
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0025_magazine_magazineissue"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="basebook",
+            name="language",
+            field=models.CharField(
+                choices=[
+                    ("af", "Afrikaans"),
+                    ("sq", "Albanian"),
+                    ("ar-dz", "Algerian Arabic"),
+                    ("ar", "Arabic"),
+                    ("es-ar", "Argentinian Spanish"),
+                    ("hy", "Armenian"),
+                    ("ast", "Asturian"),
+                    ("en-au", "Australian English"),
+                    ("az", "Azerbaijani"),
+                    ("eu", "Basque"),
+                    ("be", "Belarusian"),
+                    ("bn", "Bengali"),
+                    ("bs", "Bosnian"),
+                    ("pt-br", "Brazilian Portuguese"),
+                    ("br", "Breton"),
+                    ("en-gb", "British English"),
+                    ("bg", "Bulgarian"),
+                    ("my", "Burmese"),
+                    ("ca", "Catalan"),
+                    ("ckb", "Central Kurdish (Sorani)"),
+                    ("es-co", "Colombian Spanish"),
+                    ("hr", "Croatian"),
+                    ("cs", "Czech"),
+                    ("da", "Danish"),
+                    ("nl", "Dutch"),
+                    ("en", "English"),
+                    ("eo", "Esperanto"),
+                    ("et", "Estonian"),
+                    ("fi", "Finnish"),
+                    ("fr", "French"),
+                    ("fy", "Frisian"),
+                    ("gl", "Galician"),
+                    ("ka", "Georgian"),
+                    ("de", "German"),
+                    ("el", "Greek"),
+                    ("ht", "Haitian Creole"),
+                    ("he", "Hebrew"),
+                    ("hi", "Hindi"),
+                    ("hu", "Hungarian"),
+                    ("is", "Icelandic"),
+                    ("io", "Ido"),
+                    ("ig", "Igbo"),
+                    ("id", "Indonesian"),
+                    ("ia", "Interlingua"),
+                    ("ga", "Irish"),
+                    ("it", "Italian"),
+                    ("ja", "Japanese"),
+                    ("kab", "Kabyle"),
+                    ("kn", "Kannada"),
+                    ("kk", "Kazakh"),
+                    ("km", "Khmer"),
+                    ("ko", "Korean"),
+                    ("ky", "Kyrgyz"),
+                    ("lv", "Latvian"),
+                    ("lt", "Lithuanian"),
+                    ("dsb", "Lower Sorbian"),
+                    ("lb", "Luxembourgish"),
+                    ("mk", "Macedonian"),
+                    ("ms", "Malay"),
+                    ("ml", "Malayalam"),
+                    ("mr", "Marathi"),
+                    ("es-mx", "Mexican Spanish"),
+                    ("mn", "Mongolian"),
+                    ("ne", "Nepali"),
+                    ("es-ni", "Nicaraguan Spanish"),
+                    ("nb", "Norwegian Bokmål"),
+                    ("nn", "Norwegian Nynorsk"),
+                    ("os", "Ossetic"),
+                    ("fa", "Persian"),
+                    ("pl", "Polish"),
+                    ("pt", "Portuguese"),
+                    ("pa", "Punjabi"),
+                    ("ro", "Romanian"),
+                    ("ru", "Russian"),
+                    ("gd", "Scottish Gaelic"),
+                    ("sr", "Serbian"),
+                    ("sr-latn", "Serbian Latin"),
+                    ("zh-hans", "Simplified Chinese"),
+                    ("sk", "Slovak"),
+                    ("sl", "Slovenian"),
+                    ("es", "Spanish"),
+                    ("sw", "Swahili"),
+                    ("sv", "Swedish"),
+                    ("tg", "Tajik"),
+                    ("ta", "Tamil"),
+                    ("tt", "Tatar"),
+                    ("te", "Telugu"),
+                    ("th", "Thai"),
+                    ("zh-hant", "Traditional Chinese"),
+                    ("tr", "Turkish"),
+                    ("tk", "Turkmen"),
+                    ("udm", "Udmurt"),
+                    ("uk", "Ukrainian"),
+                    ("hsb", "Upper Sorbian"),
+                    ("ur", "Urdu"),
+                    ("ug", "Uyghur"),
+                    ("uz", "Uzbek"),
+                    ("es-ve", "Venezuelan Spanish"),
+                    ("vi", "Vietnamese"),
+                    ("cy", "Welsh"),
+                ],
+                default="en",
+                max_length=7,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="magazine",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to=bookshelf.models.magazine_image_upload,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="magazine",
+            name="language",
+            field=models.CharField(
+                choices=[
+                    ("af", "Afrikaans"),
+                    ("sq", "Albanian"),
+                    ("ar-dz", "Algerian Arabic"),
+                    ("ar", "Arabic"),
+                    ("es-ar", "Argentinian Spanish"),
+                    ("hy", "Armenian"),
+                    ("ast", "Asturian"),
+                    ("en-au", "Australian English"),
+                    ("az", "Azerbaijani"),
+                    ("eu", "Basque"),
+                    ("be", "Belarusian"),
+                    ("bn", "Bengali"),
+                    ("bs", "Bosnian"),
+                    ("pt-br", "Brazilian Portuguese"),
+                    ("br", "Breton"),
+                    ("en-gb", "British English"),
+                    ("bg", "Bulgarian"),
+                    ("my", "Burmese"),
+                    ("ca", "Catalan"),
+                    ("ckb", "Central Kurdish (Sorani)"),
+                    ("es-co", "Colombian Spanish"),
+                    ("hr", "Croatian"),
+                    ("cs", "Czech"),
+                    ("da", "Danish"),
+                    ("nl", "Dutch"),
+                    ("en", "English"),
+                    ("eo", "Esperanto"),
+                    ("et", "Estonian"),
+                    ("fi", "Finnish"),
+                    ("fr", "French"),
+                    ("fy", "Frisian"),
+                    ("gl", "Galician"),
+                    ("ka", "Georgian"),
+                    ("de", "German"),
+                    ("el", "Greek"),
+                    ("ht", "Haitian Creole"),
+                    ("he", "Hebrew"),
+                    ("hi", "Hindi"),
+                    ("hu", "Hungarian"),
+                    ("is", "Icelandic"),
+                    ("io", "Ido"),
+                    ("ig", "Igbo"),
+                    ("id", "Indonesian"),
+                    ("ia", "Interlingua"),
+                    ("ga", "Irish"),
+                    ("it", "Italian"),
+                    ("ja", "Japanese"),
+                    ("kab", "Kabyle"),
+                    ("kn", "Kannada"),
+                    ("kk", "Kazakh"),
+                    ("km", "Khmer"),
+                    ("ko", "Korean"),
+                    ("ky", "Kyrgyz"),
+                    ("lv", "Latvian"),
+                    ("lt", "Lithuanian"),
+                    ("dsb", "Lower Sorbian"),
+                    ("lb", "Luxembourgish"),
+                    ("mk", "Macedonian"),
+                    ("ms", "Malay"),
+                    ("ml", "Malayalam"),
+                    ("mr", "Marathi"),
+                    ("es-mx", "Mexican Spanish"),
+                    ("mn", "Mongolian"),
+                    ("ne", "Nepali"),
+                    ("es-ni", "Nicaraguan Spanish"),
+                    ("nb", "Norwegian Bokmål"),
+                    ("nn", "Norwegian Nynorsk"),
+                    ("os", "Ossetic"),
+                    ("fa", "Persian"),
+                    ("pl", "Polish"),
+                    ("pt", "Portuguese"),
+                    ("pa", "Punjabi"),
+                    ("ro", "Romanian"),
+                    ("ru", "Russian"),
+                    ("gd", "Scottish Gaelic"),
+                    ("sr", "Serbian"),
+                    ("sr-latn", "Serbian Latin"),
+                    ("zh-hans", "Simplified Chinese"),
+                    ("sk", "Slovak"),
+                    ("sl", "Slovenian"),
+                    ("es", "Spanish"),
+                    ("sw", "Swahili"),
+                    ("sv", "Swedish"),
+                    ("tg", "Tajik"),
+                    ("ta", "Tamil"),
+                    ("tt", "Tatar"),
+                    ("te", "Telugu"),
+                    ("th", "Thai"),
+                    ("zh-hant", "Traditional Chinese"),
+                    ("tr", "Turkish"),
+                    ("tk", "Turkmen"),
+                    ("udm", "Udmurt"),
+                    ("uk", "Ukrainian"),
+                    ("hsb", "Upper Sorbian"),
+                    ("ur", "Urdu"),
+                    ("ug", "Uyghur"),
+                    ("uz", "Uzbek"),
+                    ("es-ve", "Venezuelan Spanish"),
+                    ("vi", "Vietnamese"),
+                    ("cy", "Welsh"),
+                ],
+                default="en",
+                max_length=7,
+            ),
+        ),
+    ]

ram/bookshelf/migrations/0027_magazine_website.py

@@ -0,0 +1,18 @@
+# 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

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

@@ -1,9 +1,11 @@
 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
 
@@ -43,8 +45,8 @@ class BaseBook(BaseModel):
     ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
     language = models.CharField(
         max_length=7,
-        choices=settings.LANGUAGES,
+        choices=sorted(settings.LANGUAGES, key=lambda s: s[1]),
-        default='en'
+        default="en",
     )
     number_of_pages = models.SmallIntegerField(null=True, blank=True)
     publication_year = models.SmallIntegerField(null=True, blank=True)
@@ -58,27 +60,24 @@ class BaseBook(BaseModel):
         blank=True,
     )
     purchase_date = models.DateField(null=True, blank=True)
-    tags = models.ManyToManyField(
+    tags = models.ManyToManyField(Tag, related_name="bookshelf", blank=True)
-        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(
+    return os.path.join("images", "books", str(instance.book.uuid), filename)
-        "images",
+
-        "books",
+
-        str(instance.book.uuid),
+def magazine_image_upload(instance, filename):
-        filename
+    return os.path.join("images", "magazines", str(instance.uuid), filename)
-    )
 
 
 class BaseBookImage(Image):
@@ -122,8 +121,7 @@ class Book(BaseBook):
 
     def get_absolute_url(self):
         return reverse(
-            "bookshelf_item",
+            "bookshelf_item", kwargs={"selector": "book", "uuid": self.uuid}
-            kwargs={"selector": "book", "uuid": self.uuid}
         )
 
 
@@ -148,53 +146,53 @@ class Catalog(BaseBook):
 
     def get_absolute_url(self):
         return reverse(
-            "bookshelf_item",
+            "bookshelf_item", kwargs={"selector": "catalog", "uuid": self.uuid}
-            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,
-        upload_to=book_image_upload,
+        upload_to=magazine_image_upload,
         storage=DeduplicatedStorage,
     )
     language = models.CharField(
         max_length=7,
-        choices=settings.LANGUAGES,
+        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 = ["name"]
+        ordering = [Lower("name")]
 
     def __str__(self):
         return self.name
 
     def get_absolute_url(self):
-        return reverse(
+        return reverse("magazine", kwargs={"uuid": self.uuid})
-            "bookshelf_item",
+
-            kwargs={"selector": "magazine", "uuid": self.uuid}
+    def website_short(self):
-        )
+        if self.website:
+            return urlparse(self.website).netloc.replace("www.", "")
 
 
 class MagazineIssue(BaseBook):
@@ -203,14 +201,17 @@ class MagazineIssue(BaseBook):
     )
     issue_number = models.CharField(max_length=100)
     publication_month = models.SmallIntegerField(
-        null=True,
+        null=True, blank=True, choices=MONTHS.items()
-        blank=True,
-        choices=MONTHS.items()
     )
 
     class Meta:
         unique_together = ("magazine", "issue_number")
-        ordering = ["magazine", "issue_number"]
+        ordering = [
+            "magazine",
+            "publication_year",
+            "publication_month",
+            "issue_number",
+        ]
 
     def __str__(self):
         return f"{self.magazine.name} - {self.issue_number}"
@@ -224,3 +225,12 @@ class MagazineIssue(BaseBook):
 
     def preview(self):
         return self.image.first().image_thumbnail(100)
+
+    @property
+    def publisher(self):
+        return self.magazine.publisher
+
+    def get_absolute_url(self):
+        return reverse(
+            "issue", kwargs={"uuid": self.uuid, "magazine": self.magazine.uuid}
+        )

ram/bookshelf/serializers.py

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

ram/bookshelf/views.py

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

ram/metadata/models.py

@@ -1,4 +1,5 @@
 import os
+from urllib.parse import urlparse
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
@@ -57,6 +58,10 @@ class Manufacturer(models.Model):
             },
         )
 
+    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)
 

ram/portal/templates/bookshelf/book.html

@@ -61,8 +61,7 @@
                     <thead>
                       <tr>
                         <th colspan="2" scope="row">
-                          {% if type == "catalog" %}Catalog
+                          {{ label|capfirst }}
-                          {% elif type == "book" %}Book{% endif %}
                         </th>
                       </tr>
                     </thead>
@@ -70,7 +69,9 @@
                       {% if type == "catalog" %}
                       <tr>
                         <th class="w-33" scope="row">Manufacturer</th>
-                        <td>{{ book.manufacturer }}</td>
+                        <td>
+                          <a href="{% url 'filtered' _filter="manufacturer" search=book.manufacturer.slug %}">{{ book.manufacturer }}{% if book.manufacturer.website %}</a> <a href="{{ book.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                        </td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Scales</th>
@@ -89,7 +90,33 @@
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Publisher</th>
-                        <td>{{ book.publisher }}</td>
+                        <td>
+                          <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 type == "magazineissue" %}
+                      <tr>
+                        <th class="w-33" scope="row">Magazine</th>
+                        <td>
+                          <a href="{% url 'magazine' book.magazine.pk %}">{{ book.magazine }}</a>
+                          {% if book.magazine.website %} <a href="{{ book.magazine.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                        </td>
+                      </tr>
+                      <tr>
+                        <th class="w-33" scope="row">Publisher</th>
+                        <td>
+                          <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>{{ book.issue_number }}</td>
+                      </tr>
+                      <tr>
+                        <th class="w-33" scope="row">Date</th>
+                        <td>{{ book.publication_year|default:"-" }} / {{ book.get_publication_month_display|default:"-" }}</td>
                       </tr>
                       {% endif %}
                       <tr>
@@ -104,10 +131,12 @@
                         <th scope="row">Number of pages</th>
                         <td>{{ book.number_of_pages|default:"-" }}</td>
                       </tr>
+                      {% if type == "boook" or type == "catalog" %}
                       <tr>
                         <th scope="row">Publication year</th>
                         <td>{{ book.publication_year|default:"-" }}</td>
                       </tr>
+                      {% endif %}
                       {% if book.description %}
                       <tr>
                         <th class="w-33" scope="row">Description</th>

ram/portal/templates/bookshelf/bookshelf_menu.html

@@ -10,6 +10,9 @@
                     {% if catalogs_menu %}
                     <li><a class="dropdown-item" href="{% url 'catalogs' %}">Catalogs</a></li>
                     {% endif %}
+                    {% if magazines_menu %}
+                    <li><a class="dropdown-item" href="{% url 'magazines' %}">Magazines</a></li>
+                    {% endif %}
                   </ul>
                 </li>
                 {% endif %}

ram/portal/templates/cards.html

@@ -18,6 +18,8 @@
         {% include "cards/consist.html" %}
         {% elif d.type == "manufacturer" %}
         {% include "cards/manufacturer.html" %}
+        {% elif d.type == "magazine"  or d.type == "magazineissue" %}
+        {% include "cards/magazine.html" %}
         {% elif d.type == "book" or d.type == "catalog" %}
         {% include "cards/book.html" %}
         {% endif %}

ram/portal/templates/cards/book.html

@@ -13,19 +13,18 @@
                 <strong>{{ d.item }}</strong>
                 <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
               </p>
-              {% if d.item.tags.all %}
               <p class="card-text"><small>Tags:</small>
                 {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
                 {{ t.name }}</a>{# new line is required #}
+                {% 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">
-                      {% if d.type == "catalog" %}Catalog
+                      {{ d.label|capfirst }}
-                      {% elif d.type == "book" %}Book{% endif %}
                       <div class="float-end">
                         {% if not d.item.published %}
                         <span class="badge text-bg-warning">Unpublished</span>
@@ -38,7 +37,9 @@
                   {% if d.type == "catalog" %}
                   <tr>
                     <th class="w-33" scope="row">Manufacturer</th>
-                    <td>{{ d.item.manufacturer }}</td>
+                    <td>
+                      <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 %}
+                    </td>
                   </tr>
                   <tr>
                     <th class="w-33" scope="row">Scales</th>
@@ -53,7 +54,7 @@
                   </tr>
                   <tr>
                     <th class="w-33" scope="row">Publisher</th>
-                    <td>{{ d.item.publisher }}</td>
+                    <td><img src="{{ d.item.publisher.country.flag }}" alt="{{ d.item.publisher.country }}"> {{ d.item.publisher }}</td>
                   </tr>
                   {% endif %}
                   <tr>

ram/portal/templates/cards/consist.html

@@ -14,13 +14,13 @@
               <strong>{{ d.item }}</strong>
               <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
             </p>
-            {% if d.item.tags.all %}
             <p class="card-text"><small>Tags:</small>
               {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
               {{ t.name }}</a>{# new line is required #}
+              {% 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>
@@ -63,7 +63,7 @@
             </table>
             <div class="d-grid gap-2 mb-1 d-md-block">
              <a class="btn btn-sm btn-outline-primary" href="{{ d.item.get_absolute_url }}">Show all data</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:consist_consist_change' d.item.pk %}">Edit</a>{% endif %}
+             {% 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

@@ -0,0 +1,104 @@
+{% load static %}
+{% load dynamic_url %}
+      <div class="col">
+        <div class="card shadow-sm">
+          {% 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.item }}">
+            {% endif %}
+          </a>
+          {% 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.item }}">
+            {% endif %}
+          </a>
+          {% endif %}
+          </a>
+          <div class="card-body">
+            <p class="card-text" style="position: relative;">
+              <strong>{{ d.item }}</strong>
+              <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
+            </p>
+            <p class="card-text"><small>Tags:</small>
+              {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+              {{ t.name }}</a>{# new line is required #}
+              {% empty %}
+              <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
+              {% endfor %}
+            </p>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">
+                    {{ d.label|capfirst }}
+
+                    <div class="float-end">
+                      {% if not d.item.published %}
+                      <span class="badge text-bg-warning">Unpublished</span>
+                      {% endif %}
+                    </div>
+                  </th>
+                </tr>
+              </thead>
+              <tbody class="table-group-divider">
+                {% if d.type == "magazineissue" %}
+                <tr>
+                  <th class="w-33" scope="row">Magazine</th>
+                  <td>{{ d.item.magazine }}</td>
+                </tr>
+                {% else %}
+                <tr>
+                  <th class="w-33" scope="row">Website</th>
+                  <td>{% if d.item.website %}<a href="{{ d.item.website }}" target="_blank">{{ d.item.website_short }}</td>{% else %}-{% endif %}</td>
+                </tr>
+                {% endif %}
+                <tr>
+                  <th class="w-33" scope="row">Publisher</th>
+                  <td>
+                    <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.type == "magazineissue" %}
+                <tr>
+                  <th class="w-33" scope="row">Issue</th>
+                  <td>{{ d.item.issue_number }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Date</th>
+                  <td>{{ d.item.publication_year|default:"-" }} / {{ d.item.get_publication_month_display|default:"-" }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Pages</th>
+                  <td>{{ d.item.number_of_pages|default:"-" }}</td>
+                </tr>
+                {% endif %}
+                <tr>
+                  <th class="w-33" scope="row">Language</th>
+                  <td>{{ d.item.get_language_display }}</td>
+                </tr>
+              </tbody>
+            </table>
+            <div class="d-grid gap-2 mb-1 d-md-block">
+              {% 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.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.type d.item.pk %}">Edit</a>{% endif %}
+            </div>
+          </div>
+        </div>
+      </div>

ram/portal/templates/cards/manufacturer.html

@@ -17,12 +17,10 @@
                     <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>
+                    <td>{% if d.item.website %}<a href="{{ d.item.website }}" target="_blank">{{ d.item.website_short }}</td>{% else %}-{% endif %}</td>
                   </tr>
-                  {% endif %}
                   <tr>
                     <th class="w-33" scope="row">Category</th>
                     <td>{{ d.item.category | title }}</td>
@@ -31,7 +29,7 @@
               </table>
               <div class="d-grid gap-2 mb-1 d-md-block">
                 {% 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>
+                <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>

ram/portal/templates/cards/roster.html

@@ -14,13 +14,13 @@
                 <strong>{{ d.item }}</strong>
                 <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
               </p>
-              {% if d.item.tags.all %}
               <p class="card-text"><small>Tags:</small>
                 {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
                 {{ t.name }}</a>{# new line is required #}
+                {% 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>

ram/portal/templates/magazine.html

@@ -0,0 +1,128 @@
+{% extends "cards.html" %}
+      {% block header %}
+      {{ block.super }}
+      {% if magazine.tags.all %}
+      <p><small>Tags:</small>
+        {% for t in magazine.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>
+      {% if not magazine.published %}
+      <span class="badge text-bg-warning">Unpublished</span> |
+      {% endif %}
+      <small class="text-body-secondary">Updated {{ magazine.updated_time | date:"M d, Y H:i" }}</small>
+      {% endif %}
+      {% endblock %}
+      {% block carousel %}
+      {% if magazine.image %}
+      <div class="row pb-4">
+        <div id="carouselControls" class="carousel carousel-dark slide" data-bs-ride="carousel">
+          <div class="carousel-inner">
+            <div class="carousel-item active">
+              <img src="{{ magazine.image.url }}" class="d-block w-100 rounded img-thumbnail" alt="magazine cover">
+            </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 '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">
+            <span class="page-link"><i class="bi bi-chevron-left"></i></span>
+          </li>
+          {% endif %}
+          {% for i in page_range %}
+            {% if data.number == i %}
+            <li class="page-item active">
+              <span class="page-link">{{ i }}</span>
+            </li>
+            {% else %}
+              {% if i == data.paginator.ELLIPSIS %}
+              <li class="page-item"><span class="page-link">{{ i }}</span></li>
+              {% else %}
+              <li class="page-item"><a class="page-link" href="{% url '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_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">
+            <span class="page-link"><i class="bi bi-chevron-right"></i></span>
+          </li>
+          {% endif %}
+        </ul>
+      </nav>
+      {% endif %}
+      {% endblock %}
+      {% block extra_content %}
+      <section class="py-4 text-start container">
+        <div class="row">
+          <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>
+            </nav>
+            <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
+              <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">
+                <table class="table table-striped">
+                  <thead>
+                    <tr>
+                      <th colspan="2" scope="row">
+                        Magazine
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody class="table-group-divider">
+                    <tr>
+                      <th class="w-33" scope="row">Name</th>
+                      <td>{{ magazine }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-33" scope="row">Publisher</th>
+                      <td>
+                        <img src="{{ magazine.publisher.country.flag }}" alt="{{ magazine.publisher.country }}"> {{ magazine.publisher }}
+                        {% 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>
+                    </tr>
+                    {% if magazine.description %}
+                    <tr>
+                      <th scope="row">Description</th>
+                      <td>{{ magazine.description | safe }}</td>
+                    </tr>
+                    {% endif %}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+            <div class="d-grid gap-2 d-md-flex justify-content-md-end">
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:bookshelf_magazine_change' magazine.pk %}">Edit</a>{% endif %}
+            </div>
+          </div>
+        </div>
+      </section>
+      {% endblock %}

ram/portal/templatetags/show_menu.py

@@ -1,6 +1,6 @@
 from django import template
 from portal.models import Flatpage
-from bookshelf.models import Book, Catalog
+from bookshelf.models import Book, Catalog, Magazine
 
 register = template.Library()
 
@@ -8,10 +8,14 @@ register = template.Library()
 @register.inclusion_tag('bookshelf/bookshelf_menu.html')
 def show_bookshelf_menu():
     # FIXME: Filter out unpublished books and catalogs?
+    books = Book.objects.exists()
+    catalogs = Catalog.objects.exists()
+    magazines = Magazine.objects.exists()
     return {
-        "bookshelf_menu": (Book.objects.exists() or Catalog.objects.exists()),
+        "bookshelf_menu": (books or catalogs or magazines),
-        "books_menu": Book.objects.exists(),
+        "books_menu": books,
-        "catalogs_menu": Catalog.objects.exists(),
+        "catalogs_menu": catalogs,
+        "magazines_menu": magazines,
     }
 
 

ram/portal/urls.py

@@ -15,6 +15,9 @@ from portal.views import (
     Types,
     Books,
     Catalogs,
+    Magazines,
+    GetMagazine,
+    GetMagazineIssue,
     GetBookCatalog,
     SearchObjects,
 )
@@ -98,6 +101,31 @@ urlpatterns = [
         Books.as_view(),
         name="books_pagination"
     ),
+    path(
+        "bookshelf/magazine/<uuid:uuid>",
+        GetMagazine.as_view(),
+        name="magazine"
+    ),
+    path(
+        "bookshelf/magazine/<uuid:uuid>/page/<int:page>",
+        GetMagazine.as_view(),
+        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/page/<int:page>",
+        Magazines.as_view(),
+        name="magazines_pagination"
+    ),
     path(
         "bookshelf/<str:selector>/<uuid:uuid>",
         GetBookCatalog.as_view(),

ram/portal/views.py

@@ -8,6 +8,7 @@ from django.views import View
 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
@@ -16,7 +17,7 @@ from portal.utils import get_site_conf
 from portal.models import Flatpage
 from roster.models import RollingStock
 from consist.models import Consist
-from bookshelf.models import Book, Catalog
+from bookshelf.models import Book, Catalog, Magazine, MagazineIssue
 from metadata.models import (
     Company,
     Manufacturer,
@@ -76,7 +77,13 @@ class GetData(View):
     def get(self, request, page=1):
         data = []
         for item in self.get_data(request):
-            data.append({"type": self.item_type, "item": item})
+            data.append(
+                {
+                    "type": self.item_type,
+                    "label": self.item_type.capitalize(),
+                    "item": item,
+                }
+            )
 
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -176,16 +183,50 @@ class SearchObjects(View):
                 data.append({"type": "consist", "item": item})
             books = (
                 Book.objects.get_published(request.user)
-                .filter(title__icontains=search)
+                .filter(
+                    Q(
+                        Q(title__icontains=search)
+                        | Q(description__icontains=search)
+                    )
+                )
                 .distinct()
             )
             catalogs = (
                 Catalog.objects.get_published(request.user)
-                .filter(manufacturer__name__icontains=search)
+                .filter(
+                    Q(
+                        Q(manufacturer__name__icontains=search)
+                        | Q(description__icontains=search)
+                    )
+                )
                 .distinct()
             )
             for item in list(chain(books, catalogs)):
-                data.append({"type": "book", "item": item})
+                data.append(
+                    {
+                        "type": "book",
+                        "label": item._meta.object_name,
+                        "item": item,
+                    }
+                )
+            magazine_issues = (
+                MagazineIssue.objects.get_published(request.user)
+                .filter(
+                    Q(
+                        Q(magazine__name__icontains=search)
+                        | Q(description__icontains=search)
+                    )
+                )
+                .distinct()
+            )
+            for item in magazine_issues:
+                data.append(
+                    {
+                        "type": "book",
+                        "label": "Magazine Issue",
+                        "item": item,
+                    }
+                )
 
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -343,15 +384,32 @@ class GetObjectsFiltered(View):
                     .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()
                 )
-                for item in catalogs:
+                for item in list(chain(books, catalogs)):
-                    data.append({"type": "catalog", "item": item})
+                    data.append(
+                        {
+                            "type": "book",
+                            "label": item._meta.object_name,
+                            "item": item,
+                        }
+                    )
+                magazine_issues = (
+                    MagazineIssue.objects.get_published(request.user)
+                    .filter(query_2nd)
+                    .distinct()
+                )
+                for item in magazine_issues:
+                    data.append(
+                        {
+                            "type": "book",
+                            "label": "Magazine Issue",
+                            "item": item,
+                        }
+                    )
         except NameError:
             pass
 
@@ -491,7 +549,8 @@ class Manufacturers(GetData):
 
     def get_data(self, request):
         return (
-            Manufacturer.objects.filter(self.filter).annotate(
+            Manufacturer.objects.filter(self.filter)
+            .annotate(
                 num_rollingstock=(
                     Count(
                         "rollingstock",
@@ -592,9 +651,7 @@ class Scales(GetData):
                 num_consists=Count(
                     "consist",
                     filter=Q(
-                        consist__in=Consist.objects.get_published(
+                        consist__in=Consist.objects.get_published(request.user)
-                            request.user
-                        )
                     ),
                     distinct=True,
                 ),
@@ -637,6 +694,87 @@ class Catalogs(GetData):
         return Catalog.objects.get_published(request.user).all()
 
 
+class Magazines(GetData):
+    title = "Magazines"
+    item_type = "magazine"
+
+    def get_data(self, request):
+        return (
+            Magazine.objects.get_published(request.user)
+            .order_by(Lower("name"))
+            .annotate(
+                issues=Count(
+                    "issue",
+                    filter=Q(
+                        issue__in=(
+                            MagazineIssue.objects.get_published(request.user)
+                        )
+                    ),
+                )
+            )
+        )
+
+
+class GetMagazine(View):
+    def get(self, request, uuid, page=1):
+        try:
+            magazine = Magazine.objects.get_published(request.user).get(
+                uuid=uuid
+            )
+        except ObjectDoesNotExist:
+            raise Http404
+        data = [
+            {
+                "type": "magazineissue",
+                "label": "Magazine issue",
+                "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(
+            data.number, on_each_side=1, on_ends=1
+        )
+
+        return render(
+            request,
+            "magazine.html",
+            {
+                "title": magazine,
+                "magazine": magazine,
+                "data": data,
+                "matches": paginator.count,
+                "page_range": page_range,
+            },
+        )
+
+
+class GetMagazineIssue(View):
+    def get(self, request, uuid, magazine, page=1):
+        try:
+            issue = MagazineIssue.objects.get_published(request.user).get(
+                uuid=uuid,
+                magazine__uuid=magazine,
+            )
+        except ObjectDoesNotExist:
+            raise Http404
+        properties = issue.property.get_public(request.user)
+        documents = issue.document.get_public(request.user)
+        return render(
+            request,
+            "bookshelf/book.html",
+            {
+                "title": issue,
+                "book": issue,
+                "documents": documents,
+                "properties": properties,
+                "type": "magazineissue",
+                "label": "Magazine issue",
+            },
+        )
+
+
 class GetBookCatalog(View):
     def get_object(self, request, uuid, selector):
         if selector == "book":
@@ -663,6 +801,7 @@ class GetBookCatalog(View):
                 "documents": documents,
                 "properties": properties,
                 "type": selector,
+                "label": selector.capitalize(),
             },
         )
 

ram/ram/__init__.py

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

sample_data/cards/generate_card.sh

@@ -0,0 +1,12 @@
+#!/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