Rename roster methods in portal view

* Enforce ordering on some metadata models
* Fix a 500 error while accessing flat pages
* Clean up HTML and fix cards (missing class)
* Make the "driver" app optional and disabled by default

.github/workflows/django.yml

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

README.md

@@ -2,27 +2,31 @@
 
 [![Django CI](https://github.com/daniviga/django-rma/actions/workflows/django.yml/badge.svg)](https://github.com/daniviga/django-rma/actions/workflows/django.yml)
 
+![Screenshot 2023-09-18 at 21-57-33 Company RGS - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/d20fbe27-1192-4ab1-a19f-8d2ae50cf781)
+
 A `jff` (just for fun) project that aims to create a
 model railroad assets manager that allows to:
 
-- Create a database of assets (model trains) and consits with their metadata
+- Create a database of assets (model trains) and consists with their metadata
 - Manage the database via a simple but rationale backoffice
 - Expose main data via an HTML interface to show how beautiful is your collection
   to the outside world
 - Act as a DCC++ EX REST API gateway to control assets remotely via DCC.
-  By anyone, if you'd like (really?).
+  By anyone, if you'd like (seriously?).
 
 ## Preface
 
-Project is intended to have fun only and it has been developed with a
+**This project is work in progress**. It is intended for fun only and
-commitment of few minutes a day; it lacks any kind of documentation, code
+it has been developed with a commitment of few minutes a day;
-review, architectural review, security assesment, pentest, ISO certification,
+it lacks any kind of documentation, code review, architectural review,
-etc.
+security assesment, pentest, ISO certification, etc.
 
-This project probably doesn't match you needs nor expectations. Be aware.
+This project probably doesn't match your needs nor expectations. Be aware.
 
 Your model train may also catch fire while using this software.
 
+Check out [my own instance](https://daniele.mynarrowgauge.org).
+
 ## Components
 
 Project is based on the following technologies and components:
@@ -30,22 +34,22 @@ Project is based on the following technologies and components:
 - [Django](https://www.djangoproject.com/): *the* web framework
 - [Django REST](https://www.django-rest-framework.org/): API for the lazy
 - [Bootstrap](https://getbootstrap.com/): for the web frontend
-- [Arduino](https://arduino.cc): DCC hardware
+- [Arduino](https://arduino.cc): DCC hardware; you must get one, really
 - [DCC++ EX Command Station](https://dcc-ex.com/): DCC firmware; an amazing project
-- [DCC++ EX WebThrottle](https://github.com/DCC-EX/WebThrottle-EX): a slighly modified version of the DCC++ EX web throttle
+- [DCC++ EX WebThrottle](https://github.com/DCC-EX/WebThrottle-EX): the DCC++ EX web throttle, a slightly modified version
 
 It has been developed with:
 
 - [vim](https://www.vim.org/): because it rocks
-- [arduino-cli](https://github.com/arduino/arduino-cli/): a mouse? What the hack?
+- [arduino-cli](https://github.com/arduino/arduino-cli/): a mouse? What the heck?
 - [vim-arduino](https://github.com/stevearc/vim-arduino): another IDE? No thanks
 - [podman](https://podman.io/): because containers are fancy
 - [QEMU (avr)](https://qemu-project.gitlab.io/qemu/system/target-avr.html): QEMU can even make toast!
 
 
-## Requirments
+## Requirements
 
-- Python 3.8+
+- Python 3.9+
 - A USB port when running Arduino hardware (and adaptors if you have a Mac)
 
 ## Web portal installation
@@ -92,7 +96,8 @@ Browse to `http://localhost:8000`
 
 The DCC++ EX connector exposes an Arduino board running DCC++ EX Command Station,
 connected via serial port, to the network, allowing commands to be sent via a
-TCP socket.
+TCP socket. A response generated by the DCC++ EX board is sent to all connected clients,
+providing synchronization between multiple clients (eg. multiple JMRI instances).
 
 Its use is not needed when running DCC++ EX from a [WiFi](https://dcc-ex.com/get-started/wifi-setup.html) capable board (like when
 using an ESP8266 module or a [Mega+WiFi board](https://dcc-ex.com/advanced-setup/supported-microcontrollers/wifi-mega.html)).
@@ -108,7 +113,7 @@ Settings may need to be customized based on your setup.
 ```bash
 $ cd daemons
 $ podman build -t dcc/net-to-serial .
-$ podman run -d -p 2560:2560 dcc/net-to-serial
+$ podman run --group-add keep-groups --device /dev/ttyACM0 -p 2560:2560 dcc/net-to-serial
 ```
 
 ### Manual setup
@@ -132,11 +137,35 @@ $ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/net-to-serial:sim
 
 To be continued ...
 
-
+## Screenshots
-
+
-
+### Frontend
-
+
-
+![Screenshot 2023-09-18 at 22-00-39 RGS C-19 #40 - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/94834b89-5b17-46e7-9494-a1651d72c072)
+---
+![Screenshot 2023-09-18 at 21-59-30 RGS 1930s short train - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/77f9b7c9-27b3-4a65-bad0-26e9cf77e623)
+
+
+
+#### Dark mode
+
+![Screenshot 2023-09-18 at 21-58-22 Company RGS - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/c95697c9-0897-46f4-941c-6092271e4743)
+
+---
+
+
+
+### Backoffice
+
+![image](https://user-images.githubusercontent.com/1818657/175789937-3e4970a2-b37d-44c3-8605-62dabe209c65.png)
+---
+![image](https://user-images.githubusercontent.com/1818657/175789946-d7ce882c-1ba6-49b2-8e0a-1144e5c6bc35.png)
+---
+![image](https://user-images.githubusercontent.com/1818657/175789954-0735a4ea-bcaf-4a45-adbc-64105091b051.png)
+
+### Rest API
+
+![image](https://user-images.githubusercontent.com/1818657/180622471-ade06c84-c73b-41d5-a2a7-02a95b2ffc02.png)
 
 
 

daemons/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-alpine
+FROM python:3.11-alpine
 
 RUN mkdir /opt/dcc && pip -q install pyserial
 ADD net-to-serial.py config.ini /opt/dcc

daemons/README.md

@@ -0,0 +1,3 @@
+## DCC++ EX connector
+
+See [README.md](../README.md)

daemons/config.ini

@@ -2,6 +2,7 @@
 LogLevel = debug
 ListeningIP = 0.0.0.0
 ListeningPort = 2560
+MaxClients = 10
 
 [Serial]
 # UNO

daemons/net-to-serial.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import re
-import time
 import logging
 import serial
 import asyncio
@@ -10,11 +9,15 @@ from pathlib import Path
 
 
 class SerialDaemon:
+    connected_clients = set()
+
     def __init__(self, config):
         self.ser = serial.Serial(
             config["Serial"]["Port"],
-            timeout=int(config["Serial"]["Timeout"])/1000)
+            timeout=int(config["Serial"]["Timeout"]) / 1000,
+        )
         self.ser.baudrate = config["Serial"]["Baudrate"]
+        self.max_clients = int(config["Daemon"]["MaxClients"])
 
     def __del__(self):
         try:
@@ -43,19 +46,32 @@ class SerialDaemon:
 
     async def handle_echo(self, reader, writer):
         """Process a request from socket and return the response"""
-        while 1:  # keep connection to client open
+        logging.info(
-            data = await reader.read(100)
+            "Clients already connected: {} (max: {})".format(
-            if not data:  # client has disconnected
+                len(self.connected_clients),
-                break
+                self.max_clients,
+            )
+        )
 
-            addr = writer.get_extra_info('peername')
+        addr = writer.get_extra_info("peername")[0]
-            logging.info("Received {} from {}".format(data, addr[0]))
+        if len(self.connected_clients) < self.max_clients:
-
+            self.connected_clients.add(writer)
-            self.__write_serial(data)
+            while True:  # keep connection to client open
-            response = self.__read_serial()
+                data = await reader.read(100)
-            writer.write(response)
+                if not data:  # client has disconnected
-            await writer.drain()
+                    break
-            logging.info("Sent: {}".format(response))
+                logging.info("Received {} from {}".format(data, addr))
+                self.__write_serial(data)
+                response = self.__read_serial()
+                for client in self.connected_clients:
+                    client.write(response)
+                    await client.drain()
+                logging.info("Sent: {}".format(response))
+            self.connected_clients.remove(writer)
+        else:
+            logging.warning(
+                "TooManyClients: client {} disconnected".format(addr)
+            )
 
         writer.close()
         await writer.wait_closed()
@@ -68,33 +84,37 @@ class SerialDaemon:
         while "DCC-EX" not in line:
             line = self.__read_serial().decode()
         board = re.findall(r"<iDCC-EX.*>", line)[0]
-        return(board)
+        return board
 
 
 async def main():
     config = configparser.ConfigParser()
     config.read(
-        Path(__file__).resolve().parent / "config.ini")  # mimick os.path.join
+        Path(__file__).resolve().parent / "config.ini"
+    )  # mimick os.path.join
     logging.basicConfig(level=config["Daemon"]["LogLevel"].upper())
 
     sd = SerialDaemon(config)
     server = await asyncio.start_server(
         sd.handle_echo,
         config["Daemon"]["ListeningIP"],
-        config["Daemon"]["ListeningPort"])
+        config["Daemon"]["ListeningPort"],
+    )
     addr = server.sockets[0].getsockname()
-    logging.warning("Serving on {} port {}".format(addr[0], addr[1]))
+    logging.info("Serving on {} port {}".format(addr[0], addr[1]))
-    logging.warning(
+    logging.info(
         "Proxying to {} (Baudrate: {}, Timeout: {})".format(
             config["Serial"]["Port"],
             config["Serial"]["Baudrate"],
-            config["Serial"]["Timeout"]))
+            config["Serial"]["Timeout"],
-    logging.warning("Initializing board")
+        )
-    logging.warning("Board {} ready".format(
+    )
-        await sd.return_board()))
+    logging.info("Initializing board")
+    logging.info("Board {} ready".format(await sd.return_board()))
 
     async with server:
         await server.serve_forever()
 
+
 if __name__ == "__main__":
     asyncio.run(main())

daemons/simulator/README.md

@@ -1,6 +1,6 @@
 # AVR Simulator
 
-`qemu-system-avr` tries to use all the CPU cicles (leaving a CPU core stuck at 100%. Limit CPU core usage to 10%. It may be adjusted on slower machines.
+`qemu-system-avr` tries to use all the CPU cicles (leaving a CPU core stuck at 100%; limit CPU core usage to 10% via `--cpus 0.1`. It can be adjusted on slower machines.
 
 ```bash
 $ podman build -t dcc/net-to-serial:sim . 

ram/bookshelf/admin.py

@@ -0,0 +1,52 @@
+from django.contrib import admin
+from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
+
+from bookshelf.models import BookProperty, BookImage, Book, Author, Publisher
+
+
+class BookImageInline(SortableInlineAdminMixin, admin.TabularInline):
+    model = BookImage
+    min_num = 0
+    extra = 0
+    readonly_fields = ("image_thumbnail",)
+    classes = ["collapse"]
+
+
+class BookPropertyInline(admin.TabularInline):
+    model = BookProperty
+    min_num = 0
+    extra = 0
+
+
+@admin.register(Book)
+class BookAdmin(SortableAdminBase, admin.ModelAdmin):
+    inlines = (BookImageInline, BookPropertyInline,)
+    list_display = (
+        "title",
+        "get_authors",
+        "get_publisher",
+        "publication_year",
+        "number_of_pages"
+    )
+    search_fields = ("title", "publisher__name", "authors__last_name")
+    list_filter = ("publisher__name", "authors")
+
+    @admin.display(description="Publisher")
+    def get_publisher(self, obj):
+        return obj.publisher.name
+
+    @admin.display(description="Authors")
+    def get_authors(self, obj):
+        return ", ".join(a.short_name() for a in obj.authors.all())
+
+
+@admin.register(Author)
+class AuthorAdmin(admin.ModelAdmin):
+    search_fields = ("first_name", "last_name",)
+    list_filter = ("last_name",)
+
+
+@admin.register(Publisher)
+class PublisherAdmin(admin.ModelAdmin):
+    list_display = ("name", "country")
+    search_fields = ("name",)

ram/bookshelf/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BookshelfConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "bookshelf"

ram/bookshelf/migrations/0001_initial.py

@@ -0,0 +1,119 @@
+# Generated by Django 4.2.5 on 2023-10-01 20:16
+
+import ckeditor_uploader.fields
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ("metadata", "0012_alter_decoder_manufacturer_decoderdocument"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Author",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("first_name", models.CharField(max_length=100)),
+                ("last_name", models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name="Book",
+            fields=[
+                (
+                    "uuid",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("title", models.CharField(max_length=200)),
+                ("ISBN", models.CharField(max_length=13, unique=True)),
+                ("publication_year", models.SmallIntegerField(blank=True, null=True)),
+                ("purchase_date", models.DateField(blank=True, null=True)),
+                ("notes", ckeditor_uploader.fields.RichTextUploadingField(blank=True)),
+                ("creation_time", models.DateTimeField(auto_now_add=True)),
+                ("updated_time", models.DateTimeField(auto_now=True)),
+                ("authors", models.ManyToManyField(to="bookshelf.author")),
+            ],
+        ),
+        migrations.CreateModel(
+            name="Publisher",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=200)),
+                ("website", models.URLField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name="BookProperty",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("value", models.CharField(max_length=256)),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="property",
+                        to="bookshelf.book",
+                    ),
+                ),
+                (
+                    "property",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="metadata.property",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name_plural": "Properties",
+            },
+        ),
+        migrations.AddField(
+            model_name="book",
+            name="publisher",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="bookshelf.publisher"
+            ),
+        ),
+        migrations.AddField(
+            model_name="book",
+            name="tags",
+            field=models.ManyToManyField(
+                blank=True, related_name="bookshelf", to="metadata.tag"
+            ),
+        ),
+    ]

ram/bookshelf/migrations/0002_book_language_book_numbers_of_pages_and_more.py

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

ram/bookshelf/migrations/0003_bookimage.py

@@ -0,0 +1,51 @@
+# Generated by Django 4.2.5 on 2023-10-02 10:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ram.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0002_book_language_book_numbers_of_pages_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="BookImage",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(default=0)),
+                (
+                    "image",
+                    models.ImageField(
+                        blank=True,
+                        null=True,
+                        storage=ram.utils.DeduplicatedStorage,
+                        upload_to="images/books/",
+                    ),
+                ),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="image",
+                        to="bookshelf.book",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["order"],
+                "abstract": False,
+            },
+        ),
+    ]

ram/bookshelf/migrations/0004_rename_numbers_of_pages_book_number_of_pages.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-02 20:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0003_bookimage"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="book",
+            old_name="numbers_of_pages",
+            new_name="number_of_pages",
+        ),
+    ]

ram/bookshelf/migrations/0005_alter_book_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2023-10-03 19:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0004_rename_numbers_of_pages_book_number_of_pages"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="book",
+            options={"ordering": ["authors__last_name", "title"]},
+        ),
+    ]

ram/bookshelf/migrations/0006_alter_book_isbn.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-03 20:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0005_alter_book_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="book",
+            name="ISBN",
+            field=models.CharField(blank=True, max_length=17),
+        ),
+    ]

ram/bookshelf/migrations/0007_alter_book_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2023-10-03 21:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0006_alter_book_isbn"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="book",
+            options={"ordering": ["title"]},
+        ),
+    ]

ram/bookshelf/migrations/0008_alter_author_options_alter_publisher_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2023-10-09 21:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bookshelf", "0007_alter_book_options"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="author",
+            options={"ordering": ["last_name", "first_name"]},
+        ),
+        migrations.AlterModelOptions(
+            name="publisher",
+            options={"ordering": ["name"]},
+        ),
+    ]

ram/bookshelf/models.py

@@ -0,0 +1,93 @@
+from uuid import uuid4
+from django.db import models
+from django.conf import settings
+from django.urls import reverse
+from django_countries.fields import CountryField
+
+from ckeditor_uploader.fields import RichTextUploadingField
+
+from metadata.models import Tag
+from ram.utils import DeduplicatedStorage
+from ram.models import Image, PropertyInstance
+
+
+class Publisher(models.Model):
+    name = models.CharField(max_length=200)
+    country = CountryField(blank=True)
+    website = models.URLField(blank=True)
+
+    class Meta:
+        ordering = ["name"]
+
+    def __str__(self):
+        return self.name
+
+
+class Author(models.Model):
+    first_name = models.CharField(max_length=100)
+    last_name = models.CharField(max_length=100)
+
+    class Meta:
+        ordering = ["last_name", "first_name"]
+
+    def __str__(self):
+        return f"{self.last_name}, {self.first_name}"
+
+    def short_name(self):
+        return f"{self.last_name} {self.first_name[0]}."
+
+
+class Book(models.Model):
+    uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
+    title = models.CharField(max_length=200)
+    authors = models.ManyToManyField(Author)
+    publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
+    ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
+    language = models.CharField(
+        max_length=7,
+        choices=settings.LANGUAGES,
+        default='en'
+    )
+    number_of_pages = models.SmallIntegerField(null=True, blank=True)
+    publication_year = models.SmallIntegerField(null=True, blank=True)
+    purchase_date = models.DateField(null=True, blank=True)
+    tags = models.ManyToManyField(
+        Tag, related_name="bookshelf", blank=True
+    )
+    notes = RichTextUploadingField(blank=True)
+    creation_time = models.DateTimeField(auto_now_add=True)
+    updated_time = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        ordering = ["title"]
+
+    def __str__(self):
+        return self.title
+
+    def publisher_name(self):
+        return self.publisher.name
+
+    def get_absolute_url(self):
+        return reverse("book", kwargs={"uuid": self.uuid})
+
+
+class BookImage(Image):
+    book = models.ForeignKey(
+        Book, on_delete=models.CASCADE, related_name="image"
+    )
+    image = models.ImageField(
+        upload_to="images/books/",  # FIXME, find a better way to replace this
+        storage=DeduplicatedStorage,
+        null=True,
+        blank=True
+    )
+
+
+class BookProperty(PropertyInstance):
+    book = models.ForeignKey(
+        Book,
+        on_delete=models.CASCADE,
+        null=False,
+        blank=False,
+        related_name="property",
+    )

ram/bookshelf/serializers.py

@@ -0,0 +1,26 @@
+from rest_framework import serializers
+from bookshelf.models import Book, Author, Publisher
+from metadata.serializers import TagSerializer
+
+
+class AuthorSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Author
+        fields = "__all__"
+
+
+class PublisherSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Publisher
+        fields = "__all__"
+
+
+class BookSerializer(serializers.ModelSerializer):
+    authors = AuthorSerializer(many=True)
+    publisher = PublisherSerializer()
+    tags = TagSerializer(many=True)
+
+    class Meta:
+        model = Book
+        fields = "__all__"
+        read_only_fields = ("creation_time", "updated_time")

ram/bookshelf/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

ram/bookshelf/urls.py

@@ -0,0 +1,7 @@
+from django.urls import path
+from bookshelf.views import BookList, BookGet
+
+urlpatterns = [
+    path("book/list", BookList.as_view()),
+    path("book/get/<str:uuid>", BookGet.as_view()),
+]

ram/bookshelf/views.py

@@ -0,0 +1,18 @@
+from rest_framework.generics import ListAPIView, RetrieveAPIView
+from rest_framework.schemas.openapi import AutoSchema
+
+from bookshelf.models import Book
+from bookshelf.serializers import BookSerializer
+
+
+class BookList(ListAPIView):
+    queryset = Book.objects.all()
+    serializer_class = BookSerializer
+
+
+class BookGet(RetrieveAPIView):
+    queryset = Book.objects.all()
+    serializer_class = BookSerializer
+    lookup_field = "uuid"
+
+    schema = AutoSchema(operation_id_base="retrieveBookByUUID")

ram/consist/admin.py

@@ -21,6 +21,7 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
     list_display = ("identifier", "company", "era")
     list_filter = list_display
     search_fields = list_display
+    save_as = True
 
     fieldsets = (
         (
@@ -31,6 +32,7 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
                     "consist_address",
                     "company",
                     "era",
+                    "image",
                     "notes",
                     "tags",
                 )

ram/consist/migrations/0002_alter_consist_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.0.6 on 2022-07-10 13:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('consist', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='consist',
+            options={'ordering': ['creation_time']},
+        ),
+    ]

ram/consist/migrations/0003_consist_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-12 12:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('consist', '0002_alter_consist_options'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='consist',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to='images/'),
+        ),
+    ]

ram/consist/migrations/0004_alter_consist_company.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.0.6 on 2022-07-15 16:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0004_alter_rollingstocktype_options_and_more'),
+        ('consist', '0003_consist_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='consist',
+            name='company',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='metadata.company'),
+        ),
+    ]

ram/consist/migrations/0005_alter_consist_notes.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.1 on 2022-08-23 15:54
+
+import ckeditor_uploader.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("consist", "0004_alter_consist_company"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="consist",
+            name="notes",
+            field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
+        ),
+    ]

ram/consist/migrations/0006_md_to_html.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1 on 2022-08-24 15:30
+
+import markdown
+from django.db import migrations
+
+
+def md_to_html(apps, schema_editor):
+    fields = {
+        "Consist": ["notes"],
+    }
+
+    for m in fields.items():
+        model = apps.get_model("consist", m[0])
+
+        for row in model.objects.all():
+            for field in m[1]:
+                html = markdown.markdown(getattr(row, field))
+                row.__dict__[field] = html
+
+            row.save(update_fields=m[1])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("consist", "0005_alter_consist_notes"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            md_to_html,
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]

ram/consist/migrations/0007_alter_consist_image.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1.2 on 2022-11-27 00:10
+
+from django.db import migrations, models
+import ram.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("consist", "0006_md_to_html"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="consist",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/",
+            ),
+        ),
+    ]

ram/consist/migrations/0008_alter_consist_options.py

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

ram/consist/models.py

@@ -2,6 +2,9 @@ from uuid import uuid4
 from django.db import models
 from django.urls import reverse
 
+from ckeditor_uploader.fields import RichTextUploadingField
+
+from ram.utils import DeduplicatedStorage
 from metadata.models import Company, Tag
 from roster.models import RollingStock
 
@@ -13,20 +16,24 @@ class Consist(models.Model):
     consist_address = models.SmallIntegerField(
         default=None, null=True, blank=True
     )
-    company = models.ForeignKey(
+    company = models.ForeignKey(Company, on_delete=models.CASCADE)
-        Company, on_delete=models.CASCADE, null=True, blank=True
-    )
     era = models.CharField(max_length=32, blank=True)
-    notes = models.TextField(blank=True)
+    image = models.ImageField(
+        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
+    )
+    notes = RichTextUploadingField(blank=True)
     creation_time = models.DateTimeField(auto_now_add=True)
     updated_time = models.DateTimeField(auto_now=True)
 
     def __str__(self):
-        return "{0}".format(self.identifier)
+        return "{0} {1}".format(self.company, self.identifier)
 
     def get_absolute_url(self):
         return reverse("consist", kwargs={"uuid": self.uuid})
 
+    class Meta:
+        ordering = ["company", "-creation_time"]
+
 
 class ConsistItem(models.Model):
     consist = models.ForeignKey(

ram/driver/admin.py

@@ -7,6 +7,10 @@ from driver.models import DriverConfiguration
 @admin.register(DriverConfiguration)
 class DriverConfigurationAdmin(SingletonModelAdmin):
     fieldsets = (
+        (
+            "General configuration",
+            {"fields": ("enabled",)},
+        ),
         (
             "Remote DCC-EX configuration",
             {

ram/driver/migrations/0005_driverconfiguration_enabled.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-11 18:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('driver', '0004_alter_driverconfiguration_remote_host'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='driverconfiguration',
+            name='enabled',
+            field=models.BooleanField(default=False),
+        ),
+    ]

ram/driver/models.py

@@ -1,10 +1,11 @@
 from django.db import models
 from django.core.exceptions import ValidationError
-from ipaddress import IPv4Address, IPv4Network
+from ipaddress import IPv4Network
 from solo.models import SingletonModel
 
 
 class DriverConfiguration(SingletonModel):
+    enabled = models.BooleanField(default=False)
     remote_host = models.GenericIPAddressField(
         protocol="IPv4", default="192.168.4.1"
     )

ram/driver/views.py

@@ -34,9 +34,22 @@ def addresschecker(f):
     return addresslookup
 
 
+class IsEnabled(BasePermission):
+    def has_permission(self, request, view):
+        config = DriverConfiguration.get_solo()
+
+        # if driver is disabled, block all connections
+        if not config.enabled:
+            raise Http404
+
+        return True
+
+
 class Firewall(BasePermission):
     def has_permission(self, request, view):
         config = DriverConfiguration.get_solo()
+
+        # if network is not configured, accept only read ops
         if not config.network:
             return request.method in SAFE_METHODS
 
@@ -61,7 +74,7 @@ class Test(APIView):
     """
 
     parser_classes = [PlainTextParser]
-    permission_classes = [IsAuthenticated | Firewall]
+    permission_classes = [IsEnabled & IsAuthenticated | Firewall]
 
     def get(self, request):
         response = Connector().passthrough("<s>")
@@ -76,7 +89,7 @@ class SendCommand(APIView):
     """
 
     parser_classes = [PlainTextParser]
-    permission_classes = [IsAuthenticated | Firewall]
+    permission_classes = [IsEnabled & IsAuthenticated | Firewall]
 
     def put(self, request):
         data = request.data
@@ -101,7 +114,7 @@ class Function(APIView):
     Send "Function" commands to a valid DCC address
     """
 
-    permission_classes = [IsAuthenticated | Firewall]
+    permission_classes = [IsEnabled & IsAuthenticated | Firewall]
 
     def put(self, request, address):
         serializer = FunctionSerializer(data=request.data)
@@ -118,7 +131,7 @@ class Cab(APIView):
     Send "Cab" commands to a valid DCC address
     """
 
-    permission_classes = [IsAuthenticated | Firewall]
+    permission_classes = [IsEnabled & IsAuthenticated | Firewall]
 
     def put(self, request, address):
         serializer = CabSerializer(data=request.data)
@@ -134,7 +147,7 @@ class Infra(APIView):
     Send "Infra" commands to a valid DCC address
     """
 
-    permission_classes = [IsAuthenticated | Firewall]
+    permission_classes = [IsEnabled & IsAuthenticated | Firewall]
 
     def put(self, request):
         serializer = InfraSerializer(data=request.data)
@@ -150,7 +163,7 @@ class Emergency(APIView):
     Send an "Emergency" stop, no matter the HTTP method used
     """
 
-    permission_classes = [IsAuthenticated | Firewall]
+    permission_classes = [IsEnabled & IsAuthenticated | Firewall]
 
     def put(self, request):
         Connector().emergency()

ram/metadata/admin.py

@@ -1,7 +1,10 @@
 from django.contrib import admin
+from adminsortable2.admin import SortableAdminMixin
+
 from metadata.models import (
     Property,
     Decoder,
+    DecoderDocument,
     Scale,
     Manufacturer,
     Company,
@@ -12,21 +15,30 @@ from metadata.models import (
 
 @admin.register(Property)
 class PropertyAdmin(admin.ModelAdmin):
+    list_display = ("name", "private")
     search_fields = ("name",)
 
 
+class DecoderDocInline(admin.TabularInline):
+    model = DecoderDocument
+    min_num = 0
+    extra = 0
+    classes = ["collapse"]
+
+
 @admin.register(Decoder)
 class DecoderAdmin(admin.ModelAdmin):
+    inlines = (DecoderDocInline,)
     readonly_fields = ("image_thumbnail",)
-    list_display = ("__str__", "interface")
+    list_display = ("__str__", "sound")
-    list_filter = ("manufacturer", "interface")
+    list_filter = ("manufacturer", "sound")
-    search_fields = ("__str__",)
+    search_fields = ("name", "manufacturer__name")
 
 
 @admin.register(Scale)
 class ScaleAdmin(admin.ModelAdmin):
-    list_display = ("scale", "ratio", "gauge")
+    list_display = ("scale", "ratio", "gauge", "tracks")
-    list_filter = ("ratio", "gauge")
+    list_filter = ("ratio", "gauge", "tracks")
     search_fields = list_display
 
 
@@ -54,7 +66,7 @@ class TagAdmin(admin.ModelAdmin):
 
 
 @admin.register(RollingStockType)
-class RollingStockTypeAdmin(admin.ModelAdmin):
+class RollingStockTypeAdmin(SortableAdminMixin, admin.ModelAdmin):
     list_display = ("__str__",)
     list_filter = ("type", "category")
-    search_fields = list_display
+    search_fields = ("type", "category")

ram/metadata/migrations/0002_alter_decoder_manufacturer.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.6 on 2022-07-10 21:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='decoder',
+            name='manufacturer',
+            field=models.ForeignKey(limit_choices_to={'category': 'model'}, on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer'),
+        ),
+    ]

ram/metadata/migrations/0003_property_private.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-12 10:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0002_alter_decoder_manufacturer'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='property',
+            name='private',
+            field=models.BooleanField(default=False),
+        ),
+    ]

ram/metadata/migrations/0004_alter_rollingstocktype_options_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.6 on 2022-07-14 14:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0003_property_private'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='rollingstocktype',
+            options={'ordering': ['order']},
+        ),
+        migrations.AddField(
+            model_name='rollingstocktype',
+            name='order',
+            field=models.PositiveSmallIntegerField(default=0),
+            preserve_default=False,
+        ),
+    ]

ram/metadata/migrations/0005_rename_gauge_scale_track.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-18 21:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0004_alter_rollingstocktype_options_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='scale',
+            old_name='gauge',
+            new_name='track',
+        ),
+    ]

ram/metadata/migrations/0006_scale_gauge.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-18 21:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0005_rename_gauge_scale_track'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='scale',
+            name='gauge',
+            field=models.CharField(blank=True, max_length=16),
+        ),
+    ]

ram/metadata/migrations/0007_rename_track_scale_tracks.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-18 21:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0006_scale_gauge'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='scale',
+            old_name='track',
+            new_name='tracks',
+        ),
+    ]

ram/metadata/migrations/0008_remove_decoder_interface.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.2 on 2022-10-31 23:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0007_rename_track_scale_tracks"),
+        ("roster", "0013_rollingstock_decoder_interface"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="decoder",
+            name="interface",
+        ),
+    ]

ram/metadata/migrations/0009_alter_company_logo_alter_decoder_image_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.1.2 on 2022-11-27 00:10
+
+from django.db import migrations, models
+import ram.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0008_remove_decoder_interface"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="company",
+            name="logo",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="decoder",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="manufacturer",
+            name="logo",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/",
+            ),
+        ),
+    ]

ram/metadata/migrations/0010_alter_manufacturer_category.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.1.5 on 2023-01-06 00:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0009_alter_company_logo_alter_decoder_image_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="manufacturer",
+            name="category",
+            field=models.CharField(
+                choices=[
+                    ("model", "Model"),
+                    ("real", "Real"),
+                    ("accessory", "Accessory"),
+                    ("other", "Other"),
+                ],
+                max_length=64,
+            ),
+        ),
+    ]

ram/metadata/migrations/0011_company_slug_and_more.py

@@ -0,0 +1,93 @@
+# Generated by Django 4.1.5 on 2023-01-09 11:22
+
+from django.db import migrations, models
+
+
+from ram.utils import slugify
+
+
+def create_slug(apps, schema_editor):
+    fields = ["Company", "Manufacturer", "RollingStockType", "Scale"]
+
+    for m in fields:
+        model = apps.get_model("metadata", m)
+
+        for row in model.objects.all():
+            if hasattr(row, "type"):
+                row.slug = slugify("{} {}".format(row.type, row.category))
+            elif hasattr(row, "scale"):
+                row.slug = slugify(row.scale)
+            else:
+                row.slug = slugify(row.name)
+
+            row.save(update_fields=["slug"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0010_alter_manufacturer_category"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="company",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=64, blank=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="manufacturer",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, blank=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="rollingstocktype",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, blank=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="scale",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=32, blank=True
+            ),
+        ),
+        migrations.RunPython(
+            create_slug,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.AlterField(
+            model_name="company",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=64, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="manufacturer",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="rollingstocktype",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="scale",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=32, unique=True
+            ),
+        ),
+    ]

ram/metadata/migrations/0012_alter_decoder_manufacturer_decoderdocument.py

@@ -0,0 +1,59 @@
+# Generated by Django 4.2 on 2023-09-30 21:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ram.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0011_company_slug_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="decoder",
+            name="manufacturer",
+            field=models.ForeignKey(
+                limit_choices_to={"category": "accessory"},
+                on_delete=django.db.models.deletion.CASCADE,
+                to="metadata.manufacturer",
+            ),
+        ),
+        migrations.CreateModel(
+            name="DecoderDocument",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("description", models.CharField(blank=True, max_length=128)),
+                (
+                    "file",
+                    models.FileField(
+                        blank=True,
+                        null=True,
+                        storage=ram.utils.DeduplicatedStorage(),
+                        upload_to="files/",
+                    ),
+                ),
+                (
+                    "decoder",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="document",
+                        to="metadata.decoder",
+                    ),
+                ),
+            ],
+            options={
+                "unique_together": {("decoder", "file")},
+            },
+        ),
+    ]

ram/metadata/migrations/0013_decoderdocument_private.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-06 19:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0012_alter_decoder_manufacturer_decoderdocument"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="decoderdocument",
+            name="private",
+            field=models.BooleanField(default=False),
+        ),
+    ]

ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2023-10-10 12:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("metadata", "0013_decoderdocument_private"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="decoder",
+            options={"ordering": ["manufacturer", "name"]},
+        ),
+        migrations.AlterModelOptions(
+            name="tag",
+            options={"ordering": ["name"]},
+        ),
+    ]

ram/metadata/models.py

@@ -1,13 +1,16 @@
 from django.db import models
+from django.urls import reverse
 from django.conf import settings
 from django.dispatch.dispatcher import receiver
 from django_countries.fields import CountryField
 
-from ram.utils import get_image_preview, slugify
+from ram.models import Document
+from ram.utils import DeduplicatedStorage, get_image_preview, slugify
 
 
 class Property(models.Model):
     name = models.CharField(max_length=128, unique=True)
+    private = models.BooleanField(default=False)
 
     class Meta:
         verbose_name_plural = "Properties"
@@ -19,11 +22,14 @@ class Property(models.Model):
 
 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(
         max_length=64, choices=settings.MANUFACTURER_TYPES
     )
     website = models.URLField(blank=True)
-    logo = models.ImageField(upload_to="images/", null=True, blank=True)
+    logo = models.ImageField(
+        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
+    )
 
     class Meta:
         ordering = ["category", "name"]
@@ -31,6 +37,14 @@ class Manufacturer(models.Model):
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse(
+            "filtered", kwargs={
+                "_filter": "manufacturer",
+                "search": self.slug,
+            }
+        )
+
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 
@@ -39,10 +53,13 @@ class Manufacturer(models.Model):
 
 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)
     country = CountryField()
     freelance = models.BooleanField(default=False)
-    logo = models.ImageField(upload_to="images/", null=True, blank=True)
+    logo = models.ImageField(
+        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
+    )
 
     class Meta:
         verbose_name_plural = "Companies"
@@ -51,6 +68,14 @@ class Company(models.Model):
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse(
+            "filtered", kwargs={
+                "_filter": "company",
+                "search": self.slug,
+            }
+        )
+
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 
@@ -59,13 +84,19 @@ class Company(models.Model):
 
 class Decoder(models.Model):
     name = models.CharField(max_length=128, unique=True)
-    manufacturer = models.ForeignKey(Manufacturer, on_delete=models.CASCADE)
+    manufacturer = models.ForeignKey(
-    version = models.CharField(max_length=64, blank=True)
+        Manufacturer,
-    interface = models.PositiveSmallIntegerField(
+        on_delete=models.CASCADE,
-        choices=settings.DECODER_INTERFACES, null=True, blank=True
+        limit_choices_to={"category": "accessory"},
     )
+    version = models.CharField(max_length=64, blank=True)
     sound = models.BooleanField(default=False)
-    image = models.ImageField(upload_to="images/", null=True, blank=True)
+    image = models.ImageField(
+        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
+    )
+
+    class Meta(object):
+        ordering = ["manufacturer", "name"]
 
     def __str__(self):
         return "{0} - {1}".format(self.manufacturer, self.name)
@@ -76,39 +107,84 @@ class Decoder(models.Model):
     image_thumbnail.short_description = "Preview"
 
 
+class DecoderDocument(Document):
+    decoder = models.ForeignKey(
+        Decoder, on_delete=models.CASCADE, related_name="document"
+    )
+
+    class Meta:
+        unique_together = ("decoder", "file")
+
+
 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, blank=True)
     gauge = models.CharField(max_length=16, blank=True)
+    tracks = models.CharField(max_length=16, blank=True)
 
     class Meta:
         ordering = ["scale"]
 
+    def get_absolute_url(self):
+        return reverse(
+            "filtered", kwargs={
+                "_filter": "scale",
+                "search": self.slug,
+            }
+        )
+
     def __str__(self):
         return str(self.scale)
 
 
+class RollingStockType(models.Model):
+    type = models.CharField(max_length=64)
+    order = models.PositiveSmallIntegerField()
+    category = models.CharField(
+        max_length=64, choices=settings.ROLLING_STOCK_TYPES
+    )
+    slug = models.CharField(max_length=128, unique=True, editable=False)
+
+    class Meta(object):
+        unique_together = ("category", "type")
+        ordering = ["order"]
+
+    def get_absolute_url(self):
+        return reverse(
+            "filtered", kwargs={
+                "_filter": "type",
+                "search": self.slug,
+            }
+        )
+
+    def __str__(self):
+        return "{0} {1}".format(self.type, self.category)
+
+
 class Tag(models.Model):
     name = models.CharField(max_length=128, unique=True)
     slug = models.CharField(max_length=128, unique=True)
 
+    class Meta(object):
+        ordering = ["name"]
+
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse(
+            "filtered", kwargs={
+                "_filter": "tag",
+                "search": self.slug,
+            }
+        )
 
+
+@receiver(models.signals.pre_save, sender=Manufacturer)
+@receiver(models.signals.pre_save, sender=Company)
+@receiver(models.signals.pre_save, sender=Scale)
+@receiver(models.signals.pre_save, sender=RollingStockType)
 @receiver(models.signals.pre_save, sender=Tag)
-def tag_pre_save(sender, instance, **kwargs):
+def slug_pre_save(sender, instance, **kwargs):
-    instance.slug = slugify(instance.name)
+    instance.slug = slugify(instance.__str__())
-
-
-class RollingStockType(models.Model):
-    type = models.CharField(max_length=64)
-    category = models.CharField(
-        max_length=64, choices=settings.ROLLING_STOCK_TYPES
-    )
-
-    class Meta(object):
-        unique_together = ("category", "type")
-
-    def __str__(self):
-        return "{0} {1}".format(self.type, self.category)

ram/portal/admin.py

@@ -1,6 +1,67 @@
 from django.contrib import admin
 from solo.admin import SingletonModelAdmin
 
-from portal.models import SiteConfiguration
+from portal.models import SiteConfiguration, Flatpage
 
-admin.site.register(SiteConfiguration, SingletonModelAdmin)
+
+@admin.register(SiteConfiguration)
+class SiteConfigurationAdmin(SingletonModelAdmin):
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "site_name",
+                    "site_author",
+                    "about",
+                    "items_per_page",
+                    "items_ordering",
+                    "footer",
+                    "footer_extended",
+                )
+            },
+        ),
+        (
+            "Advanced",
+            {
+                "classes": ("collapse",),
+                "fields": (
+                    "show_version",
+                    "use_cdn",
+                    "extra_head",
+                ),
+            },
+        ),
+    )
+
+
+@admin.register(Flatpage)
+class FlatpageAdmin(admin.ModelAdmin):
+    readonly_fields = ("path", "creation_time", "updated_time")
+    list_display = ("name", "path", "published", "get_link")
+    list_filter = ("published",)
+    search_fields = ("name",)
+
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "name",
+                    "path",
+                    "content",
+                    "published",
+                )
+            },
+        ),
+        (
+            "Audit",
+            {
+                "classes": ("collapse",),
+                "fields": (
+                    "creation_time",
+                    "updated_time",
+                ),
+            },
+        ),
+    )

ram/portal/context_processors.py

@@ -0,0 +1,5 @@
+from django.conf import settings
+
+
+def default_card_image(request):
+    return {"DEFAULT_CARD_IMAGE": settings.DEFAULT_CARD_IMAGE}

ram/portal/migrations/0007_siteconfiguration_items_ordering.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-15 12:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0006_alter_siteconfiguration_site_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='siteconfiguration',
+            name='items_ordering',
+            field=models.CharField(choices=[('type', 'By rolling stock type'), ('company', 'By company name'), ('identifier', 'By rolling stock class')], default='type', max_length=10),
+        ),
+    ]

ram/portal/migrations/0008_flatpage.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.0.6 on 2022-08-07 15:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0007_siteconfiguration_items_ordering'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Flatpage',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=256, unique=True)),
+                ('draft', models.BooleanField(default=True)),
+                ('content', models.TextField(blank=True)),
+            ],
+        ),
+    ]

ram/portal/migrations/0009_flatpage_path.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.6 on 2022-08-07 15:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0008_flatpage'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='flatpage',
+            name='path',
+            field=models.CharField(default='', max_length=256, unique=True),
+            preserve_default=False,
+        ),
+    ]

ram/portal/migrations/0010_flatpage_creation_time_flatpage_updated_time.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.0.6 on 2022-08-07 15:46
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0009_flatpage_path'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='flatpage',
+            name='creation_time',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='flatpage',
+            name='updated_time',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

ram/portal/migrations/0011_alter_flatpage_content_alter_siteconfiguration_about_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.1 on 2022-08-23 15:54
+
+import ckeditor.fields
+import ckeditor_uploader.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("portal", "0010_flatpage_creation_time_flatpage_updated_time"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="flatpage",
+            name="content",
+            field=ckeditor_uploader.fields.RichTextUploadingField(),
+        ),
+        migrations.AlterField(
+            model_name="siteconfiguration",
+            name="about",
+            field=ckeditor.fields.RichTextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name="siteconfiguration",
+            name="footer",
+            field=ckeditor.fields.RichTextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name="siteconfiguration",
+            name="footer_extended",
+            field=ckeditor.fields.RichTextField(blank=True),
+        ),
+    ]

ram/portal/migrations/0012_md_to_html.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.1 on 2022-08-24 15:00
+
+import markdown
+from django.db import migrations
+
+
+def md_to_html(apps, schema_editor):
+    fields = {
+        "SiteConfiguration": ["about", "footer", "footer_extended"],
+        "Flatpage": ["content"]
+    }
+
+    for m in fields.items():
+        model = apps.get_model("portal", m[0])
+
+        for row in model.objects.all():
+            for field in m[1]:
+                html = markdown.markdown(getattr(row, field))
+                row.__dict__[field] = html
+
+            row.save(update_fields=m[1])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "portal",
+            "0011_alter_flatpage_content_alter_siteconfiguration_about_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            md_to_html,
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]

ram/portal/migrations/0013_remove_flatpage_draft_flatpage_published.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.1 on 2022-08-25 10:18
+
+from django.db import migrations, models
+
+
+def reverse_bool(apps, schema_editor):
+    model = apps.get_model("portal", "Flatpage")
+
+    for row in model.objects.all():
+        row.published = not row.draft
+        row.save(update_fields=["published"])
+
+
+def reverse_bool_back(apps, schema_editor):
+    model = apps.get_model("portal", "Flatpage")
+
+    for row in model.objects.all():
+        row.draft = not row.published
+        row.save(update_fields=["draft"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("portal", "0012_md_to_html"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="flatpage",
+            name="published",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(
+            reverse_bool,
+            reverse_code=reverse_bool_back
+        ),
+        migrations.RemoveField(
+            model_name="flatpage",
+            name="draft",
+        ),
+    ]

ram/portal/migrations/0014_siteconfiguration_extra_head.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2022-12-28 22:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("portal", "0013_remove_flatpage_draft_flatpage_published"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="siteconfiguration",
+            name="extra_head",
+            field=models.TextField(blank=True),
+        ),
+    ]

ram/portal/migrations/0015_siteconfiguration_use_cdn.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-01-03 15:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("portal", "0014_siteconfiguration_extra_head"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="siteconfiguration",
+            name="use_cdn",
+            field=models.BooleanField(default=True),
+        ),
+    ]

ram/portal/models.py

@@ -1,8 +1,15 @@
 import django
 from django.db import models
+from django.urls import reverse
+from django.dispatch.dispatcher import receiver
+from django.utils.safestring import mark_safe
+from solo.models import SingletonModel
+
+from ckeditor.fields import RichTextField
+from ckeditor_uploader.fields import RichTextUploadingField
 
 from ram import __version__ as app_version
-from solo.models import SingletonModel
+from ram.utils import slugify
 
 
 class SiteConfiguration(SingletonModel):
@@ -10,15 +17,26 @@ class SiteConfiguration(SingletonModel):
         max_length=256, default="Railroad Assets Manager"
     )
     site_author = models.CharField(max_length=256, blank=True)
-    about = models.TextField(blank=True)
+    about = RichTextField(blank=True)
     items_per_page = models.CharField(
         max_length=2,
         choices=[(str(x * 3), str(x * 3)) for x in range(2, 11)],
         default="6",
     )
-    footer = models.TextField(blank=True)
+    items_ordering = models.CharField(
-    footer_extended = models.TextField(blank=True)
+        max_length=10,
+        choices=[
+            ("type", "By rolling stock type"),
+            ("company", "By company name"),
+            ("identifier", "By rolling stock class"),
+        ],
+        default="type",
+    )
+    footer = RichTextField(blank=True)
+    footer_extended = RichTextField(blank=True)
     show_version = models.BooleanField(default=True)
+    use_cdn = models.BooleanField(default=True)
+    extra_head = models.TextField(blank=True)
 
     class Meta:
         verbose_name = "Site Configuration"
@@ -31,3 +49,30 @@ class SiteConfiguration(SingletonModel):
 
     def django_version(self):
         return django.get_version()
+
+
+class Flatpage(models.Model):
+    name = models.CharField(max_length=256, unique=True)
+    path = models.CharField(max_length=256, unique=True)
+    published = models.BooleanField(default=False)
+    content = RichTextUploadingField()
+    creation_time = models.DateTimeField(auto_now_add=True)
+    updated_time = models.DateTimeField(auto_now=True)
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse("flatpage", kwargs={"flatpage": self.path})
+
+    def get_link(self):
+        return mark_safe(
+            '<a href="{0}" target="_blank">Link</a>'.format(
+                self.get_absolute_url()
+            )
+        )
+
+
+@receiver(models.signals.pre_save, sender=Flatpage)
+def tag_pre_save(sender, instance, **kwargs):
+    instance.path = slugify(instance.name)

ram/portal/static/coming_soon.svg

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="420"
+   height="226"
+   viewBox="0 0 5.8333333 3.1388889"
+   version="1.1"
+   id="svg1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="linearGradient1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.59606808"
+         id="stop2" />
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         offset="1"
+         id="stop1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1"
+       id="linearGradient2"
+       x1="0"
+       y1="1.5694444"
+       x2="5.8333335"
+       y2="1.5694444"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53809522,0,0,1.8584071,-3.1388889,0)"
+       spreadMethod="pad" />
+  </defs>
+  <g
+     id="layer1">
+    <rect
+       style="mix-blend-mode:normal;fill:url(#linearGradient2);stroke:none;stroke-width:0.801535"
+       id="rect1"
+       width="3.1388888"
+       height="5.8333335"
+       x="-3.1388888"
+       y="-2.220446e-16"
+       transform="rotate(-90)" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:0.444444px;line-height:1.25;font-family:system-ui,-apple-system,'Segoe UI',Roboto,'Helvetica Neue','Noto Sans','Liberation Sans',Arial,sans-serif;-inkscape-font-specification:'Noto Sans Bold';letter-spacing:0px;word-spacing:0px;stroke-width:0.0138889"
+       x="1.5366687"
+       y="1.6798887"
+       id="text1"><tspan
+         id="tspan1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:0.444444px;font-family:system-ui,-apple-system,'Segoe UI',Roboto,'Helvetica Neue','Noto Sans','Liberation Sans',Arial,sans-serif;-inkscape-font-specification:'Noto Sans';fill:#dee2e6;fill-opacity:1;stroke-width:0.0138889"
+         x="1.5366687"
+         y="1.6798887">Coming soon</tspan></text>
+  </g>
+</svg>

ram/portal/static/css/main.css

@@ -1,19 +1,56 @@
+/* Switch SVG logo to white on dark mode */
+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;
+}
+
 .btn > span {
   display: inline-block;
 }
 
-.tab-pane {
+a.badge, a.badge:hover {
-  min-height: 300px;
+  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-notes > p {
   padding: .5rem;
 }
 
+#nav-journal ul, #nav-journal ol {
+  margin: 0;
+  padding-left: 1rem;
+}
+
+#nav-journal p {
+  margin: 0;
+}
+
 #footer > p {
   display: inline;
 }

ram/portal/static/favicon.svg

@@ -0,0 +1,9 @@
+            <svg width="26" height="16" enable-background="new 0 0 26 26" version="1" viewBox="0 0 26 16" xmlns="http://www.w3.org/2000/svg">
+              <path d="m2.8125 0.0010991a1.0001 1.0001 0 0 0-0.8125 1c0 0.55455-0.44545 1-1 1a1.0001 1.0001 0 0 0-1 1v10a1.0001 1.0001 0 0 0 1 1c0.55455 0 1 0.44546 1 1a1.0001 1.0001 0 0 0 1 1h20a1.0001 1.0001 0 0 0 1-1c0-0.55454 0.44546-1 1-1a1.0001 1.0001 0 0 0 1-1v-10a1.0001 1.0001 0 0 0-1-1c-0.55454 0-1-0.44545-1-1a1.0001 1.0001 0 0 0-1-1h-20a1.0001 1.0001 0 0 0-0.09375 0 1.0001 1.0001 0 0 0-0.09375 0zm0.78125 2h14.406v1h2v-1h2.4062c0.30628 0.76906 0.82469 1.2875 1.5938 1.5938v8.8125c-0.76906 0.30628-1.2875 0.82469-1.5938 1.5938h-2.4062v-1h-2v1h-14.406c-0.30628-0.76906-0.82469-1.2875-1.5938-1.5938v-8.8125c0.76906-0.30628 1.2875-0.82469 1.5938-1.5938zm14.406 2v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" enable-background="accumulate" overflow="visible" stroke-width="2" />
+              <style>
+                path {
+                  text-indent:0;
+                  text-transform:none;
+                }
+              </style>
+            </svg>

ram/portal/templates/base.html

@@ -1,19 +1,28 @@
 {% load static %}
 {% load solo_tags %}
-{% load markdown %}
+{% load show_menu %}
 {% get_solo 'portal.SiteConfiguration' as site_conf %}
 
 <!doctype html>
-<html lang="en">
+<html lang="en" data-bs-theme="auto">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
+    <meta name="color-scheme" content="light dark">
+    <meta name="description" content="{{ site_conf.about}}">
     <meta name="author" content="{{ site_conf.site_author }}">
     <meta name="generator" content="Django Framework">
-    <title>{{ site_conf.site_name }}</title>
+    <title>{% block title %}{{ title }}{% endblock %} - {{ site_conf.site_name }}</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="icon" href="{% static "favicon.png" %}" sizes="any">
-    <link href="{% static "css/main.css" %}" rel="stylesheet">
+    <link rel="icon" href="{% static "favicon.svg" %}" type="image/svg+xml">
+    {% if site_conf.use_cdn %}
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css" rel="stylesheet">
+    {% else %}
+    <link href="{% static "bootstrap@5.3.2/dist/css/bootstrap.min.css" %}" rel="stylesheet">
+    <link href="{% static "bootstrap-icons@1.11.1/font/bootstrap-icons.css" %}" rel="stylesheet">
+    {% endif %}
+    <link href="{% static "css/main.css" %}?v={{ site_conf.version }}" rel="stylesheet">
     <style>
       .bd-placeholder-img {
         font-size: 1.125rem;
@@ -22,43 +31,151 @@
         -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>
+    {% block extra_head %}
+    {{ site_conf.extra_head | safe }}
+    {% endblock %}
   </head>
   <body>
     <header>
-      <div class="navbar navbar-light bg-light shadow-sm">
+      <nav class="navbar navbar-expand-sm bg-body-tertiary shadow-sm">
-        <div class="container">
+        <div class="container d-flex">
-          <a href="/" class="navbar-brand d-flex align-items-center">
+          <div class="me-auto">
-            <svg class="me-2" width="26" height="16" enable-background="new 0 0 26 26" version="1" viewBox="0 0 26 16" xmlns="http://www.w3.org/2000/svg">
+            <a href="{% url 'index' %}" class="navbar-brand d-flex align-items-center">
-              <path d="m2.8125 0.0010991a1.0001 1.0001 0 0 0-0.8125 1c0 0.55455-0.44545 1-1 1a1.0001 1.0001 0 0 0-1 1v10a1.0001 1.0001 0 0 0 1 1c0.55455 0 1 0.44546 1 1a1.0001 1.0001 0 0 0 1 1h20a1.0001 1.0001 0 0 0 1-1c0-0.55454 0.44546-1 1-1a1.0001 1.0001 0 0 0 1-1v-10a1.0001 1.0001 0 0 0-1-1c-0.55454 0-1-0.44545-1-1a1.0001 1.0001 0 0 0-1-1h-20a1.0001 1.0001 0 0 0-0.09375 0 1.0001 1.0001 0 0 0-0.09375 0zm0.78125 2h14.406v1h2v-1h2.4062c0.30628 0.76906 0.82469 1.2875 1.5938 1.5938v8.8125c-0.76906 0.30628-1.2875 0.82469-1.5938 1.5938h-2.4062v-1h-2v1h-14.406c-0.30628-0.76906-0.82469-1.2875-1.5938-1.5938v-8.8125c0.76906-0.30628 1.2875-0.82469 1.5938-1.5938zm14.406 2v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" enable-background="accumulate" fill="#000" overflow="visible" stroke-width="2" style="text-indent:0;text-transform:none"/>
+              <svg class="me-2" width="26" height="16" viewBox="0 0 26 16" xmlns="http://www.w3.org/2000/svg">
-            </svg>
+                <path d="m2.8125 0.0010991a1.0001 1.0001 0 0 0-0.8125 1c0 0.55455-0.44545 1-1 1a1.0001 1.0001 0 0 0-1 1v10a1.0001 1.0001 0 0 0 1 1c0.55455 0 1 0.44546 1 1a1.0001 1.0001 0 0 0 1 1h20a1.0001 1.0001 0 0 0 1-1c0-0.55454 0.44546-1 1-1a1.0001 1.0001 0 0 0 1-1v-10a1.0001 1.0001 0 0 0-1-1c-0.55454 0-1-0.44545-1-1a1.0001 1.0001 0 0 0-1-1h-20a1.0001 1.0001 0 0 0-0.09375 0 1.0001 1.0001 0 0 0-0.09375 0zm0.78125 2h14.406v1h2v-1h2.4062c0.30628 0.76906 0.82469 1.2875 1.5938 1.5938v8.8125c-0.76906 0.30628-1.2875 0.82469-1.5938 1.5938h-2.4062v-1h-2v1h-14.406c-0.30628-0.76906-0.82469-1.2875-1.5938-1.5938v-8.8125c0.76906-0.30628 1.2875-0.82469 1.5938-1.5938zm14.406 2v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" stroke-width="2" />
-            <strong>{{ site_conf.site_name }}</strong>
+                <style>
-          </a>
+                  path {
-        {% include 'includes/login.html' %}
+                    text-indent:0;
+                    text-transform:none;
+                  }
+                </style>
+              </svg>
+              <strong>{{ site_conf.site_name }}</strong>
+            </a>
+         </div>
+         {% include 'includes/login.html' %}
         </div>
-      </div>
+      </nav>
     </header>
     <main>
       <div class="container py-2">
-        <nav class="navbar navbar-expand-lg navbar-light">
+        <nav class="navbar navbar-expand-lg">
           <div class="container-fluid g-0">
-            <a class="navbar-brand" href="/">Home</a>
+            <a class="navbar-brand" href="{% url 'index' %}">Home</a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+            </button>
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
               <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                 <li class="nav-item">
-                  <a class="nav-link" href="/portal">Roster</a>
+                  <a class="nav-link" href="{% url 'roster' %}">Roster</a>
                 </li>
                 <li class="nav-item">
-                  <a class="nav-link" href="/portal/consist">Consists</a>
+                  <a class="nav-link" href="{% url 'consists' %}">Consists</a>
                 </li>
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle" href="#" id="filterDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    Search by
+                  </a>
+                  <ul class="dropdown-menu" aria-labelledby="filterDropdownMenu">
+                    <li class="ps-2 text-secondary">Model</li>
+                    <li><a class="dropdown-item" href="{% url 'scales' %}">Scale</a></li>
+                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='model' %}">Manufacturer</a></li>
+                    <li><hr class="dropdown-divider"></li>
+                    <li class="ps-2 text-secondary">Prototype</li>
+                    <li><a class="dropdown-item" href="{% url 'types' %}">Type</a></li>
+                    <li><a class="dropdown-item" href="{% url 'companies' %}">Company</a></li>
+                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Manufacturer</a></li>
+                  </ul>
+                </li>
+                {% show_bookshelf_menu %}
+                {% show_flatpages_menu %}
               </ul>
-                    {% include 'includes/search.html' %}
+              {% include 'includes/search.html' %}
             </div>
           </div>
         </nav>
@@ -66,110 +183,29 @@
       <section class="py-4 text-center container">
         <div class="row">
           <div class="mx-auto">
-            {% block header %}{% endblock %}
+            <h1 class="fw-light">{{ title }}</h1>
+            {% block header %}
+            {% endblock %}
           </div>
         </div>
       </section>
-      <div class="album py-5 bg-light">
+      <div class="album py-4 bg-body-tertiary">
         <div class="container">
-          <a id="rolling-stock"></a>
+          {% block carousel %}
-          <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
+          {% endblock %}
-            {% block cards %}
+          <a id="main-content"></a>
-            {% for r in rolling_stock %}
+          {% block cards_layout %}
-            <div class="col">
+          {% endblock %}
-              <div class="card shadow-sm">
-                {% for i in r.image.all %}
-                {% if i.is_thumbnail %}<a href="/portal/{{ r.uuid }}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
-                {% endfor %}
-                <div class="card-body">
-                  <p class="card-text"><strong>{{ r }}</strong></p>
-                  {% if r.tags.all %}
-                  <p class="card-text"><small>Tags:</small>
-                   {% for t in r.tags.all %}<span class="badge bg-primary">
-                    {{ t.name }}</span>{# new line is required #}
-                    {% endfor %}
-                  </p>
-                  {% endif %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Data</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr>
-                        <th width="35%" scope="row">Type</th>
-                        <td>{{ r.rolling_class.type }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Company</th>
-                        <td><abbr title="{{ r.rolling_class.company.extended_name }}">{{ r.rolling_class.company }}</abbr></td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Class</th>
-                        <td>{{ r.rolling_class.identifier }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Road number</th>
-                        <td>{{ r.road_number }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Era</th>
-                        <td>{{ r.era }}</td>
-                      </tr>
-                      <tr>
-                        <th width="35%" scope="row">Manufacturer</th>
-                        <td>{% if r.manufacturer.website %}<a href="{{ r.manufacturer.website }}">{% endif %}{{ r.manufacturer }}{% if r.manufacturer.website %}</a>{% endif %}</th>
-                      </tr>
-                      <tr>
-                        <th scope="row">Scale</th>
-                        <td><abbr title="{{ r.scale.ratio }} - {{ r.scale.gauge }}">{{ r.scale }}</abbr></td>
-                      </tr>
-                      <tr>
-                        <th scope="row">SKU</th>
-                        <td>{{ r.sku }}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  {% if r.decoder %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">DCC data</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr>
-                        <th width="35%" scope="row">Decoder</th>
-                        <td>{{ r.decoder }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Address</th>
-                        <td>{{ r.address }}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  {% endif %}
-                  <div class="btn-group mb-4">
-                   <a class="btn btn-sm btn-outline-primary" href="/portal/{{ r.uuid }}">Show all data</a>
-                    {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' r.pk %}">Edit</a>{% endif %}
-                  </div>
-                  <div class="d-flex justify-content-between align-items-center">
-                    <small class="text-muted">Updated {{ r.updated_time | date:"M d, Y H:m" }}</small>
-                  </div>
-                </div>
-              </div>
-            </div>
-            {% endfor %}
-            {% endblock %}
-          </div>
         </div>
         <div class="container">{% block pagination %}{% endblock %}</div>
       </div>
       {% block extra_content %}{% endblock %}
     </main>
     {% include 'includes/footer.html' %}
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
+    {% if site_conf.use_cdn %}
-    <script src="https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js" integrity="sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D" crossorigin="anonymous" async></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
+    {% else %}
+    <script src="{% static "bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" %}"></script>
+    {% endif %}
   </body>
 </html>

ram/portal/templates/bookshelf/book.html

@@ -0,0 +1,123 @@
+{% extends 'base.html' %}
+
+        {% block header %}
+        {% if book.tags.all %}
+        <p><small>Tags:</small>
+          {% 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 %}
+        <small class="text-muted">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 book.image.all %}
+              {% if forloop.first %}
+              <div class="carousel-item active">
+              {% else %}
+              <div class="carousel-item">
+              {% endif %}
+                <img src="{{ t.image.url }}" class="d-block w-100 rounded img-thumbnail" alt="...">
+              </div>
+              {% endfor %}
+            </div>
+            {% if 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">Previous</span>
+            </button>
+            <button class="carousel-control-next" type="button" data-bs-target="#carouselControls" data-bs-slide="next">
+              <span class="carousel-control-next-icon" aria-hidden="true"></span>
+              <span class="visually-hidden">Next</span>
+            </button>
+            {% endif %}
+          </div>
+        </div>
+        {% endblock %}
+        {% block cards %}
+        {% endblock %}
+        {% block extra_content %}
+        <section class="py-4 text-start container">
+          <div class="row">
+            <div class="mx-auto">
+              <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
+                <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 book.notes %}<button class="nav-link" id="nav-notes-tab" data-bs-toggle="tab" data-bs-target="#nav-notes" type="button" role="tab" aria-controls="nav-notes" aria-selected="false">Notes</button>{% endif %}
+              </nav>
+              <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">Book</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                      <tr>
+                        <th class="w-33" scope="row">Title</th>
+                        <td>{{ book.title }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Authors</th>
+                          <td>
+                            <ul class="mb-0 list-unstyled">{% for a in book.authors.all %}<li>{{ a }}</li>{% endfor %}</ul>
+                          </td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Publisher</th>
+                        <td>{{ book.publisher }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">ISBN</th>
+                        <td>{{ book.ISBN|default:"-" }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Language</th>
+                        <td>{{ book.get_language_display }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Number of pages</th>
+                        <td>{{ book.number_of_pages|default:"-" }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Publication year</th>
+                        <td>{{ book.publication_year|default:"-" }}</td>
+                      </tr>
+                      <tr>
+                        <th scope="row">Purchase date</th>
+                        <td>{{ book.purchase_date|default:"-" }}</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                  {% if book_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 book_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-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
+                  {{ book.notes | safe }}
+                </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_book_change' book.pk %}">Edit</a>{% endif %}
+              </div>
+            </div>
+          </div>
+        </section>
+        {% endblock %}

ram/portal/templates/bookshelf/books.html

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

ram/portal/templates/bookshelf/bookshelf_menu.html

@@ -0,0 +1,10 @@
+                {% if bookshelf_menu %}
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle" href="#" id="bookshelfDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    Bookshelf
+                  </a>
+                  <ul class="dropdown-menu" aria-labelledby="bookshelfDropdownMenuLink">
+                    <li><a class="dropdown-item" href="{% url 'books' %}">Books</a></li>
+                  </ul>
+                </li>
+                {% endif %}

ram/portal/templates/cards.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+      {% block header %}
+        <p class="lead text-muted">Results found: {{ matches }}</p>
+      {% endblock %}
+      {% block cards_layout %}
+      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
+      {% block cards %}
+        {% for d in data %}
+        {% if d.type == "rolling_stock" %}
+        {% include "cards/roster.html" %}
+        {% elif d.type == "company" %}
+        {% include "cards/company.html" %}
+        {% elif d.type == "rolling_stock_type" %}
+        {% include "cards/rolling_stock_type.html" %}
+        {% elif d.type == "scale" %}
+        {% include "cards/scale.html" %}
+        {% elif d.type == "consist" %}
+        {% include "cards/consist.html" %}
+        {% elif d.type == "manufacturer" %}
+        {% include "cards/manufacturer.html" %}
+        {% elif d.type == "book" %}
+        {% include "cards/book.html" %}
+        {% endif %}
+        {% endfor %}
+      {% endblock %}
+      </div>
+      {% endblock %}

ram/portal/templates/cards/book.html

@@ -0,0 +1,56 @@
+        <div class="col">
+          <div class="card shadow-sm">
+            {% 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 }}"></a>
+            {% endif %}
+            <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>
+              {% 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 #}
+                {% endfor %}
+              </p>
+              {% endif %}
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">Book</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  <tr>
+                    <th class="w-33" scope="row">Authors</th>
+                    <td>
+                      <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>{{ d.item.publisher }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Language</th>
+                    <td>{{ d.item.get_language_display }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Pages</th>
+                    <td>{{ d.item.number_of_pages|default:"-" }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Year</th>
+                    <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.item.get_absolute_url }}">Show all data</a>
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:bookshelf_book_change' d.item.pk %}">Edit</a>{% endif %}
+              </div>
+            </div>
+          </div>
+        </div>
+

ram/portal/templates/cards/company.html

@@ -0,0 +1,46 @@
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text" style="position: relative;">
+              <strong>{{ d.item.name }}</strong>
+            </p>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">Company</th>
+                </tr>
+              </thead>
+              <tbody class="table-group-divider">
+                {% if d.item.logo %}
+                <tr>
+                  <th class="w-33" scope="row">Logo</th>
+                  <td><img class="logo" src="{{ d.item.logo.url }}" /></td>
+                </tr>
+                {% endif %}
+                <tr>
+                  <th class="w-33" scope="row">Name</th>
+                  <td>{{ d.item.extended_name }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Abbreviation</th>
+                  <td>{{ d.item.name }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Country</th>
+                  <td>{{ d.item.country.name }} <img src="{{ d.item.country.flag }}" alt="{{ d.item.country }}" />
+                </tr>
+               {% if d.item.freelance %}
+               <tr>
+                  <th class="w-33" scope="row">Notes</th>
+                  <td>A <em>freelance</em> company</td>
+                </tr>
+               {% endif %}
+              </tbody>
+            </table>
+            <div class="d-grid gap-2 mb-1 d-md-block">
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="company" search=d.item.slug %}">Show all rolling stock</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 %}
+            </div>
+          </div>
+        </div>
+      </div>

ram/portal/templates/cards/consist.html

@@ -0,0 +1,57 @@
+      <div class="col">
+        <div class="card shadow-sm">
+          <a href="{{ d.item.get_absolute_url }}">
+          {% if d.item.image %}
+            <img class="card-img-top" src="{{ d.item.image.url }}" alt="{{ d }}">
+          {% else %}
+            {% with d.item.consist_item.first.rolling_stock as r %}
+            <img class="card-img-top" src="{{ r.image.first.image.url }}" alt="{{ d }}"></a>
+            {% endwith %}
+          {% 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>
+            {% 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 #}
+              {% endfor %}
+            </p>
+            {% endif %}
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">Consist</th>
+                </tr>
+              </thead>
+              <tbody class="table-group-divider">
+                {% if d.item.address %}
+                <tr>
+                  <th class="w-33" scope="row">Address</th>
+                  <td>{{ d.item.address }}</td>
+                </tr>
+                {% endif %}
+                <tr>
+                  <th class="w-33" scope="row">Company</th>
+                  <td><abbr title="{{ d.item.company.extended_name }}">{{ d.item.company }}</abbr></td>
+                </tr>
+                <tr>
+                  <th scope="row">Era</th>
+                  <td>{{ d.item.era }}</td>
+                </tr>
+                <tr>
+                  <th scope="row">Length</th>
+                  <td>{{ d.item.consist_item.count }}</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.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>
+      </div>

ram/portal/templates/cards/manufacturer.html

@@ -0,0 +1,39 @@
+        <div class="col">
+          <div class="card shadow-sm">
+            <div class="card-body">
+              <p class="card-text" style="position: relative;">
+                <strong>{{ d.item.name }}</strong>
+              </p>
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">Manufacturer</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  {% if d.item.logo %}
+                  <tr>
+                    <th class="w-33" scope="row">Logo</th>
+                    <td><img class="logo" src="{{ d.item.logo.url }}" /></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">Category</th>
+                    <td>{{ d.item.category | title }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              <div class="d-grid gap-2 mb-1 d-md-block">
+                <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="manufacturer" search=d.item.slug %}">Show all rolling stock</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 %}
+              </div>
+            </div>
+          </div>
+        </div>
+

ram/portal/templates/cards/rolling_stock_type.html

@@ -0,0 +1,29 @@
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text"><strong>{{ d.item }}</strong></p>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="2" scope="row">Type</th>
+                </tr>
+              </thead>
+              <tbody class="table-group-divider">
+                <tr>
+                  <th class="w-33" scope="row">Type</th>
+                  <td>{{ d.item.type }}</td>
+                </tr>
+                <tr>
+                  <th class="w-33" scope="row">Category</th>
+                  <td>{{ d.item.category | title}}</td>
+                </tr>
+              </tbody>
+            </table>
+            <div class="d-grid gap-2 mb-1 d-md-block">
+              <a class="btn btn-sm btn-outline-primary" href="{% url 'filtered' _filter="type" search=d.item.slug %}">Show all rolling stock</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 %}
+            </div>
+          </div>
+        </div>
+      </div>
+

ram/portal/templates/cards/roster.html

@@ -0,0 +1,92 @@
+{% load static %}
+        <div class="col">
+          <div class="card shadow-sm">
+            {% 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 }}"></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 }}"></a>
+            {% endif %}
+            <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>
+              {% 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 #}
+                {% endfor %}
+              </p>
+              {% endif %}
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">Rolling stock</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  <tr>
+                    <th class="w-33" scope="row">Type</th>
+                    <td>{{ d.item.rolling_class.type }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Company</th>
+                    <td>
+                      <a href="{% url 'filtered' _filter="company" search=d.item.rolling_class.company.slug %}"><abbr title="{{ d.item.rolling_class.company.extended_name }}">{{ d.item.rolling_class.company }}</abbr></a>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Class</th>
+                    <td>{{ d.item.rolling_class.identifier }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Road number</th>
+                    <td>{{ d.item.road_number }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Era</th>
+                    <td>{{ d.item.era }}</td>
+                  </tr>
+                  <tr>
+                    <th class="w-33" scope="row">Manufacturer</th>
+                    <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.item.scale.slug %}"><abbr title="{{ d.item.scale.ratio }} - {{ d.item.scale.tracks }}">{{ d.item.scale }}</abbr></a></td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Item number</th>
+                    <td>{{ d.item.item_number }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              {% if d.item.decoder %}
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" scope="row">DCC data</th>
+                  </tr>
+                </thead>
+                <tbody class="table-group-divider">
+                  <tr>
+                    <th class="w-33" scope="row">Decoder</th>
+                    <td>{{ d.item.decoder }}</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">Address</th>
+                    <td>{{ d.item.address }}</td>
+                  </tr>
+                </tbody>
+              </table>
+              {% endif %}
+              <div class="d-grid gap-2 mb-1 d-md-block">
+               <a class="btn btn-sm btn-outline-primary" href="{{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>
+        </div>

ram/portal/templates/cards/scale.html

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

ram/portal/templates/companies.html

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

ram/portal/templates/consist.html

@@ -1,129 +1,57 @@
-{% extends "base.html" %}
+{% extends "cards.html" %}
-{% load markdown %}
 
       {% block header %}
-        <h1 class="fw-light">{{ consist }}</h1>
+      {% if consist.tags.all %}
-        {% if consist.tags.all %}
+      <p><small>Tags:</small>
-        <p><small>Tags:</small>
+        {% for t in consist.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
-         {% for t in consist.tags.all %}<span class="badge bg-primary">
+        {{ t.name }}</a>{# new line is required #}
-          {{ t.name }}</span>{# new line is required #}
+        {% endfor %}
-          {% endfor %}
+      </p>
-        </p>
+      <small class="text-muted">Updated {{ consist.updated_time | date:"M d, Y H:i" }}</small>
-        {% endif %}
+      {% endif %}
       {% endblock %}
-      {% block cards %}
+      {% block carousel %}
-      {% for r in rolling_stock %}
+      {% if consist.image %}
-      <div class="col">
+      <div class="row pb-4">
-        <div class="card shadow-sm">
+        <div id="carouselControls" class="carousel carousel-dark slide" data-bs-ride="carousel">
-          {% for i in r.rolling_stock.image.all %}
+          <div class="carousel-inner">
-          {% if i.is_thumbnail %}<a href="/portal/{{ r.rolling_stock.uuid }}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
+            <div class="carousel-item active">
-          {% endfor %}
+              <img src="{{ consist.image.url }}" class="d-block w-100 rounded img-thumbnail" alt="...">
-          <div class="card-body">
-            <p class="card-text"><strong>{{ r }}</strong></p>
-            {% if r.rolling_stock.tags.all %}
-            <p class="card-text"><small>Tags:</small>
-             {% for t in r.rolling_stock.tags.all %}<span class="badge bg-primary">
-              {{ t.name }}</span>{# new line is required #}
-              {% endfor %}
-            </p>
-            {% endif %}
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Data</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <th width="35%" scope="row">Type</th>
-                  <td>{{ r.rolling_stock.rolling_class.type }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Company</th>
-                  <td><abbr title="{{ r.rolling_stock.rolling_class.company.extended_name }}">{{ r.rolling_stock.rolling_class.company }}</abbr></td>
-                </tr>
-                <tr>
-                  <th scope="row">Class</th>
-                  <td>{{ r.rolling_stock.rolling_class.identifier }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Road number</th>
-                  <td>{{ r.rolling_stock.road_number }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Era</th>
-                  <td>{{ r.rolling_stock.era }}</td>
-                </tr>
-                <tr>
-                  <th width="35%" scope="row">Manufacturer</th>
-                  <td>{% if r.rolling_stock.manufacturer.website %}<a href="{{ r.rolling_stock.manufacturer.website }}">{% endif %}{{ r.rolling_stock.manufacturer }}{% if r.rolling_stock.manufacturer.website %}</a>{% endif %}</th>
-                </tr>
-                <tr>
-                  <th scope="row">Scale</th>
-                  <td><abbr title="{{ r.rolling_stock.scale.ratio }} - {{ r.rolling_stock.scale.gauge }}">{{ r.rolling_stock.scale }}</abbr></td>
-                </tr>
-                <tr>
-                  <th scope="row">SKU</th>
-                  <td>{{ r.rolling_stock.sku }}</td>
-                </tr>
-                </tbody>
-              </table>
-            {% if r.rolling_stock.decoder %}
-              <table class="table table-striped">
-                <thead>
-                  <tr>
-                    <th colspan="2" scope="row">DCC data</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <th width="35%" scope="row">Decoder</th>
-                    <td>{{ r.rolling_stock.decoder }}</td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Address</th>
-                    <td>{{ r.rolling_stock.address }}</td>
-                  </tr>
-                </tbody>
-              </table>
-            {% endif %}
-            <div class="btn-group mb-4">
-             <a class="btn btn-sm btn-outline-primary" href="/portal/{{ r.rolling_stock.uuid }}">Show all data</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' r.rolling_stock.pk %}">Edit</a>{% endif %}
-            </div>
-            <div class="d-flex justify-content-between align-items-center">
-              <small class="text-muted">Updated {{ r.rolling_stock.updated_time | date:"M d, Y H:m" }}</small>
             </div>
           </div>
         </div>
       </div>
-      {% endfor %}
+      {% endif %}
       {% endblock %}
       {% block pagination %}
-      {% if rolling_stock.has_other_pages %}
+      {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
-        <ul class="pagination justify-content-center mt-4">
+        <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if rolling_stock.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=data.previous_page_number %}#main-content" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
             <span class="page-link">Previous</span>
           </li>
           {% endif %}
-          {% for i in rolling_stock.paginator.page_range %}
+          {% for i in page_range %}
-            {% if rolling_stock.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
-            <li class="page-item"><a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ i }}#rolling-stock">{{ i }}</a></li>
+              {% if i == data.paginator.ELLIPSIS %}
+              <li class="page-item"><span class="page-link">{{ i }}</span></li>
+              {% else %}
+              <li class="page-item"><a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=i %}#main-content">{{ i }}</a></li>
+              {% endif %}
             {% endif %}
           {% endfor %}
-          {% if rolling_stock.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.next_page_number }}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'consist_pagination' uuid=consist.uuid page=data.next_page_number %}#main-content" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -138,6 +66,51 @@
       <section class="py-4 text-start container">
         <div class="row">
           <div class="mx-auto">
+            <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
+              <button class="nav-link active" id="nav-summary-tab" data-bs-toggle="tab" data-bs-target="#nav-summary" type="button" role="tab" aria-controls="nav-summary" aria-selected="true">Summary</button>
+              {% if consist.notes %}<button class="nav-link" id="nav-notes-tab" data-bs-toggle="tab" data-bs-target="#nav-notes" type="button" role="tab" aria-controls="nav-notes" aria-selected="false">Notes</button>{% endif %}
+            </nav>
+            <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">Data</th>
+                    </tr>
+                  </thead>
+                  <tbody class="table-group-divider">
+                    <tr>
+                      <th class="w-33" scope="row">Company</th>
+                      <td>
+                        <a href="{% url 'filtered' _filter="company" search=consist.company.slug %}">{{ consist.company }}</a> ({{ consist.company.extended_name }})
+                      </td>
+                    </tr>
+                    <tr>
+                      <th scope="row">Era</th>
+                      <td>{{ consist.era }}</td>
+                    </tr>
+                    <tr>
+                      <th scope="row">Length</th>
+                      <td>{{ data | length }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <div class="tab-pane" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
+                <table class="table">
+                  <thead>
+                    <tr>
+                      <th scope="row">Notes</th>
+                    </tr>
+                  </thead>
+                  <tbody class="table-group-divider">
+                    <tr>
+                      <td>{{ consist.notes | safe }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
             <div class="d-grid gap-2 d-md-flex justify-content-md-end">
               {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:consist_consist_change' consist.pk %}">Edit</a>{% endif %}
             </div>

ram/portal/templates/consists.html

@@ -1,86 +1,33 @@
-{% extends "base.html" %}
+{% extends "cards.html" %}
-{% load markdown %}
-
-      {% block header %}
-        <h1 class="fw-light">Consists</h1>
-      {% endblock %}
-      {% block cards %}
-      {% for c in consist %}
-      <div class="col">
-        <div class="card shadow-sm">
-          <div class="card-body">
-            <p class="card-text"><strong>{{ c.identifier }}</strong></p>
-            {% if c.tags.all %}
-            <p class="card-text"><small>Tags:</small>
-             {% for t in c.tags.all %}<span class="badge bg-primary">
-              {{ t.name }}</span>{# new line is required #}
-              {% endfor %}
-            </p>
-            {% endif %}
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="2" scope="row">Consist data</th>
-                </tr>
-              </thead>
-              <tbody>
-                {% if c.address %}
-                <tr>
-                  <th width="35%" scope="row">Address</th>
-                  <td>{{ c.address }}</td>
-                </tr>
-                {% endif %}
-                <tr>
-                  <th width="35%" scope="row">Company</th>
-                  <td><abbr title="{{ c.company.extended_name }}">{{ c.company }}</abbr></td>
-                </tr>
-                <tr>
-                  <th scope="row">Era</th>
-                  <td>{{ c.era }}</td>
-                </tr>
-                <tr>
-                  <th scope="row">Length</th>
-                  <td>{{ c.consist_item.all | length }}</td>
-                </tr>
-              </tbody>
-            </table>
-            <div class="btn-group mb-4">
-             <a class="btn btn-sm btn-outline-primary" href="/portal/consist/{{ c.uuid }}">Show all data</a>
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{# url 'admin:consist_consist_change' c.pk #}">Edit</a>{% endif %}
-            </div>
-            <div class="d-flex justify-content-between align-items-center">
-              <small class="text-muted">Updated {{ c.updated_time | date:"M d, Y H:m" }}</small>
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endfor %}
-      {% endblock %}
       {% block pagination %}
-      {% if rolling_stock.has_other_pages %}
+      {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
-        <ul class="pagination justify-content-center mt-4">
+        <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if rolling_stock.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'consists_pagination' page=data.previous_page_number %}#main-content" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
             <span class="page-link">Previous</span>
           </li>
           {% endif %}
-          {% for i in rolling_stock.paginator.page_range %}
+          {% for i in page_range %}
-            {% if rolling_stock.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
-              <span class="page-link">{{ i }}</span></span>
+              <span class="page-link">{{ i }}</span>
             </li>
             {% else %}
-            <li class="page-item"><a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ i }}#rolling-stock">{{ i }}</a></li>
+              {% 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 'consists_pagination' page=i %}#main-content">{{ i }}</a></li>
+              {% endif %}
             {% endif %}
           {% endfor %}
-          {% if rolling_stock.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.next_page_number }}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'consists_pagination' page=data.next_page_number %}#main-content" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/filter.html

@@ -0,0 +1,40 @@
+{% extends "cards.html" %}
+      {% block pagination %}
+      {% if data.has_other_pages %}
+      <nav aria-label="Page navigation example">
+        <ul class="pagination justify-content-center mt-4 mb-0">
+          {% if data.has_previous %}
+          <li class="page-item">
+            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=data.previous_page_number %}#main-content" tabindex="-1">Previous</a>
+          </li>
+          {% else %}
+          <li class="page-item disabled">
+            <span class="page-link">Previous</span>
+          </li>
+          {% endif %}
+          {% for i in page_range %}
+            {% if data.number == i %}
+            <li class="page-item active">
+              <span class="page-link">{{ i }}</span>
+            </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 '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_pagination' _filter=filter search=search page=data.next_page_number %}#main-content" tabindex="-1">Next</a>
+          </li>
+          {% else %}
+          <li class="page-item disabled">
+            <span class="page-link">Next</span>
+          </li>
+          {% endif %}
+        </ul>
+      </nav>
+      {% endif %}
+      {% endblock %}

ram/portal/templates/flatpages/flatpage.html

@@ -0,0 +1,17 @@
+{% extends 'base.html' %}
+
+        {% block header %}
+        <small class="text-muted">Updated {{ flatpage.updated_time | date:"M d, Y H:i" }}</small>
+        {% endblock %}
+        {% block extra_content %}
+        <section class="py-4 text-start container">
+          <div class="row">
+            <div class="mx-auto">
+              <div>{{ flatpage.content | safe }} </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:portal_flatpage_change' flatpage.pk %}">Edit</a>{% endif %}
+              </div>
+            </div>
+          </div>
+        </section>
+        {% endblock %}

ram/portal/templates/flatpages/flatpages_menu.html

@@ -0,0 +1,12 @@
+                {% if flatpages_menu %}
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle" href="#" id="flatpageDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    Articles
+                  </a>
+                  <ul class="dropdown-menu" aria-labelledby="flatpageDropdownMenuLink">
+                  {% for m in flatpages_menu %}
+                    <li><a class="dropdown-item" href="{{ m.get_absolute_url }}">{{ m.name }}</a></li>
+                  {% endfor %}
+                  </ul>
+                </li>
+                {% endif %}

ram/portal/templates/home.html

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

ram/portal/templates/includes/footer.html

@@ -1,20 +1,18 @@
-{% load markdown %}
-
   <footer class="text-muted py-4">
     <div class="container">
       <p class="float-end mb-1">
         <a href="#">Back to top</a>
       </p>
       <div id="footer" class="mb-1">
-          <p>&copy; {% now "Y" %}</p> {{ site_conf.footer | markdown | safe }}
+          <p>&copy; {% now "Y" %}</p> {{ site_conf.footer | safe }}
       </div>
       <div id="footer_extended" class="mb-0">
-        {{ site_conf.footer_extended | markdown | safe }}
+        {{ site_conf.footer_extended | safe }}
       </div>
     </div>
-    {% if site_conf.show_version %}
+
     <div class="container">
-      <p class="small text-muted">Version: {{ site_conf.version }}</p>
+        <p class="small text-muted">Made with ❤️ for 🚂 and <a href="https://github.com/daniviga/django-ram">django-ram</a>
+        {% if site_conf.show_version %}<br>Version {{ site_conf.version }}{% endif %}
     </div>
-    {% endif %}
   </footer>

ram/portal/templates/includes/header.html

@@ -0,0 +1,7 @@
+      <section class="py-4 text-center container">
+        <div class="row">
+          <div class="mx-auto">
+            {% block header_content %}{% endblock %}
+          </div>
+        </div>
+      </section>

ram/portal/templates/includes/login.html

@@ -1,20 +1,50 @@
-      {% if request.user.is_staff %}
+     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#loginNavbar" aria-controls="loginNavbar" aria-expanded="false" aria-label="Toggle navigation">
-      <div class="dropdown">
+     <span class="bi bi-person-fill-gear"></span>
-        <button class="btn btn-sm btn-outline-dark dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+     </button>
-          Welcome back, <strong>{{ request.user }}</strong>
+      <div class="collapse navbar-collapse justify-content-end" id="loginNavbar">
-        </button>
+        <ul class="navbar-nav">
-        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenu2">
+          <li class="nav-item dropdown">
-          <li><a class="dropdown-item" href="{% url 'admin:roster_rollingstock_changelist' %}">Rolling stock</a></li>
+            {% if request.user.is_staff %}
-          <li><a class="dropdown-item" href="{% url 'admin:consist_consist_changelist' %}">Consists</a></li>
+            <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownLogin" data-bs-toggle="dropdown" aria-expanded="false">
-          <li><a class="dropdown-item" href="{% url 'admin:app_list' 'metadata' %}">Metadata</a></li>
+              Welcome back, <strong>{{ request.user }}</strong>
-          <li><hr class="dropdown-divider"></li>
+            </a>
-          <li><a class="dropdown-item" href="{% url 'admin:index' %}">Admin</a></li>
+            <ul class="dropdown-menu" aria-labelledby="dropdownLogin">
-          <li><a class="dropdown-item" href="{% url 'admin:portal_siteconfiguration_changelist' %}">Site configuration</a></li>
+              <li><a class="dropdown-item" href="{% url 'admin:roster_rollingstock_changelist' %}">Rolling stock</a></li>
-          <li><a class="dropdown-item" href="{% url 'admin:driver_driverconfiguration_changelist' %}">DCC configuration</a></li>
+              <li><a class="dropdown-item" href="{% url 'admin:consist_consist_changelist' %}">Consists</a></li>
-          <li><hr class="dropdown-divider"></li>
+              <li><a class="dropdown-item" href="{% url 'admin:app_list' 'metadata' %}">Metadata</a></li>
-          <li><a class="dropdown-item text-danger" href="{% url 'admin:logout' %}?next={{ request.path }}">Logout</a></li>
+              <li><a class="dropdown-item" href="{% url 'admin:portal_flatpage_changelist' %}">Pages</a></li>
+              <li><a class="dropdown-item" href="{% url 'admin:app_list' 'bookshelf' %}">Bookshelf</a></li>
+              <li><hr class="dropdown-divider"></li>
+              <li><a class="dropdown-item" href="{% url 'admin:index' %}">Admin</a></li>
+              <li><a class="dropdown-item" href="{% url 'admin:portal_siteconfiguration_changelist' %}">Site configuration</a></li>
+              <li><hr class="dropdown-divider"></li>
+              <li><a class="dropdown-item text-danger" href="{% url 'admin:logout' %}?next={{ request.path }}">Logout</a></li>
+            </ul>
+            {% else %}
+            <a class="nav-link" href="{% url 'admin:login' %}?next={{ request.path }}">Log in</a>
+            {% endif %}
+          </li>
+          <li class="nav-item dropdown">
+            <a class="theme-icon-active nav-link dropdown-toggle" href="#" role="button" id="bd-theme" data-bs-toggle="dropdown" aria-expanded="false">
+              <i class="bi bi-circle-half"></i>
+            </a>
+            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme">
+              <li>
+                <button class="theme-icon dropdown-item" data-bs-theme-value="light" aria-pressed="false">
+                  <span class="me-2"><i class="bi bi-sun-fill"></i></span> Light
+                </button>
+              </li>
+              <li>
+                <button class="theme-icon dropdown-item" data-bs-theme-value="dark" aria-pressed="false">
+                  <span class="me-2"><i class="bi bi-moon-stars-fill"></i></span> Dark
+                </button>
+              </li>
+              <li>
+                <button class="theme-icon dropdown-item" data-bs-theme-value="auto" aria-pressed="false">
+                  <span class="me-2"><i class="bi bi-circle-half"></i></span> Auto
+                </button>
+              </li>
+            </ul>
+          </li>
         </ul>
       </div>
-      {% else %}
-      <a class="btn btn-sm btn-outline-dark" href="{% url 'admin:login' %}?next={{ request.path }}">Log in</a>
-      {% endif %}

ram/portal/templates/includes/search.html

@@ -1,5 +1,30 @@
-          <form class="d-flex" action="/portal/search" method="post">
+          <form class="d-flex needs-validation" action="{% url 'search' %}" method="post" novalidate>
-            <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search" name="search">
+            <div class="input-group has-validation">
-            <button class="btn btn-outline-primary" type="submit">Search</button>
+              <input class="form-control" type="search" list="datalistOptions" placeholder="Search" aria-label="Search" name="search" id="searchValidation" required>
+              <datalist id="datalistOptions">
+                <option value="company: ">
+                <option value="manufacturer: ">
+                <option value="scale: ">
+                <option value="type: ">
+              </datalist>
+              <button class="btn btn-outline-primary" type="submit">Search</button>
+            </div>
           </form>
-
+		  <script>
+          (function () {
+            'use strict'
+            // Fetch all the forms we want to apply custom Bootstrap validation styles to
+            var forms = document.querySelectorAll('.needs-validation')
+            // Loop over them and prevent submission
+            Array.prototype.slice.call(forms)
+              .forEach(function (form) {
+                form.addEventListener('submit', function (event) {
+                  if (!form.checkValidity()) {
+                    form.classList.add('was-validated')
+                    event.preventDefault()
+                    event.stopPropagation()
+                  }
+                }, false)
+              })
+          })()
+	      </script>