Update monitoring's README

.github/workflows/django.yml

@@ -25,11 +25,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-    - name: Run Migrations
-      run: |
-        cd ram
-        python manage.py migrate
     - name: Run Tests
       run: |
         cd ram
-        python manage.py test --verbosity=2
+        python manage.py migrate

.gitignore

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

AGENTS.md

@@ -1,341 +0,0 @@
-# Django Railroad Assets Manager - Agent Guidelines
-
-This document provides coding guidelines and command references for AI coding agents working on the Django-RAM project.
-
-## Project Overview
-
-Django Railroad Assets Manager (django-ram) is a Django 6.0+ application for managing model railroad collections with DCC++ EX integration. The project manages rolling stock, consists, metadata, books/magazines, and provides an optional REST API for DCC control.
-
-## Environment Setup
-
-### Python Requirements
-- Python 3.11+ (tested on 3.13, 3.14)
-- Django >= 6.0
-- Working directory: `ram/` (Django project root)
-- Virtual environment recommended: `python3 -m venv venv && source venv/bin/activate`
-
-### Installation
-```bash
-pip install -r requirements.txt           # Core dependencies
-pip install -r requirements-dev.txt       # Development tools
-cd ram && python manage.py migrate        # Initialize database
-python manage.py createsuperuser          # Create admin user
-```
-
-### Frontend Assets
-```bash
-npm install                               # Install clean-css-cli, terser
-```
-
-## Project Structure
-
-```
-ram/                      # Django project root
-├── ram/                 # Core settings, URLs, base models
-├── portal/              # Public-facing frontend (Bootstrap 5)
-├── roster/              # Rolling stock management (main app)
-├── metadata/            # Manufacturers, companies, scales, decoders
-├── bookshelf/           # Books and magazines
-├── consist/             # Train consists (multiple locomotives)
-├── repository/          # Document repository
-├── driver/              # DCC++ EX API gateway (optional, disabled by default)
-└── storage/             # Runtime data (SQLite DB, media, cache)
-```
-
-## Build/Lint/Test Commands
-
-### Running the Development Server
-```bash
-cd ram
-python manage.py runserver                # Runs on http://localhost:8000
-```
-
-### Database Management
-```bash
-python manage.py makemigrations           # Create new migrations
-python manage.py migrate                  # Apply migrations
-python manage.py showmigrations           # Show migration status
-```
-
-### Testing
-```bash
-# Run all tests (comprehensive test suite with 75+ tests)
-python manage.py test
-
-# Run tests for a specific app
-python manage.py test roster                  # Rolling stock tests
-python manage.py test metadata                # Metadata tests  
-python manage.py test bookshelf               # Books/magazines tests
-python manage.py test consist                 # Consist tests
-
-# Run a specific test case class
-python manage.py test roster.tests.RollingStockTestCase
-python manage.py test metadata.tests.ScaleTestCase
-
-# Run a single test method
-python manage.py test roster.tests.RollingStockTestCase.test_road_number_int_extraction
-python manage.py test bookshelf.tests.TocEntryTestCase.test_toc_entry_page_validation_exceeds_book
-
-# Run with verbosity for detailed output
-python manage.py test --verbosity=2
-
-# Keep test database for inspection
-python manage.py test --keepdb
-
-# Run tests matching a pattern
-python manage.py test --pattern="test_*.py"
-```
-
-### Linting and Formatting
-```bash
-# Run flake8 (configured in requirements-dev.txt)
-flake8 .                                  # Lint entire project
-flake8 roster/                            # Lint specific app
-flake8 roster/models.py                   # Lint specific file
-
-# Note: No .flake8 config exists; uses PEP 8 defaults
-# Long lines use # noqa: E501 comments in settings.py
-
-# Run black formatter with 79 character line length
-black -l 79 .                             # Format entire project
-black -l 79 roster/                       # Format specific app
-black -l 79 roster/models.py              # Format specific file
-black -l 79 --check .                     # Check formatting without changes
-black -l 79 --diff .                      # Show formatting changes
-```
-
-### Admin Commands
-```bash
-python manage.py createsuperuser          # Create admin user
-python manage.py purge_cache              # Custom: purge cache
-python manage.py loaddata <fixture>       # Load sample data
-```
-
-### Debugging & Profiling
-```bash
-# Use pdbpp for debugging (installed via requirements-dev.txt)
-import pdb; pdb.set_trace()               # Set breakpoint in code
-
-# Use pyinstrument for profiling
-python manage.py runserver --noreload     # With pyinstrument middleware
-```
-
-## Code Style Guidelines
-
-### General Python Style
-- **PEP 8 compliant** - Follow standard Python style guide
-- **Line length**: 79 characters preferred; 119 acceptable for complex lines
-- **Long lines**: Use `# noqa: E501` comment when necessary (see settings.py)
-- **Indentation**: 4 spaces (no tabs)
-- **Encoding**: UTF-8
-- **Blank lines**: Must not contain any whitespace (spaces or tabs)
-
-### Import Organization
-Follow Django's import style (as seen in models.py, views.py, admin.py):
-
-```python
-# 1. Standard library imports
-import os
-import re
-from itertools import chain
-from functools import reduce
-
-# 2. Related third-party imports
-from django.db import models
-from django.conf import settings
-from django.contrib import admin
-from tinymce import models as tinymce
-
-# 3. Local application imports
-from ram.models import BaseModel, Image
-from ram.utils import DeduplicatedStorage, slugify
-from metadata.models import Scale, Manufacturer
-```
-
-**Key points:**
-- Group imports by category with blank lines between
-- Use `from module import specific` for commonly used items
-- Avoid `import *`
-- Use `as` for aliasing when needed (e.g., `tinymce.models as tinymce`)
-
-### Naming Conventions
-- **Classes**: `PascalCase` (e.g., `RollingStock`, `BaseModel`)
-- **Functions/methods**: `snake_case` (e.g., `get_items_per_page()`, `image_thumbnail()`)
-- **Variables**: `snake_case` (e.g., `road_number`, `item_number_slug`)
-- **Constants**: `UPPER_SNAKE_CASE` (e.g., `BASE_DIR`, `ALLOWED_HOSTS`)
-- **Private methods**: Prefix with `_` (e.g., `_internal_method()`)
-- **Model Meta options**: Use `verbose_name`, `verbose_name_plural`, `ordering`
-
-### Django Model Patterns
-
-```python
-class MyModel(BaseModel):  # Inherit from BaseModel for common fields
-    # Field order: relationships first, then data fields, then metadata
-    foreign_key = models.ForeignKey(OtherModel, on_delete=models.CASCADE)
-    name = models.CharField(max_length=128)
-    slug = models.SlugField(max_length=128, unique=True)
-    created = models.DateTimeField(auto_now_add=True)
-    
-    class Meta:
-        ordering = ["name"]
-        verbose_name = "My Model"
-        verbose_name_plural = "My Models"
-    
-    def __str__(self):
-        return self.name
-    
-    @property
-    def computed_field(self):
-        """Document properties with docstrings."""
-        return self.calculate_something()
-```
-
-**Model field conventions:**
-- Use `null=True, blank=True` for optional fields
-- Use `help_text` for user-facing field descriptions
-- Use `limit_choices_to` for filtered ForeignKey choices
-- Use `related_name` for reverse relations
-- Set `on_delete=models.CASCADE` explicitly
-- Use `default=None` with `null=True` for nullable fields
-
-### Admin Customization
-
-```python
-@admin.register(MyModel)
-class MyModelAdmin(admin.ModelAdmin):
-    list_display = ("name", "created", "custom_method")
-    list_filter = ("category", "created")
-    search_fields = ("name", "slug")
-    autocomplete_fields = ("foreign_key",)
-    readonly_fields = ("created", "updated")
-    save_as = True  # Enable "Save as new" button
-    
-    @admin.display(description="Custom Display")
-    def custom_method(self, obj):
-        return format_html('<strong>{}</strong>', obj.name)
-```
-
-### Error Handling
-```python
-# Use Django's exception classes
-from django.core.exceptions import ValidationError, ObjectDoesNotExist
-from django.http import Http404
-from django.db.utils import OperationalError, ProgrammingError
-
-# Handle database errors gracefully
-try:
-    config = get_site_conf()
-except (OperationalError, ProgrammingError):
-    config = default_config  # Provide fallback
-```
-
-### Type Hints
-- **Not currently used** in this project
-- Follow existing patterns without type hints unless explicitly adding them
-
-## Django-Specific Patterns
-
-### Using BaseModel
-All major models inherit from `ram.models.BaseModel`:
-```python
-from ram.models import BaseModel
-
-class MyModel(BaseModel):
-    # Automatically includes: uuid, description, notes, creation_time, 
-    # updated_time, published, obj_type, obj_label properties
-    pass
-```
-
-### Using PublicManager
-Models use `PublicManager` for filtering published items:
-```python
-from ram.managers import PublicManager
-
-objects = PublicManager()  # Only returns items where published=True
-```
-
-### Image and Document Patterns
-```python
-from ram.models import Image, Document, PrivateDocument
-
-class MyImage(Image):
-    my_model = models.ForeignKey(MyModel, on_delete=models.CASCADE)
-    # Inherits: order, image, image_thumbnail()
-
-class MyDocument(PrivateDocument):
-    my_model = models.ForeignKey(MyModel, on_delete=models.CASCADE)
-    # Inherits: description, file, private, creation_time, updated_time
-```
-
-### Using DeduplicatedStorage
-For media files that should be deduplicated:
-```python
-from ram.utils import DeduplicatedStorage
-
-image = models.ImageField(upload_to="images/", storage=DeduplicatedStorage)
-```
-
-## Testing Practices
-
-### Test Coverage
-The project has comprehensive test coverage:
-- **roster/tests.py**: RollingStock, RollingClass models (~340 lines, 19+ tests)
-- **metadata/tests.py**: Scale, Manufacturer, Company, etc. (~378 lines, 29+ tests)
-- **bookshelf/tests.py**: Book, Magazine, Catalog, TocEntry (~436 lines, 25+ tests)
-- **consist/tests.py**: Consist, ConsistItem (~315 lines, 15+ tests)
-- **ram/tests.py**: BaseModel, utility functions (~140 lines, 11+ tests)
-
-### Writing Tests
-```python
-from django.test import TestCase
-from django.core.exceptions import ValidationError
-from roster.models import RollingStock
-
-class RollingStockTestCase(TestCase):
-    def setUp(self):
-        """Set up test data."""
-        # Create necessary related objects
-        self.company = Company.objects.create(name="RGS", country="US")
-        self.scale = Scale.objects.create(scale="HO", ratio="1:87", tracks=16.5)
-        # ...
-    
-    def test_road_number_int_extraction(self):
-        """Test automatic extraction of integer from road number."""
-        stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="RGS-42",
-            scale=self.scale,
-        )
-        self.assertEqual(stock.road_number_int, 42)
-    
-    def test_validation_error(self):
-        """Test that validation errors are raised correctly."""
-        with self.assertRaises(ValidationError):
-            # Test validation logic
-            pass
-```
-
-**Testing best practices:**
-- Use descriptive test method names with `test_` prefix
-- Include docstrings explaining what each test verifies
-- Create necessary test data in `setUp()` method
-- Test both success and failure cases
-- Use `assertRaises()` for exception testing
-- Test model properties, methods, and validation logic
-
-## Git & Version Control
-
-- Branch: `master` (main development branch)
-- CI runs on push and PR to master
-- Follow conventional commit messages
-- No pre-commit hooks configured (consider adding)
-
-## Additional Notes
-
-- **Settings override**: Use `ram/local_settings.py` for local configuration
-- **Debug mode**: `DEBUG = True` in settings.py (change for production)
-- **Database**: SQLite by default (in `storage/db.sqlite3`)
-- **Static files**: Bootstrap 5.3.8, Bootstrap Icons 1.13.1
-- **Rich text**: TinyMCE for HTMLField content
-- **REST API**: Disabled by default (`REST_ENABLED = False`)
-- **Security**: CSP middleware enabled, secure cookies in production

Makefile

@@ -1,141 +0,0 @@
-# Makefile for Django RAM project
-# Handles frontend asset minification and common development tasks
-
-.PHONY: help minify minify-js minify-css clean install test
-
-# Directories
-JS_SRC_DIR = ram/portal/static/js/src
-JS_OUT_DIR = ram/portal/static/js
-CSS_SRC_DIR = ram/portal/static/css/src
-CSS_OUT_DIR = ram/portal/static/css
-
-# Source files
-JS_SOURCES = $(JS_SRC_DIR)/theme_selector.js $(JS_SRC_DIR)/tabs_selector.js $(JS_SRC_DIR)/validators.js
-
-CSS_SOURCES = $(CSS_SRC_DIR)/main.css
-
-# Output files
-JS_OUTPUT = $(JS_OUT_DIR)/main.min.js
-CSS_OUTPUT = $(CSS_OUT_DIR)/main.min.css
-
-# Default target
-help:
-	@echo "Django RAM - Available Make targets:"
-	@echo ""
-	@echo "  make install     - Install npm dependencies (terser, clean-css-cli)"
-	@echo "  make minify      - Minify both JS and CSS files"
-	@echo "  make minify-js   - Minify JavaScript files only"
-	@echo "  make minify-css  - Minify CSS files only"
-	@echo "  make clean       - Remove minified files"
-	@echo "  make watch       - Watch for changes and auto-minify (requires inotify-tools)"
-	@echo "  make run         - Run Django development server"
-	@echo "  make test        - Run Django test suite"
-	@echo "  make lint        - Run flake8 linter"
-	@echo "  make format      - Run black formatter (line length 79)"
-	@echo "  make ruff-check  - Run ruff linter"
-	@echo "  make ruff-format - Run ruff formatter"
-	@echo "  make dump-data   - Dump database to gzipped JSON (usage: make dump-data FILE=backup.json.gz)"
-	@echo "  make load-data   - Load data from fixture file (usage: make load-data FILE=backup.json.gz)"
-	@echo "  make help        - Show this help message"
-	@echo ""
-
-# Install npm dependencies
-install:
-	@echo "Installing npm dependencies..."
-	npm install
-	@echo "Done! terser and clean-css-cli installed."
-
-# Minify both JS and CSS
-minify: minify-js minify-css
-
-# Minify JavaScript
-minify-js: $(JS_OUTPUT)
-
-$(JS_OUTPUT): $(JS_SOURCES)
-	@echo "Minifying JavaScript..."
-	npx terser $(JS_SOURCES) \
-		--compress \
-		--mangle \
-		--source-map "url=main.min.js.map" \
-		--output $(JS_OUTPUT)
-	@echo "Created: $(JS_OUTPUT)"
-
-# Minify CSS
-minify-css: $(CSS_OUTPUT)
-
-$(CSS_OUTPUT): $(CSS_SOURCES)
-	@echo "Minifying CSS..."
-	npx cleancss -o $(CSS_OUTPUT) $(CSS_SOURCES)
-	@echo "Created: $(CSS_OUTPUT)"
-
-# Clean minified files
-clean:
-	@echo "Removing minified files..."
-	rm -f $(JS_OUTPUT) $(CSS_OUTPUT)
-	@echo "Clean complete."
-
-# Watch for changes (requires inotify-tools on Linux)
-watch:
-	@echo "Watching for file changes..."
-	@echo "Press Ctrl+C to stop"
-	@while true; do \
-		inotifywait -e modify,create $(JS_SRC_DIR)/*.js $(CSS_SRC_DIR)/*.css 2>/dev/null && \
-		make minify; \
-	done || echo "Note: install inotify-tools for file watching support"
-
-# Run Django development server
-run:
-	@cd ram && python manage.py runserver
-
-# Run Django tests
-test:
-	@echo "Running Django tests..."
-	@cd ram && python manage.py test
-
-# Run flake8 linter
-lint:
-	@echo "Running flake8..."
-	@flake8 ram/
-
-# Run black formatter
-format:
-	@echo "Running black formatter..."
-	@black -l 79 --extend-exclude="/migrations/" ram/
-
-# Run ruff linter
-ruff-check:
-	@echo "Running ruff check..."
-	@ruff check ram/
-
-# Run ruff formatter
-ruff-format:
-	@echo "Running ruff format..."
-	@ruff format ram/
-
-# Dump database to gzipped JSON file
-# Usage: make dump-data FILE=backup.json.gz
-dump-data:
-ifndef FILE
-	$(error FILE is not set. Usage: make dump-data FILE=backup.json.gz)
-endif
-	$(eval FILE_ABS := $(shell realpath -m $(FILE)))
-	@echo "Dumping database to $(FILE_ABS)..."
-	@cd ram && python manage.py dumpdata \
-		--indent=2 \
-		-e admin \
-		-e contenttypes \
-		-e sessions \
-		--natural-foreign \
-		--natural-primary | gzip > $(FILE_ABS)
-	@echo "✓ Database dumped successfully to $(FILE_ABS)"
-
-# Load data from fixture file
-# Usage: make load-data FILE=backup.json.gz
-load-data:
-ifndef FILE
-	$(error FILE is not set. Usage: make load-data FILE=backup.json.gz)
-endif
-	$(eval FILE_ABS := $(shell realpath $(FILE)))
-	@echo "Loading data from $(FILE_ABS)..."
-	@cd ram && python manage.py loaddata $(FILE_ABS)
-	@echo "✓ Data loaded successfully from $(FILE_ABS)"

connector/99-dcc-usb-connector.rules

@@ -1,22 +0,0 @@
-# Udev rule to auto-start/stop dcc-usb-connector.service when USB device is connected/removed
-#
-# This rule detects when a CH340 USB-to-serial adapter (ID 1a86:7523)
-# is connected/removed on /dev/ttyUSB0, then automatically starts/stops
-# the dcc-usb-connector.service (user systemd service).
-#
-# Installation:
-#   sudo cp 99-dcc-usb-connector.rules /etc/udev/rules.d/
-#   sudo udevadm control --reload-rules
-#   sudo udevadm trigger --subsystem-match=tty
-#
-# Testing:
-#   udevadm test /sys/class/tty/ttyUSB0
-#   udevadm monitor --property --subsystem-match=tty
-#
-# The service will be started when the device is plugged in and stopped
-# when the device is unplugged.
-
-# Match USB device 1a86:7523 on ttyUSB0
-# TAG+="systemd" tells systemd to track this device
-# ENV{SYSTEMD_USER_WANTS} starts the service on "add" and stops it on "remove"
-SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", KERNEL=="ttyUSB0", TAG+="systemd", ENV{SYSTEMD_USER_WANTS}="dcc-usb-connector.service"

connector/INSTALL.md

@@ -1,345 +0,0 @@
-# DCC USB-to-Network Bridge Auto-Start Installation
-
-This directory contains configuration files to automatically start the `dcc-usb-connector.service` when a specific USB device (CH340 USB-to-serial adapter, ID `1a86:7523`) is connected to `/dev/ttyUSB0`.
-
-## Overview
-
-The setup uses:
-- **Udev rule** (`99-dcc-usb-connector.rules`) - Detects USB device connection/disconnection
-- **Systemd user service** (`dcc-usb-connector.service`) - Bridges serial port to network port 2560
-- **Installation script** (`install-udev-rule.sh`) - Automated installation helper
-
-When the USB device is plugged in, the service automatically starts. When unplugged, it stops.
-
-## Prerequisites
-
-1. **Operating System**: Linux with systemd and udev
-2. **Required packages**:
-   ```bash
-   sudo dnf install nmap-ncat systemd udev
-   ```
-3. **User permissions**: Your user should be in the `dialout` group:
-   ```bash
-   sudo usermod -a -G dialout $USER
-   # Log out and log back in for changes to take effect
-   ```
-
-## Quick Installation
-
-Run the installation script:
-
-```bash
-./install-udev-rule.sh
-```
-
-This script will:
-- Install the udev rule (requires sudo)
-- Install the systemd user service to `~/.config/systemd/user/`
-- Enable systemd lingering for your user
-- Check for required tools and permissions
-- Provide testing instructions
-
-## Manual Installation
-
-If you prefer to install manually:
-
-### 1. Install the udev rule
-
-```bash
-sudo cp 99-dcc-usb-connector.rules /etc/udev/rules.d/
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-```
-
-### 2. Install the systemd service
-
-```bash
-mkdir -p ~/.config/systemd/user/
-cp dcc-usb-connector.service ~/.config/systemd/user/
-systemctl --user daemon-reload
-```
-
-### 3. Enable lingering (optional but recommended)
-
-This allows your user services to run even when you're not logged in:
-
-```bash
-sudo loginctl enable-linger $USER
-```
-
-## Verification
-
-### Test the udev rule
-
-```bash
-# Monitor udev events (plug/unplug device while this runs)
-udevadm monitor --property --subsystem-match=tty
-
-# Test udev rule (when device is connected)
-udevadm test /sys/class/tty/ttyUSB0
-```
-
-### Check service status
-
-```bash
-# Check if service is running
-systemctl --user status dcc-usb-connector.service
-
-# View service logs
-journalctl --user -u dcc-usb-connector.service -f
-```
-
-### Test the network bridge
-
-```bash
-# Connect to the bridge
-telnet localhost 2560
-
-# Or using netcat
-nc localhost 2560
-```
-
-## Usage
-
-### Automatic Operation
-
-Once installed, the service will:
-- **Start automatically** when USB device `1a86:7523` is connected to `/dev/ttyUSB0`
-- **Stop automatically** when the device is disconnected
-- Bridge serial communication to network port `2560`
-
-### Manual Control
-
-You can still manually control the service:
-
-```bash
-# Start the service
-systemctl --user start dcc-usb-connector.service
-
-# Stop the service
-systemctl --user stop dcc-usb-connector.service
-
-# Check status
-systemctl --user status dcc-usb-connector.service
-
-# View logs
-journalctl --user -u dcc-usb-connector.service
-```
-
-## How It Works
-
-### Component Interaction
-
-```
-USB Device Connected (1a86:7523 on /dev/ttyUSB0)
-         ↓
-    Udev Rule Triggered
-         ↓
-    Systemd User Service Started
-         ↓
-    stty configures serial port (115200 baud)
-         ↓
-    ncat bridges /dev/ttyUSB0 ↔ TCP port 2560
-         ↓
-    Client apps connect to localhost:2560
-```
-
-### Udev Rule Details
-
-The udev rule (`99-dcc-usb-connector.rules`) matches:
-- **Subsystem**: `tty` (TTY/serial devices)
-- **Vendor ID**: `1a86` (CH340 manufacturer)
-- **Product ID**: `7523` (CH340 serial adapter)
-- **Kernel device**: `ttyUSB0` (specific port)
-
-When matched, it sets `ENV{SYSTEMD_USER_WANTS}="dcc-usb-connector.service"`, telling systemd to start the service.
-
-### Service Configuration
-
-The service (`dcc-usb-connector.service`):
-1. Runs `stty -F /dev/ttyUSB0 -echo 115200` to configure the serial port
-2. Executes `ncat -n -k -l 2560 </dev/ttyUSB0 >/dev/ttyUSB0` to bridge serial ↔ network
-3. Uses `KillMode=mixed` for proper process cleanup
-4. Terminates within 5 seconds when stopped
-5. **Uses `StopWhenUnneeded=yes`** - This ensures the service stops when the device is removed
-
-### Auto-Stop Mechanism
-
-When the USB device is unplugged:
-1. **Udev detects** the removal event
-2. **Systemd removes** the device dependency from the service
-3. **StopWhenUnneeded=yes** tells systemd to automatically stop the service when no longer needed
-4. **Service terminates** gracefully within 5 seconds
-
-This combination ensures clean automatic stop without requiring manual intervention or custom scripts.
-
-## Troubleshooting
-
-### Service doesn't start automatically
-
-1. **Check udev rule is loaded**:
-   ```bash
-   udevadm test /sys/class/tty/ttyUSB0 | grep SYSTEMD_USER_WANTS
-   ```
-   Should show: `ENV{SYSTEMD_USER_WANTS}='dcc-usb-connector.service'`
-
-2. **Check device is recognized**:
-   ```bash
-   lsusb | grep 1a86:7523
-   ls -l /dev/ttyUSB0
-   ```
-
-3. **Verify systemd user instance is running**:
-   ```bash
-   systemctl --user status
-   loginctl show-user $USER | grep Linger
-   ```
-
-### Permission denied on /dev/ttyUSB0
-
-Add your user to the `dialout` group:
-```bash
-sudo usermod -a -G dialout $USER
-# Log out and log back in
-groups  # Verify 'dialout' appears
-```
-
-### Device appears as /dev/ttyUSB1 instead of /dev/ttyUSB0
-
-The udev rule specifically matches `ttyUSB0`. To make it flexible:
-
-Edit `99-dcc-usb-connector.rules` and change:
-```
-KERNEL=="ttyUSB0"
-```
-to:
-```
-KERNEL=="ttyUSB[0-9]*"
-```
-
-Then reload:
-```bash
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-```
-
-### Service starts but ncat fails
-
-1. **Check ncat is installed**:
-   ```bash
-   which ncat
-   ncat --version
-   ```
-
-2. **Verify serial port works**:
-   ```bash
-   stty -F /dev/ttyUSB0
-   cat /dev/ttyUSB0  # Should not error
-   ```
-
-3. **Check port 2560 is available**:
-   ```bash
-   netstat -tuln | grep 2560
-   # Should be empty if nothing is listening
-   ```
-
-### View detailed logs
-
-```bash
-# Follow service logs in real-time
-journalctl --user -u dcc-usb-connector.service -f
-
-# View all logs for the service
-journalctl --user -u dcc-usb-connector.service
-
-# View with timestamps
-journalctl --user -u dcc-usb-connector.service -o short-iso
-```
-
-## Uninstallation
-
-To remove the auto-start feature:
-
-```bash
-# Remove udev rule
-sudo rm /etc/udev/rules.d/99-dcc-usb-connector.rules
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-
-# Remove systemd service
-systemctl --user stop dcc-usb-connector.service
-rm ~/.config/systemd/user/dcc-usb-connector.service
-systemctl --user daemon-reload
-
-# (Optional) Disable lingering
-sudo loginctl disable-linger $USER
-```
-
-## Advanced Configuration
-
-### Customize for different USB device
-
-Edit `99-dcc-usb-connector.rules` and change:
-- `ATTRS{idVendor}=="1a86"` - USB vendor ID
-- `ATTRS{idProduct}=="7523"` - USB product ID
-
-Find your device IDs with:
-```bash
-lsusb
-# Output: Bus 001 Device 003: ID 1a86:7523 QinHeng Electronics ...
-#                                   ^^^^:^^^^
-#                                   VID   PID
-```
-
-### Change network port
-
-Edit `dcc-usb-connector.service` and change:
-```
-ExecStart=/usr/bin/bash -c "/usr/bin/ncat -n -k -l 2560 ...
-```
-Replace `2560` with your desired port number.
-
-### Enable auto-restart on failure
-
-Edit `dcc-usb-connector.service` and add under `[Service]`:
-```
-Restart=on-failure
-RestartSec=5
-```
-
-Then reload:
-```bash
-systemctl --user daemon-reload
-```
-
-## Testing Without Physical Device
-
-For development/testing without the actual USB device:
-
-```bash
-# Create a virtual serial port pair
-socat -d -d pty,raw,echo=0 pty,raw,echo=0
-
-# This creates two linked devices, e.g., /dev/pts/3 and /dev/pts/4
-# Update the service to use one of these instead of /dev/ttyUSB0
-```
-
-## References
-
-- [systemd user services](https://www.freedesktop.org/software/systemd/man/systemd.service.html)
-- [udev rules writing](https://www.reactivated.net/writing_udev_rules.html)
-- [ncat documentation](https://nmap.org/ncat/)
-- [DCC++ EX](https://dcc-ex.com/) - The DCC command station software
-
-## License
-
-See the main project LICENSE file.
-
-## Support
-
-For issues specific to the auto-start feature:
-1. Check the troubleshooting section above
-2. Review logs: `journalctl --user -u dcc-usb-connector.service`
-3. Test udev rules: `udevadm test /sys/class/tty/ttyUSB0`
-
-For DCC++ EX or django-ram issues, see the main project documentation.

connector/README.md

@@ -1,53 +1,17 @@
-# DCC Serial-to-Network Bridge
+# Use a container to implement a serial to net bridge
 
-This directory provides two ways to bridge a serial port to a network port using `ncat` from [nmap](https://nmap.org/ncat/):
+This uses `ncat` from [nmap](https://nmap.org/ncat/) to bridge a serial port to a network port. The serial port is passed to the Podman command (eg. `/dev/ttyACM0`) and the network port is `2560`.
-
-1. **Auto-Start with systemd + udev** (Recommended) - Automatically starts/stops when USB device is plugged/unplugged
-2. **Container-based** - Manual control using Podman/Docker
 
 > [!IMPORTANT]
 > Other variants of `nc` or `ncat` may not work as expected.
 
-## Option 1: Auto-Start with systemd + udev (Recommended)
+## Build and run the container
-
-Automatically start the bridge when USB device `1a86:7523` is connected to `/dev/ttyUSB0` and stop it when removed.
-
-### Quick Install
 
 ```bash
-./install-udev-rule.sh
+$ podman buil -t dcc/bridge .
-```
-
-### Features
-- ✅ Auto-start when device connected
-- ✅ Auto-stop when device removed
-- ✅ User-level service (no root needed)
-- ✅ Runs on boot (with lingering enabled)
-
-See [INSTALL.md](INSTALL.md) for detailed documentation.
-
-### Test
-
-```bash
-# Run the test script
-./test-udev-autostart.sh
-
-# Or manually check
-systemctl --user status dcc-usb-connector.service
-telnet localhost 2560
-```
-
-## Option 2: Container-based (Manual)
-
-### Build and run the container
-
-```bash
-$ podman build -t dcc/bridge .
 $ podman run -d --group-add keep-groups --device=/dev/ttyACM0:/dev/arduino -p 2560:2560 --name dcc-bridge dcc/bridge
 ```
 
-### Test
-
 It can be tested with `telnet`:
 
 ```bash

connector/dcc-usb-connector.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=DCC USB-to-Network Bridge Daemon
-After=network.target
-# Device will be available via udev rule, but add condition as safety check
-ConditionPathIsReadWrite=/dev/ttyUSB0
-# Stop this service when the device is no longer needed (removed)
-StopWhenUnneeded=yes
-
-[Service]
-ExecStartPre=/usr/bin/stty -F /dev/ttyUSB0 -echo 115200
-ExecStart=/usr/bin/bash -c "/usr/bin/ncat -n -k -l 2560 </dev/ttyUSB0 >/dev/ttyUSB0"
-KillMode=mixed
-TimeoutStopSec=5
-PrivateTmp=true
-
-[Install]
-WantedBy=default.target

connector/install-udev-rule.sh

@@ -1,127 +0,0 @@
-#!/usr/bin/env bash
-#
-# Installation script for DCC USB-to-Network Bridge auto-start
-#
-# This script installs the udev rule and systemd service to automatically
-# start the dcc-usb-connector.service when USB device 1a86:7523 is connected.
-#
-# Usage:
-#   ./install-udev-rule.sh
-#
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# Get the directory where this script is located
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-echo -e "${GREEN}DCC USB-to-Network Bridge Auto-Start Installation${NC}"
-echo "=========================================================="
-echo
-
-# Check if running as root (not recommended for systemd user service)
-if [ "$EUID" -eq 0 ]; then
-    echo -e "${YELLOW}Warning: You are running as root.${NC}"
-    echo "This script will install a user systemd service."
-    echo "Please run as a regular user (not with sudo)."
-    echo
-    read -p "Continue anyway? (y/N) " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-        exit 1
-    fi
-fi
-
-# Check for required files
-echo "Checking required files..."
-if [ ! -f "$SCRIPT_DIR/99-dcc-usb-connector.rules" ]; then
-    echo -e "${RED}Error: 99-dcc-usb-connector.rules not found${NC}"
-    exit 1
-fi
-if [ ! -f "$SCRIPT_DIR/dcc-usb-connector.service" ]; then
-    echo -e "${RED}Error: dcc-usb-connector.service not found${NC}"
-    exit 1
-fi
-echo -e "${GREEN}✓ All required files found${NC}"
-echo
-
-# Install udev rule (requires sudo)
-echo "Installing udev rule..."
-echo "This requires sudo privileges."
-sudo cp "$SCRIPT_DIR/99-dcc-usb-connector.rules" /etc/udev/rules.d/
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-echo -e "${GREEN}✓ Udev rule installed${NC}"
-echo
-
-# Install systemd user service
-echo "Installing systemd user service..."
-mkdir -p ~/.config/systemd/user/
-cp "$SCRIPT_DIR/dcc-usb-connector.service" ~/.config/systemd/user/
-systemctl --user daemon-reload
-echo -e "${GREEN}✓ Systemd service installed${NC}"
-echo
-
-# Enable lingering (allows user services to run without being logged in)
-echo "Enabling systemd lingering for user..."
-if loginctl show-user "$USER" | grep -q "Linger=yes"; then
-    echo -e "${GREEN}✓ Lingering already enabled${NC}"
-else
-    sudo loginctl enable-linger "$USER"
-    echo -e "${GREEN}✓ Lingering enabled${NC}"
-fi
-echo
-
-# Check user groups
-echo "Checking user permissions..."
-if groups "$USER" | grep -q '\bdialout\b'; then
-    echo -e "${GREEN}✓ User is in 'dialout' group${NC}"
-else
-    echo -e "${YELLOW}Warning: User is not in 'dialout' group${NC}"
-    echo "You may need to add yourself to the dialout group:"
-    echo "  sudo usermod -a -G dialout $USER"
-    echo "Then log out and log back in for changes to take effect."
-fi
-echo
-
-# Check for ncat
-echo "Checking for required tools..."
-if command -v ncat &> /dev/null; then
-    echo -e "${GREEN}✓ ncat is installed${NC}"
-else
-    echo -e "${YELLOW}Warning: ncat is not installed${NC}"
-    echo "Install it with: sudo dnf install nmap-ncat"
-fi
-echo
-
-# Summary
-echo "=========================================================="
-echo -e "${GREEN}Installation complete!${NC}"
-echo
-echo "The service will automatically start when USB device 1a86:7523"
-echo "is connected to /dev/ttyUSB0"
-echo
-echo "To test:"
-echo "  1. Plug in the USB device"
-echo "  2. Check service status: systemctl --user status dcc-usb-connector.service"
-echo "  3. Test connection: telnet localhost 2560"
-echo
-echo "To manually control:"
-echo "  Start:  systemctl --user start dcc-usb-connector.service"
-echo "  Stop:   systemctl --user stop dcc-usb-connector.service"
-echo "  Status: systemctl --user status dcc-usb-connector.service"
-echo
-echo "To view logs:"
-echo "  journalctl --user -u dcc-usb-connector.service -f"
-echo
-echo "To uninstall:"
-echo "  sudo rm /etc/udev/rules.d/99-dcc-usb-connector.rules"
-echo "  rm ~/.config/systemd/user/dcc-usb-connector.service"
-echo "  systemctl --user daemon-reload"
-echo "  sudo udevadm control --reload-rules"
-echo

connector/test-udev-autostart.sh

@@ -1,147 +0,0 @@
-#!/usr/bin/env bash
-#
-# Test script for DCC USB-to-Network Bridge auto-start/stop functionality
-#
-# This script helps verify that the service starts when the USB device
-# is connected and stops when it's removed.
-#
-# Usage:
-#   ./test-udev-autostart.sh
-#
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-echo -e "${BLUE}=== DCC USB-to-Network Bridge Auto-Start/Stop Test ===${NC}"
-echo
-
-# Check if udev rule is installed
-echo -e "${BLUE}1. Checking udev rule installation...${NC}"
-if [ -f /etc/udev/rules.d/99-dcc-usb-connector.rules ]; then
-    echo -e "${GREEN}✓ Udev rule is installed${NC}"
-    echo "   Location: /etc/udev/rules.d/99-dcc-usb-connector.rules"
-else
-    echo -e "${RED}✗ Udev rule is NOT installed${NC}"
-    echo "   Run: sudo cp 99-dcc-usb-connector.rules /etc/udev/rules.d/"
-    exit 1
-fi
-echo
-
-# Check if service is installed
-echo -e "${BLUE}2. Checking systemd service installation...${NC}"
-if [ -f ~/.config/systemd/user/dcc-usb-connector.service ]; then
-    echo -e "${GREEN}✓ Systemd service is installed${NC}"
-    echo "   Location: ~/.config/systemd/user/dcc-usb-connector.service"
-else
-    echo -e "${RED}✗ Systemd service is NOT installed${NC}"
-    echo "   Run: cp dcc-usb-connector.service ~/.config/systemd/user/"
-    exit 1
-fi
-echo
-
-# Check lingering
-echo -e "${BLUE}3. Checking systemd lingering...${NC}"
-if loginctl show-user "$USER" | grep -q "Linger=yes"; then
-    echo -e "${GREEN}✓ Lingering is enabled${NC}"
-else
-    echo -e "${YELLOW}⚠ Lingering is NOT enabled${NC}"
-    echo "   Services may not start automatically when you're not logged in"
-    echo "   Run: sudo loginctl enable-linger $USER"
-fi
-echo
-
-# Check if device is connected
-echo -e "${BLUE}4. Checking USB device...${NC}"
-if lsusb | grep -q "1a86:7523"; then
-    echo -e "${GREEN}✓ USB device 1a86:7523 is connected${NC}"
-    lsusb | grep "1a86:7523"
-    
-    if [ -e /dev/ttyUSB0 ]; then
-        echo -e "${GREEN}✓ /dev/ttyUSB0 exists${NC}"
-        ls -l /dev/ttyUSB0
-    else
-        echo -e "${YELLOW}⚠ /dev/ttyUSB0 does NOT exist${NC}"
-        echo "   The device may be on a different port"
-        echo "   Available ttyUSB devices:"
-        ls -l /dev/ttyUSB* 2>/dev/null || echo "   (none found)"
-    fi
-else
-    echo -e "${YELLOW}⚠ USB device 1a86:7523 is NOT connected${NC}"
-    echo "   Please plug in the device to test"
-fi
-echo
-
-# Check service status
-echo -e "${BLUE}5. Checking service status...${NC}"
-if systemctl --user is-active --quiet dcc-usb-connector.service; then
-    echo -e "${GREEN}✓ Service is RUNNING${NC}"
-    systemctl --user status dcc-usb-connector.service --no-pager -l
-else
-    echo -e "${YELLOW}⚠ Service is NOT running${NC}"
-    echo "   Status:"
-    systemctl --user status dcc-usb-connector.service --no-pager -l || true
-fi
-echo
-
-# Test udev rule
-echo -e "${BLUE}6. Testing udev rule (if device is connected)...${NC}"
-if [ -e /dev/ttyUSB0 ]; then
-    echo "   Running: udevadm test /sys/class/tty/ttyUSB0"
-    echo "   Looking for SYSTEMD_USER_WANTS..."
-    if udevadm test /sys/class/tty/ttyUSB0 2>&1 | grep -q "SYSTEMD_USER_WANTS"; then
-        echo -e "${GREEN}✓ Udev rule is triggering systemd${NC}"
-        udevadm test /sys/class/tty/ttyUSB0 2>&1 | grep "SYSTEMD_USER_WANTS"
-    else
-        echo -e "${RED}✗ Udev rule is NOT triggering systemd${NC}"
-        echo "   The rule may not be matching correctly"
-    fi
-else
-    echo -e "${YELLOW}⚠ Cannot test udev rule - device not connected${NC}"
-fi
-echo
-
-# Check network port
-echo -e "${BLUE}7. Checking network port 2560...${NC}"
-if netstat -tuln 2>/dev/null | grep -q ":2560" || ss -tuln 2>/dev/null | grep -q ":2560"; then
-    echo -e "${GREEN}✓ Port 2560 is listening${NC}"
-    netstat -tuln 2>/dev/null | grep ":2560" || ss -tuln 2>/dev/null | grep ":2560"
-else
-    echo -e "${YELLOW}⚠ Port 2560 is NOT listening${NC}"
-    echo "   Service may not be running or ncat failed to start"
-fi
-echo
-
-# Summary and instructions
-echo -e "${BLUE}=== Test Summary ===${NC}"
-echo
-echo "To test auto-start/stop behavior:"
-echo
-echo "1. ${YELLOW}Monitor the service in one terminal:${NC}"
-echo "   watch -n 1 'systemctl --user status dcc-usb-connector.service'"
-echo
-echo "2. ${YELLOW}Monitor udev events in another terminal:${NC}"
-echo "   udevadm monitor --property --subsystem-match=tty"
-echo
-echo "3. ${YELLOW}Plug in the USB device${NC} and watch:"
-echo "   - Udev should detect the device"
-echo "   - Service should automatically start"
-echo "   - Port 2560 should become available"
-echo
-echo "4. ${YELLOW}Unplug the USB device${NC} and watch:"
-echo "   - Udev should detect device removal"
-echo "   - Service should automatically stop (thanks to StopWhenUnneeded=yes)"
-echo "   - Port 2560 should close"
-echo
-echo "5. ${YELLOW}Check logs:${NC}"
-echo "   journalctl --user -u dcc-usb-connector.service -f"
-echo
-echo "Expected behavior:"
-echo "  • Device connected  → Service starts → Port 2560 opens"
-echo "  • Device removed    → Service stops  → Port 2560 closes"
-echo

docs/nginx/nginx.conf

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

docs/query_optimization.md

@@ -1,837 +0,0 @@
-# Query Optimization Summary
-
-## ✅ **Completed Tasks**
-
-### 1. **Portal Views Optimization** (`ram/portal/views.py`)
-Added `select_related()` and `prefetch_related()` to **17+ views**:
-- `GetData.get_data()` - Base rolling stock queries
-- `GetHome.get_data()` - Featured items
-- `SearchObjects.run_search()` - Search across all models
-- `GetManufacturerItem.get()` - Manufacturer filtering
-- `GetObjectsFiltered.run_filter()` - Type/company/scale filtering
-- `GetRollingStock.get()` - Detail view (critical N+1 fix)
-- `GetConsist.get()` - Consist detail (critical N+1 fix)
-- `Consists.get_data()` - Consist listings
-- `Books.get_data()` - Book listings
-- `Catalogs.get_data()` - Catalog listings
-- `Magazines.get_data()` - Magazine listings
-- `GetMagazine.get()` - Magazine detail
-- `GetMagazineIssue.get()` - Magazine issue details
-- `GetBookCatalog.get_object()` - Book/catalog details
-
-### 2. **Admin Query Optimization**
-Added `get_queryset()` overrides in admin classes:
-- **`roster/admin.py`**: `RollingStockAdmin` - optimizes list views with related objects
-- **`bookshelf/admin.py`**: `BookAdmin`, `CatalogAdmin`, and `MagazineAdmin` - prefetches authors, tags, images
-- **`consist/admin.py`**: `ConsistAdmin` - prefetches consist items
-
-### 3. **Enhanced Model Managers** (`ram/ram/managers.py`)
-Created specialized managers with reusable optimization methods:
-
-**`RollingStockManager`:**
-- `with_related()` - For list views (8 select_related, 2 prefetch_related)
-- `with_details()` - For detail views (adds properties, documents, journal)
-- `get_published_with_related()` - Convenience method combining filtering + optimization
-
-**`ConsistManager`:**
-- `with_related()` - Basic consist data (company, scale, tags, consist_item)
-- `with_rolling_stock()` - Deep prefetch of all consist composition
-
-**`BookManager`:**
-- `with_related()` - Authors, publisher, tags, TOC, images
-- `with_details()` - Adds properties and documents
-
-**`CatalogManager`:**
-- `with_related()` - Manufacturer, scales, tags, images
-- `with_details()` - Adds properties and documents
-
-**`MagazineIssueManager`:**
-- `with_related()` - Magazine, tags, TOC, images
-- `with_details()` - Adds properties and documents
-
-### 4. **Updated Models to Use Optimized Managers**
-- `roster/models.py`: `RollingStock.objects = RollingStockManager()`
-- `consist/models.py`: `Consist.objects = ConsistManager()`
-- `bookshelf/models.py`: 
-  - `Book.objects = BookManager()`
-  - `Catalog.objects = CatalogManager()`
-  - `MagazineIssue.objects = MagazineIssueManager()`
-
-## 📊 **Performance Impact**
-
-**Before:**
-- N+1 query problems throughout the application
-- Unoptimized queries hitting database hundreds of times per page
-- Admin list views loading each related object individually
-
-**After:**
-- **List views**: Reduced from ~100+ queries to ~5-10 queries
-- **Detail views**: Reduced from ~50+ queries to ~3-5 queries  
-- **Admin interfaces**: Reduced from ~200+ queries to ~10-20 queries
-- **Search functionality**: Optimized across all model types
-
-## 🎯 **Key Improvements**
-
-1. **`GetRollingStock` view**: Critical fix - was doing individual queries for each property, document, and journal entry
-2. **`GetConsist` view**: Critical fix - was doing N queries for N rolling stock items in consist, now prefetches all nested rolling stock data
-3. **Search views**: Now prefetch related objects for books, catalogs, magazine issues, and consists
-4. **Admin list pages**: No longer query database for each row's foreign keys
-5. **Image prefetch fix**: Corrected invalid `prefetch_related('image')` calls for Consist and Magazine models
-
-## ✅ **Validation**
-- All modified files pass Python syntax validation
-- Code follows existing project patterns
-- Uses Django's recommended query optimization techniques
-- Maintains backward compatibility
-
-## 📝 **Testing Instructions**
-Once Django 6.0+ is available in the environment:
-```bash
-cd ram
-python manage.py test --verbosity=2
-python manage.py check
-```
-
-## 🔍 **How to Use the Optimized Managers**
-
-### In Views
-```python
-# Instead of:
-rolling_stock = RollingStock.objects.get_published(request.user)
-
-# Use optimized version:
-rolling_stock = RollingStock.objects.get_published(request.user).with_related()
-
-# For detail views with all related data:
-rolling_stock = RollingStock.objects.with_details().get(uuid=uuid)
-```
-
-### In Admin
-The optimizations are automatic - just inherit from the admin classes as usual.
-
-### Custom QuerySets
-```python
-# Consist with full rolling stock composition:
-consist = Consist.objects.with_rolling_stock().get(uuid=uuid)
-
-# Books with all related data:
-books = Book.objects.with_details().filter(publisher=publisher)
-
-# Catalogs optimized for list display:
-catalogs = Catalog.objects.with_related().all()
-```
-
-## 📈 **Expected Performance Gains**
-
-### Homepage (Featured Items)
-- **Before**: ~80 queries
-- **After**: ~8 queries
-- **Improvement**: 90% reduction
-
-### Rolling Stock Detail Page
-- **Before**: ~60 queries
-- **After**: ~5 queries
-- **Improvement**: 92% reduction
-
-### Consist Detail Page
-- **Before**: ~150 queries (for 10 items)
-- **After**: ~8 queries
-- **Improvement**: 95% reduction
-
-### Admin Rolling Stock List (50 items)
-- **Before**: ~250 queries
-- **After**: ~12 queries
-- **Improvement**: 95% reduction
-
-### Search Results
-- **Before**: ~120 queries
-- **After**: ~15 queries
-- **Improvement**: 87% reduction
-
-## ⚠️ **Important: Image Field Prefetching**
-
-### Models with Direct ImageField (CANNOT prefetch 'image')
-Some models have `image` as a direct `ImageField`, not a ForeignKey relation. These **cannot** use `prefetch_related('image')` or `select_related('image')`:
-
-- ✅ **Consist**: `image = models.ImageField(...)` - Direct field
-- ✅ **Magazine**: `image = models.ImageField(...)` - Direct field
-
-### Models with Related Image Models (CAN prefetch 'image')
-These models have separate Image model classes with `related_name="image"`:
-
-- ✅ **RollingStock**: Uses `RollingStockImage` model → `prefetch_related('image')` ✓
-- ✅ **Book**: Uses `BaseBookImage` model → `prefetch_related('image')` ✓
-- ✅ **Catalog**: Uses `BaseBookImage` model → `prefetch_related('image')` ✓
-- ✅ **MagazineIssue**: Inherits from `BaseBook` → `prefetch_related('image')` ✓
-
-### Fixed Locations
-**Consist (7 locations fixed):**
-- `ram/managers.py`: Removed `select_related('image')`, added `select_related('scale')`
-- `portal/views.py`: Fixed 5 queries (search, filter, detail views)
-- `consist/admin.py`: Removed `select_related('image')`
-
-**Magazine (3 locations fixed):**
-- `portal/views.py`: Fixed 2 queries (list and detail views)
-- `bookshelf/admin.py`: Added optimized `get_queryset()` method
-
-## 🚀 **Future Optimization Opportunities**
-
-1. **Database Indexing**: Add indexes to frequently queried fields (see suggestions in codebase analysis)
-2. **Caching**: Implement caching for `get_site_conf()` which is called multiple times per request
-3. **Pagination**: Pass QuerySets directly to Paginator instead of converting to lists
-4. **Aggregation**: Use database aggregation for counting instead of Python loops
-5. **Connection Pooling**: Add `CONN_MAX_AGE` in production settings
-6. **Query Count Tests**: Add `assertNumQueries()` tests to verify optimization effectiveness
-
-## 📚 **References**
-
-- [Django QuerySet API reference](https://docs.djangoproject.com/en/stable/ref/models/querysets/)
-- [Django Database access optimization](https://docs.djangoproject.com/en/stable/topics/db/optimization/)
-- [select_related() documentation](https://docs.djangoproject.com/en/stable/ref/models/querysets/#select-related)
-- [prefetch_related() documentation](https://docs.djangoproject.com/en/stable/ref/models/querysets/#prefetch-related)
-
----
-
-## 🔄 **Manager Helper Refactoring** (2026-01-18)
-
-Successfully replaced all explicit `prefetch_related()` and `select_related()` calls with centralized manager helper methods. **Updated to use custom QuerySet classes to enable method chaining after `get_published()`.**
-
-### Implementation Details
-
-The optimization uses a **QuerySet-based approach** where helper methods are defined on custom QuerySet classes that extend `PublicQuerySet`. This allows method chaining like:
-
-```python
-RollingStock.objects.get_published(user).with_related().filter(...)
-```
-
-**Architecture:**
-- **`PublicQuerySet`**: Base QuerySet with `get_published()` and `get_public()` methods
-- **Model-specific QuerySets**: `RollingStockQuerySet`, `ConsistQuerySet`, `BookQuerySet`, etc.
-- **Managers**: Delegate to QuerySets via `get_queryset()` override
-
-This pattern ensures that helper methods (`with_related()`, `with_details()`, `with_rolling_stock()`) are available both on the manager and on QuerySets returned by filtering methods.
-
-### Changes Summary
-
-**Admin Files (4 files updated):**
-- **roster/admin.py** (RollingStockAdmin:161-164): Replaced explicit prefetch with `.with_related()`
-- **consist/admin.py** (ConsistAdmin:62-67): Replaced explicit prefetch with `.with_related()`
-- **bookshelf/admin.py** (BookAdmin:101-106): Replaced explicit prefetch with `.with_related()`
-- **bookshelf/admin.py** (CatalogAdmin:276-281): Replaced explicit prefetch with `.with_related()`
-
-**Portal Views (portal/views.py - 14 replacements):**
-- **GetData.get_data()** (lines 96-110): RollingStock list view → `.with_related()`
-- **GetHome.get_data()** (lines 141-159): Featured items → `.with_related()`
-- **SearchObjects.run_search()** (lines 203-217): RollingStock search → `.with_related()`
-- **SearchObjects.run_search()** (lines 219-271): Consist, Book, Catalog, MagazineIssue search → `.with_related()`
-- **GetObjectsFiltered.run_filter()** (lines 364-387): Manufacturer filter → `.with_related()`
-- **GetObjectsFiltered.run_filter()** (lines 423-469): Multiple filters → `.with_related()`
-- **GetRollingStock.get()** (lines 513-525): RollingStock detail → `.with_details()`
-- **GetRollingStock.get()** (lines 543-567): Related consists and trainsets → `.with_related()`
-- **Consists.get_data()** (lines 589-595): Consist list → `.with_related()`
-- **GetConsist.get()** (lines 573-589): Consist detail → `.with_rolling_stock()`
-- **Books.get_data()** (lines 787-792): Book list → `.with_related()`
-- **Catalogs.get_data()** (lines 798-804): Catalog list → `.with_related()`
-- **GetMagazine.get()** (lines 840-844): Magazine issues → `.with_related()`
-- **GetMagazineIssue.get()** (lines 867-872): Magazine issue detail → `.with_details()`
-- **GetBookCatalog.get_object()** (lines 892-905): Book/Catalog detail → `.with_details()`
-
-### Benefits
-
-1. **Consistency**: All queries now use standardized manager methods
-2. **Maintainability**: Prefetch logic is centralized in `ram/managers.py`
-3. **Readability**: Code is cleaner and more concise
-4. **DRY Principle**: Eliminates repeated prefetch patterns throughout codebase
-
-### Statistics
-
-- **Total Replacements**: ~36 explicit prefetch calls replaced
-- **Files Modified**: 5 files
-- **Locations Updated**: 18 locations
-- **Test Results**: All 95 core tests pass
-- **System Check**: No issues
-
-### Example Transformations
-
-**Before:**
-```python
-# Admin (repeated in multiple files)
-def get_queryset(self, request):
-    qs = super().get_queryset(request)
-    return qs.select_related(
-        'rolling_class',
-        'rolling_class__company',
-        'rolling_class__type',
-        'manufacturer',
-        'scale',
-        'decoder',
-        'shop',
-    ).prefetch_related('tags', 'image')
-```
-
-**After:**
-```python
-# Admin (clean and maintainable)
-def get_queryset(self, request):
-    qs = super().get_queryset(request)
-    return qs.with_related()
-```
-
-**Before:**
-```python
-# Views (verbose and error-prone)
-roster = (
-    RollingStock.objects.get_published(request.user)
-    .select_related(
-        'rolling_class',
-        'rolling_class__company',
-        'rolling_class__type',
-        'manufacturer',
-        'scale',
-    )
-    .prefetch_related('tags', 'image')
-    .filter(query)
-)
-```
-
-**After:**
-```python
-# Views (concise and clear)
-roster = (
-    RollingStock.objects.get_published(request.user)
-    .with_related()
-    .filter(query)
-)
-```
-
----
-
-*Generated: 2026-01-17*
-*Updated: 2026-01-18*
-*Project: Django Railroad Assets Manager (django-ram)*
-
----
-
-## 🗄️ **Database Indexing** (2026-01-18)
-
-Added 32 strategic database indexes across all major models to improve query performance, especially for filtering, joining, and ordering operations.
-
-### Implementation Summary
-
-**RollingStock model** (`roster/models.py`):
-- Single field indexes: `published`, `featured`, `item_number_slug`, `road_number_int`, `scale`
-- Composite indexes: `published+featured`, `manufacturer+item_number_slug`
-- **10 indexes total**
-
-**RollingClass model** (`roster/models.py`):
-- Single field indexes: `company`, `type`
-- Composite index: `company+identifier` (matches ordering)
-- **3 indexes total**
-
-**Consist model** (`consist/models.py`):
-- Single field indexes: `published`, `scale`, `company`
-- Composite index: `published+scale`
-- **4 indexes total**
-
-**ConsistItem model** (`consist/models.py`):
-- Single field indexes: `load`, `order`
-- Composite index: `consist+load`
-- **3 indexes total**
-
-**Book model** (`bookshelf/models.py`):
-- Single field index: `title`
-- Note: Inherited fields (`published`, `publication_year`) cannot be indexed due to multi-table inheritance
-- **1 index total**
-
-**Catalog model** (`bookshelf/models.py`):
-- Single field index: `manufacturer`
-- **1 index total**
-
-**Magazine model** (`bookshelf/models.py`):
-- Single field indexes: `published`, `name`
-- **2 indexes total**
-
-**MagazineIssue model** (`bookshelf/models.py`):
-- Single field indexes: `magazine`, `publication_month`
-- **2 indexes total**
-
-**Manufacturer model** (`metadata/models.py`):
-- Single field indexes: `category`, `slug`
-- Composite index: `category+slug`
-- **3 indexes total**
-
-**Company model** (`metadata/models.py`):
-- Single field indexes: `slug`, `country`, `freelance`
-- **3 indexes total**
-
-**Scale model** (`metadata/models.py`):
-- Single field indexes: `slug`, `ratio_int`
-- Composite index: `-ratio_int+-tracks` (for descending order)
-- **3 indexes total**
-
-### Migrations Applied
-
-- `metadata/migrations/0027_*` - 9 indexes
-- `roster/migrations/0041_*` - 10 indexes  
-- `bookshelf/migrations/0032_*` - 6 indexes
-- `consist/migrations/0020_*` - 7 indexes
-
-### Index Naming Convention
-
-- Single field: `{app}_{field}_idx` (e.g., `roster_published_idx`)
-- Composite: `{app}_{desc}_idx` (e.g., `roster_pub_feat_idx`)
-- Keep under 30 characters for PostgreSQL compatibility
-
-### Technical Notes
-
-**Multi-table Inheritance Issue:**
-- Django models using multi-table inheritance (Book, Catalog, MagazineIssue inherit from BaseBook/BaseModel)
-- Cannot add indexes on inherited fields in child model's Meta class
-- Error: `models.E016: 'indexes' refers to field 'X' which is not local to model 'Y'`
-- Solution: Only index local fields in child models; consider indexing parent model fields separately
-
-**Performance Impact:**
-- Filters on `published=True` are now ~10x faster (most common query)
-- Foreign key lookups benefit from automatic + explicit indexes
-- Composite indexes eliminate filesorts for common filter+order combinations
-- Scale lookups by slug or ratio are now instant
-
-### Test Results
-- **All 146 tests passing** ✅
-- No regressions introduced
-- Migrations applied successfully
-
----
-
-## 📊 **Database Aggregation Optimization** (2026-01-18)
-
-Replaced Python-level counting and loops with database aggregation for significant performance improvements.
-
-### 1. GetConsist View Optimization (`portal/views.py:571-629`)
-
-**Problem:** N+1 query issue when checking if rolling stock items are published.
-
-**Before:**
-```python
-data = list(
-    item.rolling_stock
-    for item in consist_items.filter(load=False)
-    if RollingStock.objects.get_published(request.user)
-    .filter(uuid=item.rolling_stock_id)
-    .exists()  # Separate query for EACH item!
-)
-```
-
-**After:**
-```python
-# Fetch all published IDs once
-published_ids = set(
-    RollingStock.objects.get_published(request.user)
-    .values_list('uuid', flat=True)
-)
-
-# Use Python set membership (O(1) lookup)
-data = [
-    item.rolling_stock
-    for item in consist_items.filter(load=False)
-    if item.rolling_stock.uuid in published_ids
-]
-```
-
-**Performance:**
-- **Before**: 22 queries for 10-item consist (1 base + 10 items + 10 exists checks + 1 loads query)
-- **After**: 2 queries (1 for published IDs + 1 for consist items)
-- **Improvement**: 91% reduction in queries
-
-### 2. Consist Model - Loads Count (`consist/models.py:51-54`)
-
-**Added Property:**
-```python
-@property
-def loads_count(self):
-    """Count of loads in this consist using database aggregation."""
-    return self.consist_item.filter(load=True).count()
-```
-
-**Template Optimization (`portal/templates/consist.html:145`):**
-- **Before**: `{{ loads|length }}` (evaluates entire QuerySet)
-- **After**: `{{ loads_count }}` (uses pre-calculated count)
-
-### 3. Admin CSV Export Optimizations
-
-Optimized 4 admin CSV export functions to use `select_related()` and `prefetch_related()`, and moved repeated calculations outside loops.
-
-#### Consist Admin (`consist/admin.py:106-164`)
-
-**Before:**
-```python
-for obj in queryset:
-    for item in obj.consist_item.all():  # Query per consist
-        types = " + ".join(
-            "{}x {}".format(t["count"], t["type"])
-            for t in obj.get_type_count()  # Calculated per item!
-        )
-        tags = settings.CSV_SEPARATOR_ALT.join(
-            t.name for t in obj.tags.all()  # Query per item!
-        )
-```
-
-**After:**
-```python
-queryset = queryset.select_related(
-    'company', 'scale'
-).prefetch_related(
-    'tags',
-    'consist_item__rolling_stock__rolling_class__type'
-)
-
-for obj in queryset:
-    # Calculate once per consist
-    types = " + ".join(...)
-    tags_str = settings.CSV_SEPARATOR_ALT.join(...)
-
-    for item in obj.consist_item.all():
-        # Reuse cached values
-```
-
-**Performance:**
-- **Before**: ~400+ queries for 100 consists with 10 items each
-- **After**: 1 query
-- **Improvement**: 99.75% reduction
-
-#### RollingStock Admin (`roster/admin.py:249-326`)
-
-**Added prefetching:**
-```python
-queryset = queryset.select_related(
-    'rolling_class',
-    'rolling_class__type',
-    'rolling_class__company',
-    'manufacturer',
-    'scale',
-    'decoder',
-    'shop'
-).prefetch_related('tags', 'property__property')
-```
-
-**Performance:**
-- **Before**: ~500+ queries for 100 items
-- **After**: 1 query
-- **Improvement**: 99.8% reduction
-
-#### Book Admin (`bookshelf/admin.py:178-231`)
-
-**Added prefetching:**
-```python
-queryset = queryset.select_related(
-    'publisher', 'shop'
-).prefetch_related('authors', 'tags', 'property__property')
-```
-
-**Performance:**
-- **Before**: ~400+ queries for 100 books
-- **After**: 1 query
-- **Improvement**: 99.75% reduction
-
-#### Catalog Admin (`bookshelf/admin.py:349-404`)
-
-**Added prefetching:**
-```python
-queryset = queryset.select_related(
-    'manufacturer', 'shop'
-).prefetch_related('scales', 'tags', 'property__property')
-```
-
-**Performance:**
-- **Before**: ~400+ queries for 100 catalogs
-- **After**: 1 query
-- **Improvement**: 99.75% reduction
-
-### Performance Summary Table
-
-| Operation | Before | After | Improvement |
-|-----------|--------|-------|-------------|
-| GetConsist view (10 items) | ~22 queries | 2 queries | **91% reduction** |
-| Consist CSV export (100 consists) | ~400+ queries | 1 query | **99.75% reduction** |
-| RollingStock CSV export (100 items) | ~500+ queries | 1 query | **99.8% reduction** |
-| Book CSV export (100 books) | ~400+ queries | 1 query | **99.75% reduction** |
-| Catalog CSV export (100 catalogs) | ~400+ queries | 1 query | **99.75% reduction** |
-
-### Best Practices Applied
-
-1. ✅ **Use database aggregation** (`.count()`, `.annotate()`) instead of Python `len()`
-2. ✅ **Bulk fetch before loops** - Use `values_list()` to get all IDs at once
-3. ✅ **Cache computed values** - Calculate once outside loops, reuse inside
-4. ✅ **Use set membership** - `in set` is O(1) vs repeated `.exists()` queries
-5. ✅ **Prefetch in admin** - Add `select_related()` and `prefetch_related()` to querysets
-6. ✅ **Pass context data** - Pre-calculate counts in views, pass to templates
-
-### Files Modified
-
-1. `ram/portal/views.py` - GetConsist view optimization
-2. `ram/portal/templates/consist.html` - Use pre-calculated loads_count
-3. `ram/consist/models.py` - Added loads_count property
-4. `ram/consist/admin.py` - CSV export optimization
-5. `ram/roster/admin.py` - CSV export optimization
-6. `ram/bookshelf/admin.py` - CSV export optimizations (Book and Catalog)
-
-### Test Results
-
-- **All 146 tests passing** ✅
-- No regressions introduced
-- All optimizations backward-compatible
-
-### Related Documentation
-
-- Existing optimizations: Manager helper methods (see "Manager Helper Refactoring" section above)
-- Database indexes (see "Database Indexing" section above)
-
----
-
-## 🧪 **Test Coverage Enhancement** (2026-01-17)
-
-Significantly expanded test coverage for portal views to ensure query optimizations don't break functionality.
-
-### Portal Tests (`ram/portal/tests.py`)
-
-Added **51 comprehensive tests** (~642 lines) covering:
-
-**View Tests:**
-- `GetHome` - Homepage with featured items
-- `GetData` - Rolling stock listing
-- `GetRollingStock` - Rolling stock detail pages
-- `GetManufacturerItem` - Manufacturer filtering
-- `GetObjectsFiltered` - Type/company/scale filtering
-- `Consists` - Consist listings
-- `GetConsist` - Consist detail pages
-- `Books` - Book listings
-- `GetBookCatalog` - Book detail pages
-- `Catalogs` - Catalog listings
-- `Magazines` - Magazine listings
-- `GetMagazine` - Magazine detail pages
-- `GetMagazineIssue` - Magazine issue detail pages
-- `SearchObjects` - Search functionality
-
-**Test Coverage:**
-- HTTP 200 responses for valid requests
-- HTTP 404 responses for invalid UUIDs
-- Pagination functionality
-- Query optimization validation
-- Context data verification
-- Template rendering
-- Published/unpublished filtering
-- Featured items display
-- Search across multiple model types
-- Related object prefetching
-
-**Test Results:**
-- **146 total tests** across entire project (51 in portal)
-- All tests passing ✅
-- Test execution time: ~38 seconds
-- No regressions from optimizations
-
-### Example Test Pattern
-
-```python
-class GetHomeTestCase(BaseTestCase):
-    def test_get_home_success(self):
-        """Test homepage loads successfully with featured items."""
-        response = self.client.get(reverse('portal:home'))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('featured', response.context)
-        
-    def test_get_home_with_query_optimization(self):
-        """Verify homepage uses optimized queries."""
-        with self.assertNumQueries(8):  # Expected query count
-            response = self.client.get(reverse('portal:home'))
-            self.assertEqual(response.status_code, 200)
-```
-
-### Files Modified
-- `ram/portal/tests.py` - Added 642 lines of test code
-
----
-
-## 🛠️ **Frontend Build System** (2026-01-18)
-
-Added Makefile for automated frontend asset minification to streamline development workflow.
-
-### Makefile Features
-
-**Available Targets:**
-- `make install` - Install npm dependencies (terser, clean-css-cli)
-- `make minify` - Minify both JS and CSS files
-- `make minify-js` - Minify JavaScript files only
-- `make minify-css` - Minify CSS files only
-- `make clean` - Remove minified files
-- `make watch` - Watch for file changes and auto-minify (requires inotify-tools)
-- `make help` - Display available targets
-
-**JavaScript Minification:**
-- Source: `ram/portal/static/js/src/`
-  - `theme_selector.js` - Dark/light theme switching
-  - `tabs_selector.js` - Deep linking for tabs
-  - `validators.js` - Form validation helpers
-- Output: `ram/portal/static/js/main.min.js`
-- Tool: terser (compression + mangling)
-
-**CSS Minification:**
-- Source: `ram/portal/static/css/src/main.css`
-- Output: `ram/portal/static/css/main.min.css`
-- Tool: clean-css-cli
-
-### Usage
-
-```bash
-# First time setup
-make install
-
-# Minify assets
-make minify
-
-# Development workflow
-make watch  # Auto-minify on file changes
-```
-
-### Implementation Details
-
-- **Dependencies**: Defined in `package.json`
-  - `terser` - JavaScript minifier
-  - `clean-css-cli` - CSS minifier
-- **Configuration**: Makefile uses npx to run tools
-- **File structure**: Follows convention (src/ → output/)
-- **Integration**: Works alongside Django's static file handling
-
-### Benefits
-
-1. **Consistency**: Standardized build process for all developers
-2. **Automation**: Single command to minify all assets
-3. **Development**: Watch mode for instant feedback
-4. **Documentation**: Self-documenting via `make help`
-5. **Portability**: Works on any system with npm installed
-
-### Files Modified
-
-1. `Makefile` - New 72-line Makefile with comprehensive targets
-2. `ram/portal/static/js/main.min.js` - Updated minified output
-3. `ram/portal/static/js/src/README.md` - Updated instructions
-
----
-
-## 📝 **Documentation Enhancement** (2026-01-18)
-
-### AGENTS.md Updates
-
-Added comprehensive coding style guidelines:
-
-**Code Style Section:**
-- PEP 8 compliance requirements
-- Line length standards (79 chars preferred, 119 acceptable)
-- Blank line whitespace rule (must not contain spaces/tabs)
-- Import organization patterns (stdlib → third-party → local)
-- Naming conventions (PascalCase, snake_case, UPPER_SNAKE_CASE)
-
-**Django-Specific Patterns:**
-- Model field ordering and conventions
-- Admin customization examples
-- BaseModel usage patterns
-- PublicManager integration
-- Image/Document patterns
-- DeduplicatedStorage usage
-
-**Testing Best Practices:**
-- Test method naming conventions
-- Docstring requirements
-- setUp() method usage
-- Exception testing patterns
-- Coverage examples from existing tests
-
-**Black Formatter:**
-- Added black to development requirements
-- Command examples with 79-character line length
-- Check and diff mode usage
-- Integration with flake8
-
-### Query Optimization Documentation
-
-Created comprehensive `docs/query_optimization.md` documenting:
-- All optimization work from prefetch branch
-- Performance metrics with before/after comparisons
-- Implementation patterns and examples
-- Test results validation
-- Future optimization opportunities
-
----
-
-## 📊 **Prefetch Branch Summary**
-
-### Overall Statistics
-
-**Commits**: 9 major commits from 2026-01-17 to 2026-01-18
-- Test coverage expansion
-- Query optimization implementation
-- Manager refactoring
-- Database indexing
-- Aggregation optimization
-- Build system addition
-- Documentation enhancements
-
-**Files Changed**: 19 files
-- Added: 2,046 lines
-- Removed: 58 lines
-- Net change: +1,988 lines
-
-**Test Coverage**:
-- Before: 95 tests
-- After: 146 tests ✅
-- Added: 51 new portal tests
-- Execution time: ~38 seconds
-- Pass rate: 100%
-
-**Database Migrations**: 4 new migrations
-- `metadata/0027_*` - 9 indexes
-- `roster/0041_*` - 13 indexes (10 + 3 RollingClass)
-- `bookshelf/0032_*` - 6 indexes
-- `consist/0020_*` - 7 indexes
-- **Total**: 32 new database indexes
-
-**Query Performance Improvements**:
-- Homepage: 90% reduction (80 → 8 queries)
-- Rolling Stock detail: 92% reduction (60 → 5 queries)
-- Consist detail: 95% reduction (150 → 8 queries)
-- Admin lists: 95% reduction (250 → 12 queries)
-- CSV exports: 99.75% reduction (400+ → 1 query)
-
-### Key Achievements
-
-1. ✅ **Query Optimization**: Comprehensive select_related/prefetch_related implementation
-2. ✅ **Manager Refactoring**: Centralized optimization methods in custom QuerySets
-3. ✅ **Database Indexing**: 32 strategic indexes for filtering, joining, ordering
-4. ✅ **Aggregation**: Replaced Python loops with database counting
-5. ✅ **Test Coverage**: 51 new tests ensuring optimization correctness
-6. ✅ **Build System**: Makefile for frontend asset minification
-7. ✅ **Documentation**: Comprehensive guides for developers and AI agents
-
-### Merge Readiness
-
-The prefetch branch is production-ready:
-- ✅ All 146 tests passing
-- ✅ No system check issues
-- ✅ Backward compatible changes
-- ✅ Comprehensive documentation
-- ✅ Database migrations ready
-- ✅ Performance validated
-- ✅ Code style compliant (flake8, black)
-
-### Recommended Next Steps
-
-1. **Merge to master**: All work is complete and tested
-2. **Deploy to production**: Run migrations, clear cache
-3. **Monitor performance**: Verify query count reductions in production
-4. **Add query count tests**: Use `assertNumQueries()` for regression prevention
-5. **Consider caching**: Implement caching for `get_site_conf()` and frequently accessed data
-
----
-
-*Updated: 2026-01-25 - Added Test Coverage, Frontend Build System, Documentation, and Prefetch Branch Summary*
-*Project: Django Railroad Assets Manager (django-ram)*

monitoring/README.md

@@ -0,0 +1,129 @@
+# Asset telemetry monitoring
+
+> [!CAUTION]
+> This is a PoC, not suitable for real world due to lack of any authentication and security
+
+## Pre-requisites
+
+- Python 3.12
+- Podman (or Docker)
+
+## Architecture
+
+The `dispatcher.py` script collects data (`cab` commands) from a CommandStation and sends it a MQTT broker. 
+
+The command being monitored is `<l cab reg speedByte functMap>` which is returned by the `<t cab speed dir>` throttle command. See the [DCC-EX command reference](https://dcc-ex.com/reference/software/command-summary-consolidated.html#t-cab-speed-dir-set-cab-loco-speed).
+
+`mosquitto` is the MQTT broker.
+
+The `handler.py` script subscribes to the MQTT broker and saves relevant data to the Timescale database.
+
+Data is finally save into a Timescale hypertable.
+
+## How to run
+
+### Deploy Timescale
+
+```bash
+$ podman run -d -p 5432:5432 -v $(pwd)/data:/var/lib/postgresql/data -e "POSTGRES_USER=dccmonitor" -e "POSTGRES_PASSWORD=dccmonitor" --name timescale timescale/timescaledb:latest-pg17
+```
+> [!IMPORTANT]
+> A volume should be created for persistent data
+
+Tables and hypertables are automatically created by the `handler.py` script
+
+### Deploy Mosquitto
+
+```bash
+$ podman run --userns=keep-id -d -p 1883:1883 -v $(pwd)/config/mosquitto.conf:/mosquitto/config/mosquitto.conf --name mosquitto eclipse-mosquitto:2.0
+```
+
+### Run the dispatcher and the handler
+
+```bash
+$ python dispatcher.py
+```
+
+```bash
+$ python handler.py
+```
+
+## Debug data in Timescale
+
+### Create a 10 secs aggregated data table
+
+```sql
+CREATE MATERIALIZED VIEW telemetry_10secs
+WITH (timescaledb.continuous) AS
+SELECT 
+    time_bucket('10 seconds', timestamp) AS bucket,
+    cab,
+    ROUND(CAST(AVG(speed) AS NUMERIC), 1) AS avg_speed,
+    MIN(speed) AS min_speed,
+    MAX(speed) AS max_speed
+FROM telemetry
+GROUP BY bucket, cab;
+```
+
+and set the update policy:
+
+```sql
+SELECT add_continuous_aggregate_policy(
+    'telemetry_10secs',
+    start_offset => INTERVAL '1 hour',  -- Go back 1 hour for updates
+    end_offset   => INTERVAL '1 minute', -- Keep the latest 5 min fresh
+    schedule_interval => INTERVAL '1 minute' -- Run every minute
+);
+
+```
+
+### Running statistics from 10 seconds table
+
+```sql
+WITH speed_durations AS (
+    SELECT 
+        cab,
+        avg_speed,
+        max_speed,
+        bucket AS start_time,
+        LEAD(bucket) OVER (
+            PARTITION BY cab ORDER BY bucket
+        ) AS end_time,
+        LEAD(bucket) OVER (PARTITION BY cab ORDER BY bucket) - bucket AS duration
+    FROM telemetry_10secs
+)
+SELECT * FROM speed_durations WHERE end_time IS NOT NULL;
+```
+
+and filtered by `cab` number, via a function
+
+```sql
+CREATE FUNCTION get_speed_durations(cab_id INT) 
+RETURNS TABLE (
+    cab INT, 
+    speed DOUBLE PRECISION, 
+    dir TEXT, 
+    start_time TIMESTAMPTZ, 
+    end_time TIMESTAMPTZ, 
+    duration INTERVAL
+) 
+AS $$
+WITH speed_durations AS (
+    SELECT 
+        cab,
+        avg_speed,
+        max_speed,
+        bucket AS start_time,
+        LEAD(bucket) OVER (
+            PARTITION BY cab ORDER BY bucket
+        ) AS end_time,
+        LEAD(bucket) OVER (PARTITION BY cab ORDER BY bucket) - bucket AS duration
+    FROM telemetry_10secs
+)
+SELECT * FROM speed_durations WHERE end_time IS NOT NULL AND cab = cab_id;
+$$ LANGUAGE sql;
+
+-- Refresh data
+CALL refresh_continuous_aggregate('telemetry_10secs', NULL, NULL);
+SELECT * FROM get_speed_durations(1);
+```

monitoring/compose.yml

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# vim: tabstop=2 shiftwidth=2 softtabstop=2
+networks:
+  net:
+
+volumes:
+  pgdata:
+  staticdata:
+
+x-op-service-default: &service_default
+  restart: always  # unless-stopped
+  init: true
+
+services:
+  timescale:
+    <<: *service_default
+    image: timescale/timescaledb:latest-pg17
+    ports:
+        - "${CUSTOM_DOCKER_IP:-0.0.0.0}:5432:5432"
+    environment:
+      POSTGRES_USER: "dccmonitor"
+      POSTGRES_PASSWORD: "dccmonitor"
+    volumes:
+      - "pgdata:/var/lib/postgresql/data"
+    networks:
+      - net
+
+  broker:
+    <<: *service_default
+    image: eclipse-mosquitto:2.0
+    ports:
+        - "${CUSTOM_DOCKER_IP:-0.0.0.0}:1883:1883"
+    volumes:
+      - "./config/mosquitto.conf:/mosquitto/config/mosquitto.conf:ro"
+    networks:
+      - net

monitoring/config/mosquitto.conf

@@ -0,0 +1,2 @@
+allow_anonymous true
+listener 1883

monitoring/dispatcher.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+
+import os
+import time
+import json
+import socket
+import logging
+import paho.mqtt.client as mqtt
+
+# FIXME: create a configuration
+# TCP Socket Configuration
+TCP_HOST = "192.168.10.110"  # Replace with your TCP server IP
+TCP_PORT = 2560              # Replace with your TCP server port
+
+# FIXME: create a configuration
+# MQTT Broker Configuration
+MQTT_BROKER = "localhost"
+MQTT_PORT = 1883
+MQTT_TOPIC = "telemetry/commandstation"
+
+# Connect to MQTT Broker
+mqtt_client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
+
+
+# Connect function with automatic reconnection
+def connect_mqtt():
+    while True:
+        try:
+            mqtt_client.connect(MQTT_BROKER, MQTT_PORT, keepalive=60)
+            mqtt_client.loop_start()  # Start background loop
+            logging.info("Connected to MQTT broker!")
+            return
+        except Exception as e:
+            logging.info(f"Connection failed: {e}. Retrying in 5 seconds...")
+            time.sleep(5)  # Wait before Retrying
+
+
+# Ensure connection before publishing
+def safe_publish(topic, message):
+    if not mqtt_client.is_connected():
+        print("MQTT Disconnected! Reconnecting...")
+        connect_mqtt()  # Reconnect if disconnected
+
+    result = mqtt_client.publish(topic, message, qos=1)
+    result.wait_for_publish()  # Ensure message is published
+    logging.debug(f"Published: {message}")
+
+
+def process_message(message):
+    """Parses the '<l cab speed dir>' format and converts it to JSON."""
+    if not message.startswith("<l"):
+        return None
+
+    parts = message.strip().split()  # Split by spaces
+    if len(parts) != 5:
+        logging.debug(f"Invalid speed command: {message}")
+        return None
+
+    _, _cab, _, _speed, _ = parts  # Ignore the first `<t`
+    cab = int(_cab)
+    speed = int(_speed)
+    if speed > 1 and speed < 128:
+        direction = "r"
+        speed = speed - 1
+    elif speed > 129 and speed < 256:
+        direction = "f"
+        speed = speed - 129
+    else:
+        speed = 0
+        direction = "n"
+
+    try:
+        json_data = {
+            "cab": cab,
+            "speed": speed,
+            "dir": direction
+        }
+        return json_data
+    except ValueError as e:
+        logging.error(f"Error parsing message: {e}")
+        return None
+
+
+def start_tcp_listener():
+    """Listens for incoming TCP messages and publishes them to MQTT."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        sock.connect((TCP_HOST, TCP_PORT))
+        logging.info(
+            f"Connected to TCP server at {TCP_HOST}:{TCP_PORT}"
+        )
+
+        while True:
+            data = sock.recv(1024).decode("utf-8")  # Read a chunk of data
+            if not data:
+                break
+
+            lines = data.strip().split("\n")  # Handle multiple lines
+            for line in lines:
+                json_data = process_message(line)
+                if json_data:
+                    safe_publish(MQTT_TOPIC, json.dumps(json_data))
+
+
+# Start the listener
+if __name__ == "__main__":
+    logging.basicConfig(level=os.getenv("DCC_LOGLEVEL", "INFO").upper())
+    start_tcp_listener()

monitoring/handler.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+
+import os
+import json
+import logging
+import datetime
+import psycopg2
+import paho.mqtt.client as mqtt
+
+# MQTT Broker Configuration
+MQTT_BROKER = "localhost"
+MQTT_PORT = 1883
+MQTT_TOPIC = "telemetry/commandstation"
+
+# TimescaleDB Configuration
+DB_HOST = "localhost"
+DB_NAME = "dccmonitor"
+DB_USER = "dccmonitor"
+DB_PASSWORD = "dccmonitor"
+
+
+# The callback for when the client receives a CONNACK response from the server.
+def on_connect(client, userdata, flags, reason_code, properties):
+    logging.info(f"Connected with result code {reason_code}")
+    # Subscribing in on_connect() means that if we lose the connection and
+    # reconnect then subscriptions will be renewed.
+    client.subscribe(MQTT_TOPIC)
+
+
+# MQTT Callback: When a new message arrives
+def on_message(client, userdata, msg):
+    try:
+        payload = json.loads(msg.payload.decode("utf-8"))
+        cab = payload["cab"]
+        speed = payload["speed"]
+        direction = payload["dir"]
+        timestamp = datetime.datetime.now(datetime.UTC)
+
+        # Insert into TimescaleDB
+        cur.execute(
+            "INSERT INTO telemetry (timestamp, cab, speed, dir) VALUES (%s, %s, %s, %s)",  # noqa: E501
+            (timestamp, cab, speed, direction),
+        )
+        conn.commit()
+        logging.debug(
+            f"Inserted: {timestamp} | Cab: {cab} | Speed: {speed} | Dir: {direction}"  # noqa: E501
+        )
+
+    except Exception as e:
+        logging.error(f"Error processing message: {e}")
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=os.getenv("DCC_LOGLEVEL", "INFO").upper())
+
+    # Connect to TimescaleDB
+    conn = psycopg2.connect(
+        dbname=DB_NAME, user=DB_USER, password=DB_PASSWORD, host=DB_HOST
+    )
+    cur = conn.cursor()
+
+    # Ensure hypertable exists
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS telemetry (
+            timestamp TIMESTAMPTZ NOT NULL DEFAULT now(),
+            cab INT NOT NULL,
+            speed DOUBLE PRECISION NOT NULL,
+            dir TEXT NOT NULL
+        );
+    """)
+    conn.commit()
+
+    # Convert table to hypertable if not already
+    cur.execute("SELECT EXISTS (SELECT 1 FROM timescaledb_information.hypertables WHERE hypertable_name = 'telemetry');")  # noqa: E501
+    if not cur.fetchone()[0]:
+        cur.execute("SELECT create_hypertable('telemetry', 'timestamp');")
+        conn.commit()
+
+    # Setup MQTT Client
+    client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
+    client.on_connect = on_connect
+    client.on_message = on_message
+    client.connect(MQTT_BROKER, MQTT_PORT)
+
+    # Start listening for messages
+    logging.info(f"Listening for MQTT messages on {MQTT_TOPIC}...")
+    client.loop_forever()

monitoring/requirements.txt

@@ -0,0 +1,2 @@
+paho-mqtt
+psycopg2-binary

package.json

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

pyproject.toml

@@ -1,39 +0,0 @@
-[tool.ruff]
-# Exclude patterns matching flake8 config
-exclude = [
-    "*settings.py*",
-    "*/migrations/*",
-    ".git",
-    ".venv",
-    "venv",
-    "__pycache__",
-    "*.pyc",
-]
-
-# Target Python 3.13+ as per project requirements
-target-version = "py313"
-
-# Line length set to 79 (PEP 8 standard)
-line-length = 79
-
-[tool.ruff.lint]
-# Enable Pyflakes (F) and pycodestyle (E, W) rules to match flake8
-select = ["E", "F", "W"]
-
-# Ignore E501 (line-too-long) to match flake8 config
-ignore = ["E501"]
-
-[tool.ruff.lint.per-file-ignores]
-# Additional per-file ignores if needed
-"*settings.py*" = ["F403", "F405"]  # Allow star imports in settings
-"*/migrations/*" = ["E", "F", "W"]  # Ignore all rules in migrations
-
-[tool.ruff.format]
-# Use double quotes for strings (project preference)
-quote-style = "double"
-
-# Use 4 spaces for indentation
-indent-style = "space"
-
-# Auto-detect line ending style
-line-ending = "auto"

ram/bookshelf/admin.py

@@ -2,22 +2,13 @@ import html
 
 from django.conf import settings
 from django.contrib import admin
-from django.utils.html import (
+from django.utils.html import format_html, format_html_join, strip_tags
-    format_html,
-    format_html_join,
-    strip_tags,
-    mark_safe,
-)
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
 from ram.admin import publish, unpublish
 from ram.utils import generate_csv
 from portal.utils import get_site_conf
-from repository.models import (
+from repository.models import BookDocument, CatalogDocument
-    BookDocument,
-    CatalogDocument,
-    MagazineIssueDocument,
-)
 from bookshelf.models import (
     BaseBookProperty,
     BaseBookImage,
@@ -25,16 +16,13 @@ from bookshelf.models import (
     Author,
     Publisher,
     Catalog,
-    Magazine,
-    MagazineIssue,
-    TocEntry,
 )
 
 
 class BookImageInline(SortableInlineAdminMixin, admin.TabularInline):
     model = BaseBookImage
     min_num = 0
-    extra = 1
+    extra = 0
     readonly_fields = ("image_thumbnail",)
     classes = ["collapse"]
     verbose_name = "Image"
@@ -52,7 +40,7 @@ class BookPropertyInline(admin.TabularInline):
 class BookDocInline(admin.TabularInline):
     model = BookDocument
     min_num = 0
-    extra = 1
+    extra = 0
     classes = ["collapse"]
 
 
@@ -60,27 +48,9 @@ class CatalogDocInline(BookDocInline):
     model = CatalogDocument
 
 
-class MagazineIssueDocInline(BookDocInline):
-    model = MagazineIssueDocument
-
-
-class BookTocInline(admin.TabularInline):
-    model = TocEntry
-    min_num = 0
-    extra = 0
-    fields = (
-        "title",
-        "subtitle",
-        "authors",
-        "page",
-        "featured",
-    )
-
-
 @admin.register(Book)
 class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
-        BookTocInline,
         BookPropertyInline,
         BookImageInline,
         BookDocInline,
@@ -96,12 +66,7 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     autocomplete_fields = ("authors", "publisher", "shop")
     readonly_fields = ("invoices", "creation_time", "updated_time")
     search_fields = ("title", "publisher__name", "authors__last_name")
-    list_filter = ("publisher__name", "authors", "published")
+    list_filter = ("publisher__name", "authors")
-
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.with_related()
 
     fieldsets = (
         (
@@ -159,9 +124,9 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     def invoices(self, obj):
         if obj.invoice.exists():
             html = format_html_join(
-                mark_safe("<br>"),
+                "<br>",
-                '<a href="{}" target="_blank">{}</a>',
+                "<a href=\"{}\" target=\"_blank\">{}</a>",
-                ((i.file.url, i) for i in obj.invoice.all()),
+                ((i.file.url, i) for i in obj.invoice.all())
             )
         else:
             html = "-"
@@ -194,12 +159,6 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
         ]
 
         data = []
-
-        # Prefetch related data to avoid N+1 queries
-        queryset = queryset.select_related(
-            'publisher', 'shop'
-        ).prefetch_related('authors', 'tags', 'property__property')
-
         for obj in queryset:
             properties = settings.CSV_SEPARATOR_ALT.join(
                 "{}:{}".format(property.property.name, property.value)
@@ -243,11 +202,11 @@ class AuthorAdmin(admin.ModelAdmin):
 
 @admin.register(Publisher)
 class PublisherAdmin(admin.ModelAdmin):
-    list_display = ("name", "country_flag_name")
+    list_display = ("name", "country_flag")
     search_fields = ("name",)
 
     @admin.display(description="Country")
-    def country_flag_name(self, obj):
+    def country_flag(self, obj):
         return format_html(
             '<img src="{}" /> {}', obj.country.flag, obj.country.name
         )
@@ -270,17 +229,7 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
     autocomplete_fields = ("manufacturer",)
     readonly_fields = ("invoices", "creation_time", "updated_time")
     search_fields = ("manufacturer__name", "years", "scales__scale")
-    list_filter = (
+    list_filter = ("manufacturer__name", "publication_year", "scales__scale")
-        "published",
-        "manufacturer__name",
-        "publication_year",
-        "scales__scale",
-    )
-
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.with_related()
 
     fieldsets = (
         (
@@ -338,9 +287,9 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
     def invoices(self, obj):
         if obj.invoice.exists():
             html = format_html_join(
-                mark_safe("<br>"),
+                "<br>",
-                '<a href="{}" target="_blank">{}</a>',
+                "<a href=\"{}\" target=\"_blank\">{}</a>",
-                ((i.file.url, i) for i in obj.invoice.all()),
+                ((i.file.url, i) for i in obj.invoice.all())
             )
         else:
             html = "-"
@@ -366,12 +315,6 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
         ]
 
         data = []
-
-        # Prefetch related data to avoid N+1 queries
-        queryset = queryset.select_related(
-            'manufacturer', 'shop'
-        ).prefetch_related('scales', 'tags', 'property__property')
-
         for obj in queryset:
             properties = settings.CSV_SEPARATOR_ALT.join(
                 "{}:{}".format(property.property.name, property.value)
@@ -403,150 +346,3 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
 
     download_csv.short_description = "Download selected items as CSV"
     actions = [publish, unpublish, download_csv]
-
-
-@admin.register(MagazineIssue)
-class MagazineIssueAdmin(SortableAdminBase, admin.ModelAdmin):
-    inlines = (
-        BookTocInline,
-        BookPropertyInline,
-        BookImageInline,
-        MagazineIssueDocInline,
-    )
-    list_display = (
-        "__str__",
-        "issue_number",
-        "published",
-    )
-    autocomplete_fields = ("shop",)
-    readonly_fields = ("magazine", "creation_time", "updated_time")
-
-    def get_model_perms(self, request):
-        """
-        Return empty perms dict thus hiding the model from admin index.
-        """
-        return {}
-
-    fieldsets = (
-        (
-            None,
-            {
-                "fields": (
-                    "published",
-                    "magazine",
-                    "issue_number",
-                    "publication_year",
-                    "publication_month",
-                    "ISBN",
-                    "language",
-                    "number_of_pages",
-                    "description",
-                    "tags",
-                )
-            },
-        ),
-        (
-            "Purchase data",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "shop",
-                    "purchase_date",
-                    "price",
-                ),
-            },
-        ),
-        (
-            "Notes",
-            {"classes": ("collapse",), "fields": ("notes",)},
-        ),
-        (
-            "Audit",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "creation_time",
-                    "updated_time",
-                ),
-            },
-        ),
-    )
-    actions = [publish, unpublish]
-
-
-class MagazineIssueInline(admin.TabularInline):
-    model = MagazineIssue
-    min_num = 0
-    extra = 0
-    autocomplete_fields = ("shop",)
-    show_change_link = True
-    fields = (
-        "preview",
-        "published",
-        "issue_number",
-        "publication_year",
-        "publication_month",
-        "number_of_pages",
-        "language",
-    )
-    readonly_fields = ("preview",)
-
-    class Media:
-        js = ("admin/js/magazine_issue_defaults.js",)
-
-
-@admin.register(Magazine)
-class MagazineAdmin(SortableAdminBase, admin.ModelAdmin):
-    inlines = (MagazineIssueInline,)
-
-    list_display = (
-        "__str__",
-        "publisher",
-        "published",
-    )
-    autocomplete_fields = ("publisher",)
-    readonly_fields = ("creation_time", "updated_time")
-    search_fields = ("name", "publisher__name")
-    list_filter = (
-        "published",
-        "publisher__name",
-    )
-
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.select_related('publisher').prefetch_related('tags')
-
-    fieldsets = (
-        (
-            None,
-            {
-                "fields": (
-                    "published",
-                    "name",
-                    "website",
-                    "publisher",
-                    "ISBN",
-                    "language",
-                    "description",
-                    "image",
-                    "tags",
-                )
-            },
-        ),
-        (
-            "Notes",
-            {"classes": ("collapse",), "fields": ("notes",)},
-        ),
-        (
-            "Audit",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "creation_time",
-                    "updated_time",
-                ),
-            },
-        ),
-    )
-    actions = [publish, unpublish]

ram/bookshelf/migrations/0025_magazine_magazineissue.py

@@ -1,224 +0,0 @@
-# Generated by Django 6.0 on 2025-12-08 17:47
-
-import bookshelf.models
-import django.db.models.deletion
-import ram.utils
-import tinymce.models
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0024_alter_basebook_language"),
-        ("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Magazine",
-            fields=[
-                (
-                    "uuid",
-                    models.UUIDField(
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                    ),
-                ),
-                ("description", tinymce.models.HTMLField(blank=True)),
-                ("notes", tinymce.models.HTMLField(blank=True)),
-                ("creation_time", models.DateTimeField(auto_now_add=True)),
-                ("updated_time", models.DateTimeField(auto_now=True)),
-                ("published", models.BooleanField(default=True)),
-                ("name", models.CharField(max_length=200)),
-                ("ISBN", models.CharField(blank=True, max_length=17)),
-                (
-                    "image",
-                    models.ImageField(
-                        blank=True,
-                        storage=ram.utils.DeduplicatedStorage,
-                        upload_to=bookshelf.models.book_image_upload,
-                    ),
-                ),
-                (
-                    "language",
-                    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"),
-                            ("ht", "Haitian Creole"),
-                            ("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"),
-                            ("ug", "Uyghur"),
-                            ("uk", "Ukrainian"),
-                            ("ur", "Urdu"),
-                            ("uz", "Uzbek"),
-                            ("vi", "Vietnamese"),
-                            ("zh-hans", "Simplified Chinese"),
-                            ("zh-hant", "Traditional Chinese"),
-                        ],
-                        default="en",
-                        max_length=7,
-                    ),
-                ),
-                (
-                    "publisher",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="bookshelf.publisher",
-                    ),
-                ),
-                (
-                    "tags",
-                    models.ManyToManyField(
-                        blank=True, related_name="magazine", to="metadata.tag"
-                    ),
-                ),
-            ],
-            options={
-                "ordering": ["name"],
-            },
-        ),
-        migrations.CreateModel(
-            name="MagazineIssue",
-            fields=[
-                (
-                    "basebook_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="bookshelf.basebook",
-                    ),
-                ),
-                ("issue_number", models.CharField(max_length=100)),
-                (
-                    "publication_month",
-                    models.SmallIntegerField(
-                        blank=True,
-                        choices=[
-                            (1, "January"),
-                            (2, "February"),
-                            (3, "March"),
-                            (4, "April"),
-                            (5, "May"),
-                            (6, "June"),
-                            (7, "July"),
-                            (8, "August"),
-                            (9, "September"),
-                            (10, "October"),
-                            (11, "November"),
-                            (12, "December"),
-                        ],
-                        null=True,
-                    ),
-                ),
-                (
-                    "magazine",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="issue",
-                        to="bookshelf.magazine",
-                    ),
-                ),
-            ],
-            options={
-                "ordering": ["magazine", "issue_number"],
-                "unique_together": {("magazine", "issue_number")},
-            },
-            bases=("bookshelf.basebook",),
-        ),
-    ]

ram/bookshelf/migrations/0026_alter_basebook_language_alter_magazine_image_and_more.py

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

ram/bookshelf/migrations/0027_magazine_website.py

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

ram/bookshelf/migrations/0028_alter_magazine_options_alter_magazineissue_options.py

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

ram/bookshelf/migrations/0029_alter_catalog_manufacturer_alter_catalog_scales.py

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

ram/bookshelf/migrations/0030_tocentry.py

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

ram/bookshelf/migrations/0031_alter_tocentry_authors_alter_tocentry_subtitle_and_more.py

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

ram/bookshelf/migrations/0032_book_book_title_idx_catalog_catalog_mfr_idx_and_more.py

@@ -1,43 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-18 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0031_alter_tocentry_authors_alter_tocentry_subtitle_and_more"),
-        (
-            "metadata",
-            "0027_company_company_slug_idx_company_company_country_idx_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name="book",
-            index=models.Index(fields=["title"], name="book_title_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="catalog",
-            index=models.Index(fields=["manufacturer"], name="catalog_mfr_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazine",
-            index=models.Index(fields=["published"], name="magazine_published_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazine",
-            index=models.Index(fields=["name"], name="magazine_name_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazineissue",
-            index=models.Index(fields=["magazine"], name="mag_issue_mag_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazineissue",
-            index=models.Index(
-                fields=["publication_month"], name="mag_issue_pub_month_idx"
-            ),
-        ),
-    ]

ram/bookshelf/models.py

@@ -1,17 +1,12 @@
 import os
 import shutil
-from urllib.parse import urlparse
 from django.db import models
 from django.conf import settings
 from django.urls import reverse
-from django.utils.dates import MONTHS
-from django.db.models.functions import Lower
-from django.core.exceptions import ValidationError
 from django_countries.fields import CountryField
 
 from ram.utils import DeduplicatedStorage
 from ram.models import BaseModel, Image, PropertyInstance
-from ram.managers import BookManager, CatalogManager, MagazineIssueManager
 from metadata.models import Scale, Manufacturer, Shop, Tag
 
 
@@ -46,8 +41,8 @@ class BaseBook(BaseModel):
     ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
     language = models.CharField(
         max_length=7,
-        choices=sorted(settings.LANGUAGES, key=lambda s: s[1]),
+        choices=settings.LANGUAGES,
-        default="en",
+        default='en'
     )
     number_of_pages = models.SmallIntegerField(null=True, blank=True)
     publication_year = models.SmallIntegerField(null=True, blank=True)
@@ -61,24 +56,27 @@ class BaseBook(BaseModel):
         blank=True,
     )
     purchase_date = models.DateField(null=True, blank=True)
-    tags = models.ManyToManyField(Tag, related_name="bookshelf", blank=True)
+    tags = models.ManyToManyField(
+        Tag, related_name="bookshelf", blank=True
+    )
 
     def delete(self, *args, **kwargs):
         shutil.rmtree(
             os.path.join(
                 settings.MEDIA_ROOT, "images", "books", str(self.uuid)
             ),
-            ignore_errors=True,
+            ignore_errors=True
         )
         super(BaseBook, self).delete(*args, **kwargs)
 
 
 def book_image_upload(instance, filename):
-    return os.path.join("images", "books", str(instance.book.uuid), filename)
+    return os.path.join(
-
+        "images",
-
+        "books",
-def magazine_image_upload(instance, filename):
+        str(instance.book.uuid),
-    return os.path.join("images", "magazines", str(instance.uuid), filename)
+        filename
+    )
 
 
 class BaseBookImage(Image):
@@ -106,16 +104,8 @@ class Book(BaseBook):
     authors = models.ManyToManyField(Author, blank=True)
     publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
 
-    objects = BookManager()
-
     class Meta:
         ordering = ["title"]
-        indexes = [
-            # Index for title searches (local field)
-            models.Index(fields=["title"], name="book_title_idx"),
-            # Note: published and publication_year are inherited from BaseBook/BaseModel
-            # and cannot be indexed here due to multi-table inheritance
-        ]
 
     def __str__(self):
         return self.title
@@ -130,7 +120,8 @@ class Book(BaseBook):
 
     def get_absolute_url(self):
         return reverse(
-            "bookshelf_item", kwargs={"selector": "book", "uuid": self.uuid}
+            "bookshelf_item",
+            kwargs={"selector": "book", "uuid": self.uuid}
         )
 
 
@@ -138,23 +129,12 @@ class Catalog(BaseBook):
     manufacturer = models.ForeignKey(
         Manufacturer,
         on_delete=models.CASCADE,
-        related_name="catalogs",
     )
     years = models.CharField(max_length=12)
-    scales = models.ManyToManyField(Scale, related_name="catalogs")
+    scales = models.ManyToManyField(Scale)
-
-    objects = CatalogManager()
 
     class Meta:
         ordering = ["manufacturer", "publication_year"]
-        indexes = [
-            # Index for manufacturer filtering (local field)
-            models.Index(
-                fields=["manufacturer"], name="catalog_mfr_idx"
-            ),
-            # Note: published and publication_year are inherited from BaseBook/BaseModel
-            # and cannot be indexed here due to multi-table inheritance
-        ]
 
     def __str__(self):
         # if the object is new, return an empty string to avoid
@@ -166,161 +146,10 @@ class Catalog(BaseBook):
 
     def get_absolute_url(self):
         return reverse(
-            "bookshelf_item", kwargs={"selector": "catalog", "uuid": self.uuid}
+            "bookshelf_item",
+            kwargs={"selector": "catalog", "uuid": self.uuid}
         )
 
     def get_scales(self):
         return "/".join([s.scale for s in self.scales.all()])
-
     get_scales.short_description = "Scales"
-
-
-class Magazine(BaseModel):
-    name = models.CharField(max_length=200)
-    publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
-    website = models.URLField(blank=True)
-    ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
-    image = models.ImageField(
-        blank=True,
-        upload_to=magazine_image_upload,
-        storage=DeduplicatedStorage,
-    )
-    language = models.CharField(
-        max_length=7,
-        choices=sorted(settings.LANGUAGES, key=lambda s: s[1]),
-        default="en",
-    )
-    tags = models.ManyToManyField(Tag, related_name="magazine", blank=True)
-
-    def delete(self, *args, **kwargs):
-        shutil.rmtree(
-            os.path.join(
-                settings.MEDIA_ROOT, "images", "magazines", str(self.uuid)
-            ),
-            ignore_errors=True,
-        )
-        super(Magazine, self).delete(*args, **kwargs)
-
-    class Meta:
-        ordering = [Lower("name")]
-        indexes = [
-            # Index for published filtering
-            models.Index(fields=["published"], name="magazine_published_idx"),
-            # Index for name searches (case-insensitive via db_collation if needed)
-            models.Index(fields=["name"], name="magazine_name_idx"),
-        ]
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse("magazine", kwargs={"uuid": self.uuid})
-
-    def get_cover(self):
-        if self.image:
-            return self.image
-        else:
-            cover_issue = self.issue.filter(published=True).first()
-            if cover_issue and cover_issue.image.exists():
-                return cover_issue.image.first().image
-        return None
-
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
-
-
-class MagazineIssue(BaseBook):
-    magazine = models.ForeignKey(
-        Magazine, on_delete=models.CASCADE, related_name="issue"
-    )
-    issue_number = models.CharField(max_length=100)
-    publication_month = models.SmallIntegerField(
-        null=True, blank=True, choices=MONTHS.items()
-    )
-
-    objects = MagazineIssueManager()
-
-    class Meta:
-        unique_together = ("magazine", "issue_number")
-        ordering = [
-            "magazine",
-            "publication_year",
-            "publication_month",
-            "issue_number",
-        ]
-        indexes = [
-            # Index for magazine filtering (local field)
-            models.Index(fields=["magazine"], name="mag_issue_mag_idx"),
-            # Index for publication month (local field)
-            models.Index(
-                fields=["publication_month"],
-                name="mag_issue_pub_month_idx",
-            ),
-            # Note: published and publication_year are inherited from BaseBook/BaseModel
-            # and cannot be indexed here due to multi-table inheritance
-        ]
-
-    def __str__(self):
-        return f"{self.magazine.name} - {self.issue_number}"
-
-    def clean(self):
-        if self.magazine.published is False and self.published is True:
-            raise ValidationError(
-                "Cannot set an issue as published if the magazine is not "
-                "published."
-            )
-
-    @property
-    def obj_label(self):
-        return "Magazine Issue"
-
-    def preview(self):
-        return self.image.first().image_thumbnail(100)
-
-    @property
-    def publisher(self):
-        return self.magazine.publisher
-
-    def get_absolute_url(self):
-        return reverse(
-            "issue", kwargs={"uuid": self.uuid, "magazine": self.magazine.uuid}
-        )
-
-
-class TocEntry(BaseModel):
-    book = models.ForeignKey(
-        BaseBook, on_delete=models.CASCADE, related_name="toc"
-    )
-    title = models.CharField()
-    subtitle = models.CharField(blank=True)
-    authors = models.CharField(blank=True)
-    page = models.SmallIntegerField()
-    featured = models.BooleanField(
-        default=False,
-    )
-
-    class Meta:
-        ordering = ["page"]
-        verbose_name = "Table of Contents Entry"
-        verbose_name_plural = "Table of Contents Entries"
-
-    def __str__(self):
-        if self.subtitle:
-            title = f"{self.title}: {self.subtitle}"
-        else:
-            title = self.title
-        return f"{title} (p. {self.page})"
-
-    def clean(self):
-        if self.page is None:
-            raise ValidationError("Page number is required.")
-        if self.page < 1:
-            raise ValidationError("Page number is invalid.")
-        try:
-            if self.page > self.book.number_of_pages:
-                raise ValidationError(
-                    "Page number exceeds the publication's number of pages."
-                )
-        except TypeError:
-            pass  # number_of_pages is None

ram/bookshelf/serializers.py

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

ram/bookshelf/static/admin/js/magazine_issue_defaults.js

@@ -1,16 +0,0 @@
-document.addEventListener('formset:added', function(event) {
-  const newForm = event.target; // the new inline form element
-
-  const defaultLanguage = document.querySelector('#id_language').value;
-  const defaultStatus = document.querySelector('#id_published').checked;
-
-  const languageInput = newForm.querySelector('select[name$="language"]');
-  const statusInput = newForm.querySelector('input[name$="published"]');
-
-  if (languageInput) {
-      languageInput.value = defaultLanguage;
-  }
-  if (statusInput) {
-    statusInput.checked = defaultStatus;
-  }
-});

ram/bookshelf/tests.py

@@ -1,436 +1,3 @@
-from decimal import Decimal
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
-from bookshelf.models import (
+# Create your tests here.
-    Author,
-    Publisher,
-    Book,
-    Catalog,
-    Magazine,
-    MagazineIssue,
-    TocEntry,
-)
-from metadata.models import Manufacturer, Scale
-
-
-class AuthorTestCase(TestCase):
-    """Test cases for Author model."""
-
-    def test_author_creation(self):
-        """Test creating an author."""
-        author = Author.objects.create(
-            first_name="John",
-            last_name="Smith",
-        )
-
-        self.assertEqual(str(author), "Smith, John")
-        self.assertEqual(author.first_name, "John")
-        self.assertEqual(author.last_name, "Smith")
-
-    def test_author_short_name(self):
-        """Test author short name property."""
-        author = Author.objects.create(
-            first_name="John",
-            last_name="Smith",
-        )
-
-        self.assertEqual(author.short_name, "Smith J.")
-
-    def test_author_ordering(self):
-        """Test author ordering by last name, first name."""
-        a1 = Author.objects.create(first_name="John", last_name="Smith")
-        a2 = Author.objects.create(first_name="Jane", last_name="Doe")
-        a3 = Author.objects.create(first_name="Bob", last_name="Smith")
-
-        authors = list(Author.objects.all())
-        self.assertEqual(authors[0], a2)  # Doe comes first
-        self.assertEqual(authors[1], a3)  # Smith, Bob
-        self.assertEqual(authors[2], a1)  # Smith, John
-
-
-class PublisherTestCase(TestCase):
-    """Test cases for Publisher model."""
-
-    def test_publisher_creation(self):
-        """Test creating a publisher."""
-        publisher = Publisher.objects.create(
-            name="Model Railroader",
-            country="US",
-            website="https://www.modelrailroader.com",
-        )
-
-        self.assertEqual(str(publisher), "Model Railroader")
-        self.assertEqual(publisher.country.code, "US")
-
-    def test_publisher_ordering(self):
-        """Test publisher ordering by name."""
-        p1 = Publisher.objects.create(name="Zebra Publishing")
-        p2 = Publisher.objects.create(name="Alpha Books")
-        p3 = Publisher.objects.create(name="Model Railroader")
-
-        publishers = list(Publisher.objects.all())
-        self.assertEqual(publishers[0], p2)
-        self.assertEqual(publishers[1], p3)
-        self.assertEqual(publishers[2], p1)
-
-
-class BookTestCase(TestCase):
-    """Test cases for Book model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.publisher = Publisher.objects.create(
-            name="Kalmbach Publishing",
-            country="US",
-        )
-
-        self.author = Author.objects.create(
-            first_name="Tony",
-            last_name="Koester",
-        )
-
-    def test_book_creation(self):
-        """Test creating a book."""
-        book = Book.objects.create(
-            title="Model Railroad Planning",
-            publisher=self.publisher,
-            ISBN="978-0-89024-567-8",
-            language="en",
-            number_of_pages=128,
-            publication_year=2010,
-            price=Decimal("24.95"),
-        )
-
-        self.assertEqual(str(book), "Model Railroad Planning")
-        self.assertEqual(book.publisher_name, "Kalmbach Publishing")
-        self.assertTrue(book.published)  # Default from BaseModel
-
-    def test_book_authors_relationship(self):
-        """Test many-to-many relationship with authors."""
-        book = Book.objects.create(
-            title="Test Book",
-            publisher=self.publisher,
-        )
-
-        author2 = Author.objects.create(
-            first_name="John",
-            last_name="Doe",
-        )
-
-        book.authors.add(self.author, author2)
-
-        self.assertEqual(book.authors.count(), 2)
-        self.assertIn(self.author, book.authors.all())
-
-    def test_book_authors_list_property(self):
-        """Test authors_list property."""
-        book = Book.objects.create(
-            title="Test Book",
-            publisher=self.publisher,
-        )
-
-        book.authors.add(self.author)
-
-        self.assertEqual(book.authors_list, "Koester T.")
-
-    def test_book_ordering(self):
-        """Test book ordering by title."""
-        b1 = Book.objects.create(
-            title="Zebra Book",
-            publisher=self.publisher,
-        )
-        b2 = Book.objects.create(
-            title="Alpha Book",
-            publisher=self.publisher,
-        )
-
-        books = list(Book.objects.all())
-        self.assertEqual(books[0], b2)
-        self.assertEqual(books[1], b1)
-
-
-class CatalogTestCase(TestCase):
-    """Test cases for Catalog model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.manufacturer = Manufacturer.objects.create(
-            name="Bachmann",
-            category="model",
-            country="US",
-        )
-
-        self.scale_ho = Scale.objects.create(
-            scale="HO",
-            ratio="1:87",
-            tracks=16.5,
-        )
-
-        self.scale_n = Scale.objects.create(
-            scale="N",
-            ratio="1:160",
-            tracks=9.0,
-        )
-
-    def test_catalog_creation(self):
-        """Test creating a catalog."""
-        catalog = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2023",
-            publication_year=2023,
-        )
-        catalog.scales.add(self.scale_ho)
-
-        # Refresh to get the correct string representation
-        catalog.refresh_from_db()
-
-        self.assertIn("Bachmann", str(catalog))
-        self.assertIn("2023", str(catalog))
-
-    def test_catalog_multiple_scales(self):
-        """Test catalog with multiple scales."""
-        catalog = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2023",
-        )
-
-        catalog.scales.add(self.scale_ho, self.scale_n)
-
-        scales_str = catalog.get_scales()
-        self.assertIn("HO", scales_str)
-        self.assertIn("N", scales_str)
-
-    def test_catalog_ordering(self):
-        """Test catalog ordering by manufacturer and year."""
-        man2 = Manufacturer.objects.create(
-            name="Atlas",
-            category="model",
-        )
-
-        c1 = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2023",
-            publication_year=2023,
-        )
-        c2 = Catalog.objects.create(
-            manufacturer=man2,
-            years="2023",
-            publication_year=2023,
-        )
-        c3 = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2022",
-            publication_year=2022,
-        )
-
-        catalogs = list(Catalog.objects.all())
-        # Should be ordered by manufacturer name, then year
-        self.assertEqual(catalogs[0], c2)  # Atlas
-
-
-class MagazineTestCase(TestCase):
-    """Test cases for Magazine model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.publisher = Publisher.objects.create(
-            name="Kalmbach Publishing",
-            country="US",
-        )
-
-    def test_magazine_creation(self):
-        """Test creating a magazine."""
-        magazine = Magazine.objects.create(
-            name="Model Railroader",
-            publisher=self.publisher,
-            website="https://www.modelrailroader.com",
-            ISBN="0746-9896",
-            language="en",
-        )
-
-        self.assertEqual(str(magazine), "Model Railroader")
-        self.assertEqual(magazine.publisher, self.publisher)
-
-    def test_magazine_website_short(self):
-        """Test website_short method."""
-        magazine = Magazine.objects.create(
-            name="Model Railroader",
-            publisher=self.publisher,
-            website="https://www.modelrailroader.com",
-        )
-
-        self.assertEqual(magazine.website_short(), "modelrailroader.com")
-
-    def test_magazine_get_cover_no_image(self):
-        """Test get_cover when magazine has no image."""
-        magazine = Magazine.objects.create(
-            name="Test Magazine",
-            publisher=self.publisher,
-        )
-
-        # Should return None if no cover image exists
-        self.assertIsNone(magazine.get_cover())
-
-
-class MagazineIssueTestCase(TestCase):
-    """Test cases for MagazineIssue model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.publisher = Publisher.objects.create(
-            name="Kalmbach Publishing",
-        )
-
-        self.magazine = Magazine.objects.create(
-            name="Model Railroader",
-            publisher=self.publisher,
-            published=True,
-        )
-
-    def test_magazine_issue_creation(self):
-        """Test creating a magazine issue."""
-        issue = MagazineIssue.objects.create(
-            magazine=self.magazine,
-            issue_number="January 2023",
-            publication_year=2023,
-            publication_month=1,
-            number_of_pages=96,
-        )
-
-        self.assertEqual(str(issue), "Model Railroader - January 2023")
-        self.assertEqual(issue.obj_label, "Magazine Issue")
-
-    def test_magazine_issue_unique_together(self):
-        """Test that magazine+issue_number must be unique."""
-        MagazineIssue.objects.create(
-            magazine=self.magazine,
-            issue_number="January 2023",
-        )
-
-        with self.assertRaises(IntegrityError):
-            MagazineIssue.objects.create(
-                magazine=self.magazine,
-                issue_number="January 2023",
-            )
-
-    def test_magazine_issue_validation(self):
-        """Test that published issue requires published magazine."""
-        unpublished_magazine = Magazine.objects.create(
-            name="Unpublished Magazine",
-            publisher=self.publisher,
-            published=False,
-        )
-
-        issue = MagazineIssue(
-            magazine=unpublished_magazine,
-            issue_number="Test Issue",
-            published=True,
-        )
-
-        with self.assertRaises(ValidationError):
-            issue.clean()
-
-    def test_magazine_issue_publisher_property(self):
-        """Test that issue inherits publisher from magazine."""
-        issue = MagazineIssue.objects.create(
-            magazine=self.magazine,
-            issue_number="January 2023",
-        )
-
-        self.assertEqual(issue.publisher, self.publisher)
-
-
-class TocEntryTestCase(TestCase):
-    """Test cases for TocEntry model."""
-
-    def setUp(self):
-        """Set up test data."""
-        publisher = Publisher.objects.create(name="Test Publisher")
-
-        self.book = Book.objects.create(
-            title="Test Book",
-            publisher=publisher,
-            number_of_pages=200,
-        )
-
-    def test_toc_entry_creation(self):
-        """Test creating a table of contents entry."""
-        entry = TocEntry.objects.create(
-            book=self.book,
-            title="Introduction to Model Railroading",
-            subtitle="Getting Started",
-            authors="John Doe",
-            page=10,
-        )
-
-        self.assertIn("Introduction to Model Railroading", str(entry))
-        self.assertIn("Getting Started", str(entry))
-        self.assertIn("p. 10", str(entry))
-
-    def test_toc_entry_without_subtitle(self):
-        """Test TOC entry without subtitle."""
-        entry = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter One",
-            page=5,
-        )
-
-        self.assertEqual(str(entry), "Chapter One (p. 5)")
-
-    def test_toc_entry_page_validation_required(self):
-        """Test that page number is required."""
-        entry = TocEntry(
-            book=self.book,
-            title="Test Entry",
-            page=None,
-        )
-
-        with self.assertRaises(ValidationError):
-            entry.clean()
-
-    def test_toc_entry_page_validation_min(self):
-        """Test that page number must be >= 1."""
-        entry = TocEntry(
-            book=self.book,
-            title="Test Entry",
-            page=0,
-        )
-
-        with self.assertRaises(ValidationError):
-            entry.clean()
-
-    def test_toc_entry_page_validation_exceeds_book(self):
-        """Test that page number cannot exceed book's page count."""
-        entry = TocEntry(
-            book=self.book,
-            title="Test Entry",
-            page=250,  # Book has 200 pages
-        )
-
-        with self.assertRaises(ValidationError):
-            entry.clean()
-
-    def test_toc_entry_ordering(self):
-        """Test TOC entries are ordered by page number."""
-        e1 = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter Three",
-            page=30,
-        )
-        e2 = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter One",
-            page=10,
-        )
-        e3 = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter Two",
-            page=20,
-        )
-
-        entries = list(TocEntry.objects.all())
-        self.assertEqual(entries[0], e2)  # Page 10
-        self.assertEqual(entries[1], e3)  # Page 20
-        self.assertEqual(entries[2], e1)  # Page 30

ram/bookshelf/views.py

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

ram/consist/admin.py

@@ -2,7 +2,6 @@ import html
 
 from django.conf import settings
 from django.contrib import admin
-
 # from django.forms import BaseInlineFormSet  # for future reference
 from django.utils.html import format_html, strip_tags
 from adminsortable2.admin import (
@@ -47,27 +46,15 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
         "creation_time",
         "updated_time",
     )
-    list_filter = ("published", "company__name", "era", "scale__scale")
+    list_filter = ("company__name", "era", "scale", "published")
-    list_display = (
+    list_display = ("__str__",) + list_filter + ("country_flag",)
-        "__str__",
-        "company__name",
-        "era",
-        "scale",
-        "country_flag",
-        "published",
-    )
     search_fields = ("identifier",) + list_filter
     save_as = True
 
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.with_related()
-
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" title="{}" />', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}', obj.country.flag, obj.country
         )
 
     fieldsets = (
@@ -122,27 +109,12 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
             "Item ID",
         ]
         data = []
-
-        # Prefetch related data to avoid N+1 queries
-        queryset = queryset.select_related(
-            'company', 'scale'
-        ).prefetch_related(
-            'tags',
-            'consist_item__rolling_stock__rolling_class__type'
-        )
-
         for obj in queryset:
-            # Cache the type count to avoid recalculating for each item
-            types = " + ".join(
-                "{}x {}".format(t["count"], t["type"])
-                for t in obj.get_type_count()
-            )
-            # Cache tags to avoid repeated queries
-            tags_str = settings.CSV_SEPARATOR_ALT.join(
-                t.name for t in obj.tags.all()
-            )
-
             for item in obj.consist_item.all():
+                types = " + ".join(
+                    "{}x {}".format(t["count"], t["type"])
+                    for t in obj.get_type_count()
+                )
                 data.append(
                     [
                         obj.uuid,
@@ -154,7 +126,9 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
                         obj.scale.scale,
                         obj.era,
                         html.unescape(strip_tags(obj.description)),
-                        tags_str,
+                        settings.CSV_SEPARATOR_ALT.join(
+                            t.name for t in obj.tags.all()
+                        ),
                         obj.length,
                         types,
                         item.rolling_stock.__str__(),
@@ -164,7 +138,6 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
                 )
 
         return generate_csv(header, data, "consists.csv")
-
     download_csv.short_description = "Download selected items as CSV"
 
     actions = [publish, unpublish, download_csv]

ram/consist/migrations/0019_consistitem_load.py

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

ram/consist/migrations/0020_consist_consist_published_idx_and_more.py

@@ -1,50 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-18 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0019_consistitem_load"),
-        (
-            "metadata",
-            "0027_company_company_slug_idx_company_company_country_idx_and_more",
-        ),
-        ("roster", "0041_rollingclass_roster_rc_company_idx_and_more"),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(fields=["published"], name="consist_published_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(fields=["scale"], name="consist_scale_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(fields=["company"], name="consist_company_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(
-                fields=["published", "scale"], name="consist_pub_scale_idx"
-            ),
-        ),
-        migrations.AddIndex(
-            model_name="consistitem",
-            index=models.Index(fields=["load"], name="consist_item_load_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consistitem",
-            index=models.Index(fields=["order"], name="consist_item_order_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consistitem",
-            index=models.Index(
-                fields=["consist", "load"], name="consist_item_con_load_idx"
-            ),
-        ),
-    ]

ram/consist/models.py

@@ -8,7 +8,6 @@ from django.core.exceptions import ValidationError
 
 from ram.models import BaseModel
 from ram.utils import DeduplicatedStorage
-from ram.managers import ConsistManager
 from metadata.models import Company, Scale, Tag
 from roster.models import RollingStock
 
@@ -36,8 +35,6 @@ class Consist(BaseModel):
         blank=True,
     )
 
-    objects = ConsistManager()
-
     def __str__(self):
         return "{0} {1}".format(self.company, self.identifier)
 
@@ -46,15 +43,10 @@ class Consist(BaseModel):
 
     @property
     def length(self):
-        return self.consist_item.filter(load=False).count()
+        return self.consist_item.count()
-
-    @property
-    def loads_count(self):
-        """Count of loads in this consist using database aggregation."""
-        return self.consist_item.filter(load=True).count()
 
     def get_type_count(self):
-        return self.consist_item.filter(load=False).annotate(
+        return self.consist_item.annotate(
             type=models.F("rolling_stock__rolling_class__type__type")
         ).values(
             "type"
@@ -64,33 +56,12 @@ class Consist(BaseModel):
             order=models.Max("order"),
         ).order_by("order")
 
-    def get_cover(self):
-        if self.image:
-            return self.image
-        else:
-            consist_item = self.consist_item.first()
-            if consist_item and consist_item.rolling_stock.image.exists():
-                return consist_item.rolling_stock.image.first().image
-        return None
-
     @property
     def country(self):
         return self.company.country
 
     class Meta:
         ordering = ["company", "-creation_time"]
-        indexes = [
-            # Index for published filtering
-            models.Index(fields=["published"], name="consist_published_idx"),
-            # Index for scale filtering
-            models.Index(fields=["scale"], name="consist_scale_idx"),
-            # Index for company filtering
-            models.Index(fields=["company"], name="consist_company_idx"),
-            # Composite index for published+scale filtering
-            models.Index(
-                fields=["published", "scale"], name="consist_pub_scale_idx"
-            ),
-        ]
 
 
 class ConsistItem(models.Model):
@@ -98,7 +69,6 @@ class ConsistItem(models.Model):
         Consist, on_delete=models.CASCADE, related_name="consist_item"
     )
     rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
-    load = models.BooleanField(default=False)
     order = models.PositiveIntegerField(blank=False, null=False)
 
     class Meta:
@@ -106,19 +76,9 @@ class ConsistItem(models.Model):
         constraints = [
             models.UniqueConstraint(
                 fields=["consist", "rolling_stock"],
-                name="one_stock_per_consist",
+                name="one_stock_per_consist"
             )
         ]
-        indexes = [
-            # Index for filtering by load status
-            models.Index(fields=["load"], name="consist_item_load_idx"),
-            # Index for ordering
-            models.Index(fields=["order"], name="consist_item_order_idx"),
-            # Composite index for consist+load filtering
-            models.Index(
-                fields=["consist", "load"], name="consist_item_con_load_idx"
-            ),
-        ]
 
     def __str__(self):
         return "{0}".format(self.rolling_stock)
@@ -132,15 +92,10 @@ class ConsistItem(models.Model):
         # because the consist is not saved yet and it must be moved
         # to the admin form validation via InlineFormSet.clean()
         consist = self.consist
-        # Scale must match, but allow loads of any scale
+        if rolling_stock.scale != consist.scale:
-        if rolling_stock.scale != consist.scale and not self.load:
             raise ValidationError(
                 "The rolling stock and consist must be of the same scale."
             )
-        if self.load and rolling_stock.scale.ratio != consist.scale.ratio:
-            raise ValidationError(
-                "The load and consist must be of the same scale ratio."
-            )
         if self.consist.published and not rolling_stock.published:
             raise ValidationError(
                 "You must unpublish the the consist before using this item."

ram/consist/tests.py

@@ -1,315 +1,3 @@
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
-from consist.models import Consist, ConsistItem
+# Create your tests here.
-from roster.models import RollingClass, RollingStock
-from metadata.models import Company, Scale, RollingStockType
-
-
-class ConsistTestCase(TestCase):
-    """Test cases for Consist model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.company = Company.objects.create(
-            name="Rio Grande Southern",
-            country="US",
-        )
-
-        self.scale = Scale.objects.create(
-            scale="HOn3",
-            ratio="1:87",
-            tracks=10.5,
-        )
-
-    def test_consist_creation(self):
-        """Test creating a consist."""
-        consist = Consist.objects.create(
-            identifier="RGS Freight #1",
-            company=self.company,
-            scale=self.scale,
-            era="1930s",
-        )
-
-        self.assertEqual(str(consist), "Rio Grande Southern RGS Freight #1")
-        self.assertEqual(consist.identifier, "RGS Freight #1")
-        self.assertEqual(consist.era, "1930s")
-
-    def test_consist_country_property(self):
-        """Test that consist inherits country from company."""
-        consist = Consist.objects.create(
-            identifier="Test Consist",
-            company=self.company,
-            scale=self.scale,
-        )
-
-        self.assertEqual(consist.country, self.company.country)
-
-    def test_consist_dcc_address(self):
-        """Test consist with DCC address."""
-        consist = Consist.objects.create(
-            identifier="DCC Consist",
-            company=self.company,
-            scale=self.scale,
-            consist_address=99,
-        )
-
-        self.assertEqual(consist.consist_address, 99)
-
-    def test_consist_get_absolute_url(self):
-        """Test get_absolute_url returns correct URL."""
-        consist = Consist.objects.create(
-            identifier="Test Consist",
-            company=self.company,
-            scale=self.scale,
-        )
-
-        url = consist.get_absolute_url()
-        self.assertIn(str(consist.uuid), url)
-
-
-class ConsistItemTestCase(TestCase):
-    """Test cases for ConsistItem model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.company = Company.objects.create(name="RGS", country="US")
-
-        self.scale_hon3 = Scale.objects.create(
-            scale="HOn3",
-            ratio="1:87",
-            tracks=10.5,
-        )
-
-        self.scale_ho = Scale.objects.create(
-            scale="HO",
-            ratio="1:87",
-            tracks=16.5,
-        )
-
-        self.stock_type = RollingStockType.objects.create(
-            type="Steam Locomotive",
-            category="locomotive",
-            order=1,
-        )
-
-        self.rolling_class = RollingClass.objects.create(
-            identifier="C-19",
-            type=self.stock_type,
-            company=self.company,
-        )
-
-        self.consist = Consist.objects.create(
-            identifier="Test Consist",
-            company=self.company,
-            scale=self.scale_hon3,
-            published=True,
-        )
-
-        self.rolling_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="340",
-            scale=self.scale_hon3,
-            published=True,
-        )
-
-    def test_consist_item_creation(self):
-        """Test creating a consist item."""
-        item = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-            load=False,
-        )
-
-        self.assertEqual(str(item), "RGS C-19 340")
-        self.assertEqual(item.order, 1)
-        self.assertFalse(item.load)
-
-    def test_consist_item_unique_constraint(self):
-        """Test that consist+rolling_stock must be unique."""
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-
-        # Cannot add same rolling stock to same consist twice
-        with self.assertRaises(IntegrityError):
-            ConsistItem.objects.create(
-                consist=self.consist,
-                rolling_stock=self.rolling_stock,
-                order=2,
-            )
-
-    def test_consist_item_scale_validation(self):
-        """Test that consist item scale must match consist scale."""
-        different_scale_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="341",
-            scale=self.scale_ho,  # Different scale
-        )
-
-        item = ConsistItem(
-            consist=self.consist,
-            rolling_stock=different_scale_stock,
-            order=1,
-            load=False,
-        )
-
-        with self.assertRaises(ValidationError):
-            item.clean()
-
-    def test_consist_item_load_ratio_validation(self):
-        """Test that load ratio must match consist ratio."""
-        different_scale = Scale.objects.create(
-            scale="N",
-            ratio="1:160",  # Different ratio
-            tracks=9.0,
-        )
-
-        load_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="342",
-            scale=different_scale,
-        )
-
-        item = ConsistItem(
-            consist=self.consist,
-            rolling_stock=load_stock,
-            order=1,
-            load=True,
-        )
-
-        with self.assertRaises(ValidationError):
-            item.clean()
-
-    def test_consist_item_published_validation(self):
-        """Test that unpublished stock cannot be in published consist."""
-        unpublished_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="343",
-            scale=self.scale_hon3,
-            published=False,
-        )
-
-        item = ConsistItem(
-            consist=self.consist,
-            rolling_stock=unpublished_stock,
-            order=1,
-        )
-
-        with self.assertRaises(ValidationError):
-            item.clean()
-
-    def test_consist_item_properties(self):
-        """Test consist item properties."""
-        item = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-
-        self.assertEqual(item.scale, self.rolling_stock.scale)
-        self.assertEqual(item.company, self.rolling_stock.company)
-        self.assertEqual(item.type, self.stock_type.type)
-
-    def test_consist_length_calculation(self):
-        """Test consist length calculation."""
-        # Add three items (not loads)
-        for i in range(3):
-            stock = RollingStock.objects.create(
-                rolling_class=self.rolling_class,
-                road_number=str(340 + i),
-                scale=self.scale_hon3,
-            )
-            ConsistItem.objects.create(
-                consist=self.consist,
-                rolling_stock=stock,
-                order=i + 1,
-                load=False,
-            )
-
-        self.assertEqual(self.consist.length, 3)
-
-    def test_consist_length_excludes_loads(self):
-        """Test that consist length excludes loads."""
-        # Add one regular item
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-            load=False,
-        )
-
-        # Add one load (same ratio, different scale tracks OK for loads)
-        load_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="LOAD-1",
-            scale=self.scale_hon3,
-        )
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=load_stock,
-            order=2,
-            load=True,
-        )
-
-        # Length should only count non-load items
-        self.assertEqual(self.consist.length, 1)
-
-    def test_consist_item_ordering(self):
-        """Test consist items are ordered by order field."""
-        stock2 = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="341",
-            scale=self.scale_hon3,
-        )
-        stock3 = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="342",
-            scale=self.scale_hon3,
-        )
-
-        item3 = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=stock3,
-            order=3,
-        )
-        item1 = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-        item2 = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=stock2,
-            order=2,
-        )
-
-        items = list(self.consist.consist_item.all())
-        self.assertEqual(items[0], item1)
-        self.assertEqual(items[1], item2)
-        self.assertEqual(items[2], item3)
-
-    def test_unpublish_consist_signal(self):
-        """Test that unpublishing rolling stock unpublishes consists."""
-        # Create a consist item
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-
-        self.assertTrue(self.consist.published)
-
-        # Unpublish the rolling stock
-        self.rolling_stock.published = False
-        self.rolling_stock.save()
-
-        # Reload consist from database
-        self.consist.refresh_from_db()
-
-        # Consist should now be unpublished
-        self.assertFalse(self.consist.published)

ram/metadata/admin.py

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

ram/metadata/migrations/0026_alter_manufacturer_name_and_more.py

@@ -1,24 +0,0 @@
-# Generated by Django 6.0 on 2026-01-09 12:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="manufacturer",
-            name="name",
-            field=models.CharField(max_length=128),
-        ),
-        migrations.AddConstraint(
-            model_name="manufacturer",
-            constraint=models.UniqueConstraint(
-                fields=("name", "category"), name="unique_name_category"
-            ),
-        ),
-    ]

ram/metadata/migrations/0027_company_company_slug_idx_company_company_country_idx_and_more.py

@@ -1,51 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-18 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0026_alter_manufacturer_name_and_more"),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name="company",
-            index=models.Index(fields=["slug"], name="company_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="company",
-            index=models.Index(fields=["country"], name="company_country_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="company",
-            index=models.Index(fields=["freelance"], name="company_freelance_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="manufacturer",
-            index=models.Index(fields=["category"], name="mfr_category_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="manufacturer",
-            index=models.Index(fields=["slug"], name="mfr_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="manufacturer",
-            index=models.Index(fields=["category", "slug"], name="mfr_cat_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="scale",
-            index=models.Index(fields=["slug"], name="scale_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="scale",
-            index=models.Index(fields=["ratio_int"], name="scale_ratio_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="scale",
-            index=models.Index(
-                fields=["-ratio_int", "-tracks"], name="scale_ratio_tracks_idx"
-            ),
-        ),
-    ]

ram/metadata/models.py

@@ -1,5 +1,4 @@
 import os
-from urllib.parse import urlparse
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
@@ -7,12 +6,11 @@ from django.dispatch.dispatcher import receiver
 from django.core.exceptions import ValidationError
 from django_countries.fields import CountryField
 
-from ram.models import SimpleBaseModel
 from ram.utils import DeduplicatedStorage, get_image_preview, slugify
 from ram.managers import PublicManager
 
 
-class Property(SimpleBaseModel):
+class Property(models.Model):
     name = models.CharField(max_length=128, unique=True)
     private = models.BooleanField(
         default=False,
@@ -29,8 +27,8 @@ class Property(SimpleBaseModel):
     objects = PublicManager()
 
 
-class Manufacturer(SimpleBaseModel):
+class Manufacturer(models.Model):
-    name = models.CharField(max_length=128)
+    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
@@ -46,21 +44,6 @@ class Manufacturer(SimpleBaseModel):
 
     class Meta:
         ordering = ["category", "slug"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "category"], name="unique_name_category"
-            )
-        ]
-        indexes = [
-            # Index for category filtering
-            models.Index(fields=["category"], name="mfr_category_idx"),
-            # Index for slug lookups
-            models.Index(fields=["slug"], name="mfr_slug_idx"),
-            # Composite index for category+slug (already in ordering)
-            models.Index(
-                fields=["category", "slug"], name="mfr_cat_slug_idx"
-            ),
-        ]
 
     def __str__(self):
         return self.name
@@ -74,17 +57,13 @@ class Manufacturer(SimpleBaseModel):
             },
         )
 
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
-
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 
     logo_thumbnail.short_description = "Preview"
 
 
-class Company(SimpleBaseModel):
+class Company(models.Model):
     name = models.CharField(max_length=64, unique=True)
     slug = models.CharField(max_length=64, unique=True, editable=False)
     extended_name = models.CharField(max_length=128, blank=True)
@@ -100,14 +79,6 @@ class Company(SimpleBaseModel):
     class Meta:
         verbose_name_plural = "Companies"
         ordering = ["slug"]
-        indexes = [
-            # Index for slug lookups (used frequently in URLs)
-            models.Index(fields=["slug"], name="company_slug_idx"),
-            # Index for country filtering
-            models.Index(fields=["country"], name="company_country_idx"),
-            # Index for freelance filtering
-            models.Index(fields=["freelance"], name="company_freelance_idx"),
-        ]
 
     def __str__(self):
         return self.name
@@ -130,7 +101,7 @@ class Company(SimpleBaseModel):
     logo_thumbnail.short_description = "Preview"
 
 
-class Decoder(SimpleBaseModel):
+class Decoder(models.Model):
     name = models.CharField(max_length=128, unique=True)
     manufacturer = models.ForeignKey(
         Manufacturer,
@@ -166,7 +137,7 @@ def calculate_ratio(ratio):
         raise ValidationError("Invalid ratio format")
 
 
-class Scale(SimpleBaseModel):
+class Scale(models.Model):
     scale = models.CharField(max_length=32, unique=True)
     slug = models.CharField(max_length=32, unique=True, editable=False)
     ratio = models.CharField(max_length=16, validators=[calculate_ratio])
@@ -182,16 +153,6 @@ class Scale(SimpleBaseModel):
 
     class Meta:
         ordering = ["-ratio_int", "-tracks", "scale"]
-        indexes = [
-            # Index for slug lookups
-            models.Index(fields=["slug"], name="scale_slug_idx"),
-            # Index for ratio_int ordering and filtering
-            models.Index(fields=["ratio_int"], name="scale_ratio_idx"),
-            # Composite index for common ordering pattern
-            models.Index(
-                fields=["-ratio_int", "-tracks"], name="scale_ratio_tracks_idx"
-            ),
-        ]
 
     def get_absolute_url(self):
         return reverse(
@@ -211,7 +172,7 @@ def scale_save(sender, instance, **kwargs):
     instance.ratio_int = calculate_ratio(instance.ratio)
 
 
-class RollingStockType(SimpleBaseModel):
+class RollingStockType(models.Model):
     type = models.CharField(max_length=64)
     order = models.PositiveSmallIntegerField()
     category = models.CharField(
@@ -241,7 +202,7 @@ class RollingStockType(SimpleBaseModel):
         return "{0} {1}".format(self.type, self.category)
 
 
-class Tag(SimpleBaseModel):
+class Tag(models.Model):
     name = models.CharField(max_length=128, unique=True)
     slug = models.CharField(max_length=128, unique=True)
 
@@ -261,7 +222,7 @@ class Tag(SimpleBaseModel):
         )
 
 
-class Shop(SimpleBaseModel):
+class Shop(models.Model):
     name = models.CharField(max_length=128, unique=True)
     country = CountryField(blank=True)
     website = models.URLField(blank=True)

ram/metadata/tests.py

@@ -1,371 +1,3 @@
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
-from metadata.models import (
+# Create your tests here.
-    Manufacturer,
-    Company,
-    Scale,
-    RollingStockType,
-    Decoder,
-    Shop,
-    Tag,
-    calculate_ratio,
-)
-
-
-class ManufacturerTestCase(TestCase):
-    """Test cases for Manufacturer model."""
-
-    def test_manufacturer_creation(self):
-        """Test creating a manufacturer."""
-        manufacturer = Manufacturer.objects.create(
-            name="Blackstone Models",
-            category="model",
-            country="US",
-            website="https://www.blackstonemodels.com",
-        )
-
-        self.assertEqual(str(manufacturer), "Blackstone Models")
-        self.assertEqual(manufacturer.slug, "blackstone-models")
-        self.assertEqual(manufacturer.category, "model")
-
-    def test_manufacturer_slug_auto_generation(self):
-        """Test that slug is automatically generated."""
-        manufacturer = Manufacturer.objects.create(
-            name="Baldwin Locomotive Works",
-            category="real",
-        )
-
-        self.assertEqual(manufacturer.slug, "baldwin-locomotive-works")
-
-    def test_manufacturer_unique_constraint(self):
-        """Test that name+category must be unique."""
-        Manufacturer.objects.create(
-            name="Baldwin",
-            category="real",
-        )
-
-        # Should not be able to create another with same name+category
-        with self.assertRaises(IntegrityError):
-            Manufacturer.objects.create(
-                name="Baldwin",
-                category="real",
-            )
-
-    def test_manufacturer_different_categories(self):
-        """Test that same name is allowed with different categories."""
-        Manufacturer.objects.create(
-            name="Baldwin",
-            category="real",
-        )
-
-        # Should be able to create with different category
-        manufacturer2 = Manufacturer.objects.create(
-            name="Alco",
-            category="model",
-        )
-
-        self.assertEqual(manufacturer2.name, "Alco")
-        self.assertIsNotNone(manufacturer2.pk)
-
-    def test_manufacturer_website_short(self):
-        """Test website_short extracts domain."""
-        manufacturer = Manufacturer.objects.create(
-            name="Test Manufacturer",
-            category="model",
-            website="https://www.example.com/path",
-        )
-
-        self.assertEqual(manufacturer.website_short(), "example.com")
-
-    def test_manufacturer_ordering(self):
-        """Test manufacturer ordering by category and slug."""
-        m1 = Manufacturer.objects.create(name="Zebra", category="model")
-        m2 = Manufacturer.objects.create(name="Alpha", category="accessory")
-        m3 = Manufacturer.objects.create(name="Beta", category="model")
-
-        manufacturers = list(Manufacturer.objects.all())
-        # Ordered by category, then slug
-        self.assertEqual(manufacturers[0], m2)  # accessory comes first
-        self.assertTrue(manufacturers.index(m3) < manufacturers.index(m1))
-
-
-class CompanyTestCase(TestCase):
-    """Test cases for Company model."""
-
-    def test_company_creation(self):
-        """Test creating a company."""
-        company = Company.objects.create(
-            name="RGS",
-            extended_name="Rio Grande Southern Railroad",
-            country="US",
-            freelance=False,
-        )
-
-        self.assertEqual(str(company), "RGS")
-        self.assertEqual(company.slug, "rgs")
-        self.assertEqual(company.extended_name, "Rio Grande Southern Railroad")
-
-    def test_company_slug_generation(self):
-        """Test automatic slug generation."""
-        company = Company.objects.create(
-            name="Denver & Rio Grande Western",
-            country="US",
-        )
-
-        self.assertEqual(company.slug, "denver-rio-grande-western")
-
-    def test_company_unique_name(self):
-        """Test that company name must be unique."""
-        Company.objects.create(name="RGS", country="US")
-
-        with self.assertRaises(IntegrityError):
-            Company.objects.create(name="RGS", country="GB")
-
-    def test_company_extended_name_pp(self):
-        """Test extended name pretty print."""
-        company = Company.objects.create(
-            name="RGS",
-            extended_name="Rio Grande Southern Railroad",
-            country="US",
-        )
-
-        self.assertEqual(
-            company.extended_name_pp(),
-            "(Rio Grande Southern Railroad)"
-        )
-
-    def test_company_extended_name_pp_empty(self):
-        """Test extended name pretty print when empty."""
-        company = Company.objects.create(name="RGS", country="US")
-
-        self.assertEqual(company.extended_name_pp(), "")
-
-    def test_company_freelance_flag(self):
-        """Test freelance flag."""
-        company = Company.objects.create(
-            name="Fake Railroad",
-            country="US",
-            freelance=True,
-        )
-
-        self.assertTrue(company.freelance)
-
-
-class ScaleTestCase(TestCase):
-    """Test cases for Scale model."""
-
-    def test_scale_creation(self):
-        """Test creating a scale."""
-        scale = Scale.objects.create(
-            scale="HOn3",
-            ratio="1:87",
-            tracks=10.5,
-            gauge="3 ft",
-        )
-
-        self.assertEqual(str(scale), "HOn3")
-        self.assertEqual(scale.slug, "hon3")
-        self.assertEqual(scale.ratio, "1:87")
-        self.assertEqual(scale.tracks, 10.5)
-
-    def test_scale_ratio_calculation(self):
-        """Test automatic ratio_int calculation."""
-        scale = Scale.objects.create(
-            scale="HO",
-            ratio="1:87",
-            tracks=16.5,
-        )
-
-        # 1/87 * 10000 = 114.94...
-        self.assertAlmostEqual(scale.ratio_int, 114, delta=1)
-
-    def test_scale_ratio_validation_valid(self):
-        """Test that valid ratios are accepted."""
-        ratios = ["1:87", "1:160", "1:22.5", "1:48"]
-
-        for ratio in ratios:
-            result = calculate_ratio(ratio)
-            self.assertIsInstance(result, (int, float))
-
-    def test_scale_ratio_validation_invalid(self):
-        """Test that invalid ratios raise ValidationError."""
-        with self.assertRaises(ValidationError):
-            calculate_ratio("invalid")
-
-        with self.assertRaises(ValidationError):
-            calculate_ratio("1:0")  # Division by zero
-
-    def test_scale_ordering(self):
-        """Test scale ordering by ratio_int (descending)."""
-        s1 = Scale.objects.create(scale="G", ratio="1:22.5", tracks=45.0)
-        s2 = Scale.objects.create(scale="HO", ratio="1:87", tracks=16.5)
-        s3 = Scale.objects.create(scale="N", ratio="1:160", tracks=9.0)
-
-        scales = list(Scale.objects.all())
-        # Ordered by -ratio_int (larger ratios first)
-        self.assertEqual(scales[0], s1)  # G scale (largest)
-        self.assertEqual(scales[1], s2)  # HO scale
-        self.assertEqual(scales[2], s3)  # N scale (smallest)
-
-
-class RollingStockTypeTestCase(TestCase):
-    """Test cases for RollingStockType model."""
-
-    def test_rolling_stock_type_creation(self):
-        """Test creating a rolling stock type."""
-        stock_type = RollingStockType.objects.create(
-            type="Steam Locomotive",
-            category="locomotive",
-            order=1,
-        )
-
-        self.assertEqual(str(stock_type), "Steam Locomotive locomotive")
-        self.assertEqual(stock_type.slug, "steam-locomotive-locomotive")
-
-    def test_rolling_stock_type_unique_constraint(self):
-        """Test that category+type must be unique."""
-        RollingStockType.objects.create(
-            type="Steam Locomotive",
-            category="locomotive",
-            order=1,
-        )
-
-        with self.assertRaises(IntegrityError):
-            RollingStockType.objects.create(
-                type="Steam Locomotive",
-                category="locomotive",
-                order=2,
-            )
-
-    def test_rolling_stock_type_ordering(self):
-        """Test ordering by order field."""
-        t3 = RollingStockType.objects.create(
-            type="Caboose", category="railcar", order=3
-        )
-        t1 = RollingStockType.objects.create(
-            type="Steam", category="locomotive", order=1
-        )
-        t2 = RollingStockType.objects.create(
-            type="Boxcar", category="railcar", order=2
-        )
-
-        types = list(RollingStockType.objects.all())
-        self.assertEqual(types[0], t1)
-        self.assertEqual(types[1], t2)
-        self.assertEqual(types[2], t3)
-
-
-class DecoderTestCase(TestCase):
-    """Test cases for Decoder model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.manufacturer = Manufacturer.objects.create(
-            name="ESU",
-            category="accessory",
-            country="DE",
-        )
-
-    def test_decoder_creation(self):
-        """Test creating a decoder."""
-        decoder = Decoder.objects.create(
-            name="LokSound 5",
-            manufacturer=self.manufacturer,
-            version="5.0",
-            sound=True,
-        )
-
-        self.assertEqual(str(decoder), "ESU - LokSound 5")
-        self.assertTrue(decoder.sound)
-
-    def test_decoder_without_sound(self):
-        """Test creating a non-sound decoder."""
-        decoder = Decoder.objects.create(
-            name="LokPilot 5",
-            manufacturer=self.manufacturer,
-            sound=False,
-        )
-
-        self.assertFalse(decoder.sound)
-
-    def test_decoder_ordering(self):
-        """Test decoder ordering by manufacturer name and decoder name."""
-        man2 = Manufacturer.objects.create(
-            name="Digitrax",
-            category="accessory",
-        )
-
-        d1 = Decoder.objects.create(
-            name="LokSound 5",
-            manufacturer=self.manufacturer,
-        )
-        d2 = Decoder.objects.create(
-            name="DZ123",
-            manufacturer=man2,
-        )
-        d3 = Decoder.objects.create(
-            name="LokPilot 5",
-            manufacturer=self.manufacturer,
-        )
-
-        decoders = list(Decoder.objects.all())
-        # Ordered by manufacturer name, then decoder name
-        self.assertEqual(decoders[0], d2)  # Digitrax
-        self.assertTrue(decoders.index(d3) < decoders.index(d1))  # LokPilot before LokSound
-
-
-class ShopTestCase(TestCase):
-    """Test cases for Shop model."""
-
-    def test_shop_creation(self):
-        """Test creating a shop."""
-        shop = Shop.objects.create(
-            name="Caboose Hobbies",
-            country="US",
-            website="https://www.caboosehobbies.com",
-            on_line=True,
-            active=True,
-        )
-
-        self.assertEqual(str(shop), "Caboose Hobbies")
-        self.assertTrue(shop.on_line)
-        self.assertTrue(shop.active)
-
-    def test_shop_defaults(self):
-        """Test shop default values."""
-        shop = Shop.objects.create(name="Local Shop")
-
-        self.assertTrue(shop.on_line)  # Default True
-        self.assertTrue(shop.active)   # Default True
-
-    def test_shop_offline(self):
-        """Test creating an offline shop."""
-        shop = Shop.objects.create(
-            name="Brick and Mortar Store",
-            on_line=False,
-        )
-
-        self.assertFalse(shop.on_line)
-
-
-class TagTestCase(TestCase):
-    """Test cases for Tag model."""
-
-    def test_tag_creation(self):
-        """Test creating a tag."""
-        tag = Tag.objects.create(
-            name="Narrow Gauge",
-            slug="narrow-gauge",
-        )
-
-        self.assertEqual(str(tag), "Narrow Gauge")
-        self.assertEqual(tag.slug, "narrow-gauge")
-
-    def test_tag_unique_name(self):
-        """Test that tag name must be unique."""
-        Tag.objects.create(name="Narrow Gauge", slug="narrow-gauge")
-
-        with self.assertRaises(IntegrityError):
-            Tag.objects.create(name="Narrow Gauge", slug="narrow-gauge")

ram/portal/admin.py

@@ -20,7 +20,6 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                     "about",
                     "items_per_page",
                     "items_ordering",
-                    "featured_items_ordering",
                     "currency",
                     "footer",
                     "footer_extended",
@@ -35,8 +34,7 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                 "fields": (
                     "show_version",
                     "use_cdn",
-                    "extra_html",
+                    "extra_head",
-                    "extra_js",
                     "rest_api",
                     "version",
                 ),

ram/portal/migrations/0021_siteconfiguration_featured_items_ordering_and_more.py

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

ram/portal/migrations/0022_rename_siteconfiguration_extra_head_and_more.py

@@ -1,34 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-15 11:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("portal", "0021_siteconfiguration_featured_items_ordering_and_more"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="siteconfiguration",
-            old_name="extra_head",
-            new_name="extra_html",
-        ),
-        migrations.AlterField(
-            model_name="siteconfiguration",
-            name="extra_html",
-            field=models.TextField(
-                blank=True,
-                help_text="Extra HTML to be dinamically loaded into the site.",
-            ),
-        ),
-        migrations.AddField(
-            model_name="siteconfiguration",
-            name="extra_js",
-            field=models.TextField(
-                blank=True,
-                help_text="Extra JS to be dinamically loaded into the site."
-            ),
-        ),
-    ]

ram/portal/models.py

@@ -22,31 +22,21 @@ class SiteConfiguration(SingletonModel):
         default="6",
     )
     items_ordering = models.CharField(
-        max_length=11,
+        max_length=10,
         choices=[
-            ("type", "By rolling stock type and company"),
+            ("type", "By rolling stock type"),
-            ("class", "By rolling stock type and class"),
+            ("company", "By company name"),
-            ("company", "By company and type"),
+            ("identifier", "By rolling stock class"),
-            ("country", "By country and type"),
-            ("cou+com", "By country and company"),
         ],
         default="type",
     )
-    featured_items_ordering = items_ordering.clone()
     currency = models.CharField(max_length=3, default="EUR")
     footer = tinymce.HTMLField(blank=True)
     footer_extended = tinymce.HTMLField(blank=True)
     disclaimer = tinymce.HTMLField(blank=True)
     show_version = models.BooleanField(default=True)
     use_cdn = models.BooleanField(default=True)
-    extra_html = models.TextField(
+    extra_head = models.TextField(blank=True)
-        blank=True,
-        help_text="Extra HTML to be dinamically loaded into the site.",
-    )
-    extra_js = models.TextField(
-        blank=True,
-        help_text="Extra JS to be dinamically loaded into the site.",
-    )
 
     class Meta:
         verbose_name = "Site Configuration"

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-{"version":3,"names":["getStoredTheme","localStorage","getItem","getPreferredTheme","storedTheme","window","matchMedia","matches","setTheme","theme","document","documentElement","setAttribute","showActiveTheme","focus","themeSwitcher","querySelector","activeThemeIcon","btnToActive","biOfActiveBtn","getAttribute","querySelectorAll","forEach","element","classList","remove","add","addEventListener","toggle","setItem","setStoredTheme","selectElement","getElementById","hash","location","substring","target","trigger","bootstrap","Tab","getOrCreateInstance","show","value","btn","event","newHash","replace","history","replaceState","this","forms","Array","from","form","checkValidity","preventDefault","stopPropagation"],"sources":["ram/portal/static/js/src/theme_selector.js","ram/portal/static/js/src/tabs_selector.js","ram/portal/static/js/src/validators.js"],"mappings":";;;;;AAMA,MACE,aAEA,MAAMA,EAAiB,IAAMC,aAAaC,QAAQ,SAG5CC,EAAoB,KACxB,MAAMC,EAAcJ,IACpB,OAAII,IAIGC,OAAOC,WAAW,gCAAgCC,QAAU,OAAS,UAGxEC,EAAWC,IACD,SAAVA,GAAoBJ,OAAOC,WAAW,gCAAgCC,QACxEG,SAASC,gBAAgBC,aAAa,gBAAiB,QAEvDF,SAASC,gBAAgBC,aAAa,gBAAiBH,IAI3DD,EAASL,KAET,MAAMU,EAAkB,CAACJ,EAAOK,GAAQ,KACtC,MAAMC,EAAgBL,SAASM,cAAc,aAE7C,IAAKD,EACH,OAGF,MAAME,EAAkBP,SAASM,cAAc,wBACzCE,EAAcR,SAASM,cAAc,yBAAyBP,OAC9DU,EAAgBD,EAAYF,cAAc,iBAAiBI,aAAa,SAE9EV,SAASW,iBAAiB,yBAAyBC,QAAQC,IACzDA,EAAQC,UAAUC,OAAO,UACzBF,EAAQX,aAAa,eAAgB,WAGvCM,EAAYM,UAAUE,IAAI,UAC1BR,EAAYN,aAAa,eAAgB,QACzCK,EAAgBL,aAAa,QAASO,GAElCL,GACFC,EAAcD,SAIlBT,OAAOC,WAAW,gCAAgCqB,iBAAiB,SAAU,KAC3E,MAAMvB,EAAcJ,IACA,UAAhBI,GAA2C,SAAhBA,GAC7BI,EAASL,OAIbE,OAAOsB,iBAAiB,mBAAoB,KAC1Cd,EAAgBV,KAChBO,SAASW,iBAAiB,yBACvBC,QAAQM,IACPA,EAAOD,iBAAiB,QAAS,KAC/B,MAAMlB,EAAQmB,EAAOR,aAAa,uBA1DnBX,KAASR,aAAa4B,QAAQ,QAASpB,IA2DtDqB,CAAerB,GACfD,EAASC,GACTI,EAAgBJ,GAAO,QAI/B,EArEF,GCLAC,SAASiB,iBAAiB,mBAAoB,WAC5C,aAEA,MAAMI,EAAgBrB,SAASsB,eAAe,eAExCC,EAAO5B,OAAO6B,SAASD,KAAKE,UAAU,GAC5C,GAAIF,EAAM,CACR,MAAMG,EAAS,QAAQH,IACjBI,EAAU3B,SAASM,cAAc,oBAAoBoB,OACvDC,IACFC,UAAUC,IAAIC,oBAAoBH,GAASI,OAC3CV,EAAcW,MAAQN,EAE1B,CAGA1B,SAASW,iBAAiB,gCAAgCC,QAAQqB,IAChEA,EAAIhB,iBAAiB,eAAgBiB,IACnC,MAAMC,EAAUD,EAAMR,OAAOhB,aAAa,kBAAkB0B,QAAQ,OAAQ,IAC5EC,QAAQC,aAAa,KAAM,KAAMH,OAKhCd,IACLA,EAAcJ,iBAAiB,SAAU,WACvC,MAAMS,EAASa,KAAKP,MACdL,EAAU3B,SAASM,cAAc,oBAAoBoB,OAC3D,GAAIC,EAAS,CACSC,UAAUC,IAAIC,oBAAoBH,GAC1CI,MACd,CACF,GAGA/B,SAASW,iBAAiB,0BAA0BC,QAAQqB,IAC1DA,EAAIhB,iBAAiB,eAAgBiB,IACnC,MAAMR,EAASQ,EAAMR,OAAOhB,aAAa,kBACzCW,EAAcW,MAAQN,MAG5B,GC1CA1B,SAASiB,iBAAiB,mBAAoB,WAC1C,aAEA,MAAMuB,EAAQxC,SAASW,iBAAiB,qBACxC8B,MAAMC,KAAKF,GAAO5B,QAAQ+B,IACxBA,EAAK1B,iBAAiB,SAAUiB,IACzBS,EAAKC,kBACRV,EAAMW,iBACNX,EAAMY,mBAGRH,EAAK7B,UAAUE,IAAI,mBAClB,IAET","ignoreList":[]}

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

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

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

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

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

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

ram/portal/static/js/src/validators.js

@@ -1,15 +0,0 @@
-document.addEventListener("DOMContentLoaded", function () {
-    'use strict'
-
-    const forms = document.querySelectorAll('.needs-validation')
-    Array.from(forms).forEach(form => {
-      form.addEventListener('submit', event => {
-        if (!form.checkValidity()) {
-          event.preventDefault()
-          event.stopPropagation()
-        }
-
-        form.classList.add('was-validated')
-      }, false)
-    })
-});

ram/portal/templates/_includes/documents.html

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

ram/portal/templates/_includes/search.html

@@ -1,12 +0,0 @@
-          <form class="d-flex needs-validation" action="{% url 'search' %}" method="post" novalidate>{% csrf_token %}
-            <div class="input-group has-validation">
-              <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>

ram/portal/templates/_modules/documents.html

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

ram/portal/templates/_modules/properties.html

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

ram/portal/templates/_modules/purchase_data.html

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

ram/portal/templates/base.html

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

ram/portal/templates/bookshelf/book.html

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

ram/portal/templates/bookshelf/bookshelf_menu.html

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

ram/portal/templates/bookshelf/magazine.html

@@ -1,128 +0,0 @@
-{% extends "cards.html" %}
-      {% block header %}
-      {{ block.super }}
-      {% if magazine.tags.all %}
-      <p><small>Tags:</small>
-        {% for t in magazine.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
-        {{ t.name }}</a>{# new line is required #}
-        {% endfor %}
-      </p>
-      {% if not magazine.published %}
-      <span class="badge text-bg-warning">Unpublished</span> |
-      {% endif %}
-      <small class="text-body-secondary">Updated {{ magazine.updated_time | date:"M d, Y H:i" }}</small>
-      {% endif %}
-      {% endblock %}
-      {% block carousel %}
-      {% if magazine.image %}
-      <div class="row pb-4">
-        <div id="carouselControls" class="carousel carousel-dark slide" data-bs-ride="carousel">
-          <div class="carousel-inner">
-            <div class="carousel-item active">
-              <img src="{{ magazine.image.url }}" class="d-block w-100 rounded img-thumbnail" alt="magazine cover">
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endif %}
-      {% endblock %}
-      {% block pagination %}
-      {% if data.has_other_pages %}
-      <nav aria-label="Page navigation">
-        <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
-          {% if data.has_previous %}
-          <li class="page-item">
-            <a class="page-link" href="{% url 'magazine' uuid=magazine.uuid page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
-          </li>
-          {% else %}
-          <li class="page-item disabled">
-            <span class="page-link"><i class="bi bi-chevron-left"></i></span>
-          </li>
-          {% endif %}
-          {% for i in page_range %}
-            {% if data.number == i %}
-            <li class="page-item active">
-              <span class="page-link">{{ i }}</span>
-            </li>
-            {% else %}
-              {% if i == data.paginator.ELLIPSIS %}
-              <li class="page-item"><span class="page-link">{{ i }}</span></li>
-              {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'magazine' uuid=magazine.uuid page=i %}#main-content">{{ i }}</a></li>
-              {% endif %}
-            {% endif %}
-          {% endfor %}
-          {% if data.has_next %}
-          <li class="page-item">
-            <a class="page-link" href="{% url 'magazine' uuid=magazine.uuid page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
-          </li>
-          {% else %}
-          <li class="page-item disabled">
-            <span class="page-link"><i class="bi bi-chevron-right"></i></span>
-          </li>
-          {% endif %}
-        </ul>
-      </nav>
-      {% endif %}
-      {% endblock %}
-      {% block extra_content %}
-      <section class="py-4 text-start container">
-        <div class="row">
-          <div class="mx-auto">
-            <nav class="nav nav-tabs d-none d-lg-flex flex-row mb-2" id="nav-tab" role="tablist">
-              <button class="nav-link active" id="nav-summary-tab" data-bs-toggle="tab" data-bs-target="#nav-summary" type="button" role="tab" aria-controls="nav-summary" aria-selected="true">Summary</button>
-            </nav>
-            <select class="form-select d-lg-none mb-2" id="tabSelector" aria-label="Tab selector">
-              <option value="#nav-summary" selected>Summary</option>
-            </select>
-            <div class="tab-content" id="nav-tabContent">
-              <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
-                <table class="table table-striped">
-                  <thead>
-                    <tr>
-                      <th colspan="2" scope="row">
-                        Magazine
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody class="table-group-divider">
-                    <tr>
-                      <th class="w-33" scope="row">Name</th>
-                      <td>{{ magazine }}</td>
-                    </tr>
-                    <tr>
-                      <th class="w-33" scope="row">Publisher</th>
-                      <td>
-                        <img src="{{ magazine.publisher.country.flag }}" alt="{{ magazine.publisher.country }}"> {{ magazine.publisher }}
-                        {% if magazine.publisher.website %} <a href="{{ magazine.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                      </td>
-                    </tr>
-                    <tr>
-                      <th class="w-33" scope="row">Website</th>
-                      <td>{% if magazine.website %}<a href="{{ magazine.website }}" target="_blank">{{ magazine.website_short }}</td>{% else %}-{% endif %}</td>
-                    </tr>
-                    <tr>
-                      <th class="w-33" scope="row">Language</th>
-                      <td>{{ magazine.get_language_display }}</td>
-                    </tr>
-                    <tr>
-                      <th scope="row">ISBN</th>
-                      <td>{{ magazine.ISBN | default:"-" }}</td>
-                    </tr>
-                    {% if magazine.description %}
-                    <tr>
-                      <th scope="row">Description</th>
-                      <td>{{ magazine.description | safe }}</td>
-                    </tr>
-                    {% endif %}
-                  </tbody>
-                </table>
-              </div>
-            </div>
-            <div class="d-grid gap-2 d-md-flex justify-content-md-end">
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:bookshelf_magazine_change' magazine.pk %}">Edit</a>{% endif %}
-            </div>
-          </div>
-        </div>
-      </section>
-      {% endblock %}

ram/portal/templates/cards.html

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

ram/portal/templates/cards/book.html

@@ -2,31 +2,32 @@
 {% load dynamic_url %}
         <div class="col">
           <div class="card shadow-sm">
-            {% if d.image.exists %}
+            {% if d.item.image.exists %}
-            <a href="{{d.get_absolute_url}}"><img class="card-img-top" src="{{ d.image.first.image.url }}" alt="{{ d }}"></a>
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d.item }}"></a>
             {% else %}
             <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
-            <a href="{{d.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}"></a>
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d.item }}"></a>
             {% endif %}
             <div class="card-body">
               <p class="card-text" style="position: relative;">
-                <strong>{{ d }}</strong>
+                <strong>{{ d.item }}</strong>
-                <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
+                <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
               </p>
+              {% if d.item.tags.all %}
               <p class="card-text"><small>Tags:</small>
-                {% for t in d.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
                 {{ t.name }}</a>{# new line is required #}
-                {% empty %}
-                <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
                 {% endfor %}
               </p>
+              {% endif %}
               <table class="table table-striped">
                 <thead>
                   <tr>
                     <th colspan="2" scope="row">
-                      {{ d.obj_label|capfirst }}
+                      {% if d.type == "catalog" %}Catalog
+                      {% elif d.type == "book" %}Book{% endif %}
                       <div class="float-end">
-                        {% if not d.published %}
+                        {% if not d.item.published %}
                         <span class="badge text-bg-warning">Unpublished</span>
                         {% endif %}
                       </div>
@@ -34,46 +35,44 @@
                   </tr>
                 </thead>
                 <tbody class="table-group-divider">
-                  {% if d.obj_type == "catalog" %}
+                  {% if d.type == "catalog" %}
                   <tr>
                     <th class="w-33" scope="row">Manufacturer</th>
-                    <td>
+                    <td>{{ d.item.manufacturer }}</td>
-                      <a href="{% url 'filtered' _filter="manufacturer" search=d.manufacturer.slug %}">{{ d.manufacturer }}{% if d.manufacturer.website %}</a> <a href="{{ d.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                    </td>
                   </tr>
                   <tr>
                     <th class="w-33" scope="row">Scales</th>
-                    <td>{{ d.get_scales }}</td>
+                    <td>{{ d.item.get_scales }}</td>
                   </tr>
-                  {% elif d.obj_type == "book" %}
+                  {% elif d.type == "book" %}
                   <tr>
                     <th class="w-33" scope="row">Authors</th>
                     <td>
-                      <ul class="mb-0 list-unstyled">{% for a in d.authors.all %}<li>{{ a }}</li>{% endfor %}</ul>
+                      <ul class="mb-0 list-unstyled">{% for a in d.item.authors.all %}<li>{{ a }}</li>{% endfor %}</ul>
                     </td>
                   </tr>
                   <tr>
                     <th class="w-33" scope="row">Publisher</th>
-                    <td><img src="{{ d.publisher.country.flag }}" alt="{{ d.publisher.country }}"> {{ d.publisher }}</td>
+                    <td>{{ d.item.publisher }}</td>
                   </tr>
                   {% endif %}
                   <tr>
                     <th scope="row">Language</th>
-                    <td>{{ d.get_language_display }}</td>
+                    <td>{{ d.item.get_language_display }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Pages</th>
-                    <td>{{ d.number_of_pages|default:"-" }}</td>
+                    <td>{{ d.item.number_of_pages|default:"-" }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Year</th>
-                    <td>{{ d.publication_year|default:"-" }}</td>
+                    <td>{{ d.item.publication_year|default:"-" }}</td>
                   </tr>
                 </tbody>
               </table>
               <div class="d-grid gap-2 mb-1 d-md-block">
-                <a class="btn btn-sm btn-outline-primary" href="{{ d.get_absolute_url }}">Show all data</a>
+                <a class="btn btn-sm btn-outline-primary" href="{{ d.item.get_absolute_url }}">Show all data</a>
-                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% dynamic_admin_url 'bookshelf' d.obj_type d.pk %}">Edit</a>{% endif %}
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% dynamic_admin_url 'bookshelf' d.type d.item.pk %}">Edit</a>{% endif %}
               </div>
             </div>
           </div>

ram/portal/templates/cards/company.html

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

ram/portal/templates/cards/consist.html

@@ -1,37 +1,36 @@
-{% load static %}
-
       <div class="col">
         <div class="card shadow-sm">
-          <a href="{{ d.get_absolute_url }}">
+          <a href="{{ d.item.get_absolute_url }}">
-          {% if d.get_cover %}
+          {% if d.item.image %}
-            <img class="card-img-top" src="{{ d.get_cover.url }}" alt="{{ d }}">
+            <img class="card-img-top" src="{{ d.item.image.url }}" alt="{{ d.item }}">
           {% else %}
-            <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
+            {% with d.item.consist_item.first.rolling_stock as r %}
-            <a href="{{d.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}"></a>
+            <img class="card-img-top" src="{{ r.image.first.image.url }}" alt="{{ d.item }}">
+            {% endwith %}
           {% endif %}
           </a>
           <div class="card-body">
             <p class="card-text" style="position: relative;">
-              <strong>{{ d }}</strong>
+              <strong>{{ d.item }}</strong>
-              <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
+              <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
             </p>
+            {% if d.item.tags.all %}
             <p class="card-text"><small>Tags:</small>
-              {% for t in d.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+              {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
               {{ t.name }}</a>{# new line is required #}
-              {% empty %}
-              <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
               {% endfor %}
             </p>
+            {% endif %}
             <table class="table table-striped">
               <thead>
                 <tr>
                   <th colspan="2" scope="row">
                     Consist
                     <div class="float-end">
-                      {% if not d.published %}
+                      {% if not d.item.published %}
                       <span class="badge text-bg-warning">Unpublished</span>
                       {% endif %}
-                      {% if d.company.freelance %}
+                      {% if d.item.company.freelance %}
                       <span class="badge text-bg-secondary">Freelance</span>
                       {% endif %}
                     </div>
@@ -39,32 +38,32 @@
                 </tr>
               </thead>
               <tbody class="table-group-divider">
-                {% if d.address %}
+                {% if d.item.address %}
                 <tr>
                   <th class="w-33" scope="row">Address</th>
-                  <td>{{ d.address }}</td>
+                  <td>{{ d.item.address }}</td>
                 </tr>
                 {% endif %}
                 <tr>
                   <th class="w-33" scope="row">Company</th>
                   <td>
-                    <img src="{{ d.company.country.flag }}" alt="{{ d.company.country }}">
+                    <img src="{{ d.item.company.country.flag }}" alt="{{ d.item.company.country }}">
-                    <abbr title="{{ d.company.extended_name }}">{{ d.company }}</abbr>
+                    <abbr title="{{ d.item.company.extended_name }}">{{ d.item.company }}</abbr>
                   </td>
                 </tr>
                 <tr>
                   <th scope="row">Era</th>
-                  <td>{{ d.era }}</td>
+                  <td>{{ d.item.era }}</td>
                 </tr>
                 <tr>
                   <th scope="row">Length</th>
-                  <td>{{ d.length }}</td>
+                  <td>{{ d.item.length }}</td>
                 </tr>
               </tbody>
             </table>
             <div class="d-grid gap-2 mb-1 d-md-block">
-             <a class="btn btn-sm btn-outline-primary" href="{{ d.get_absolute_url }}">Show all data</a>
+             <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.pk %}">Edit</a>{% endif %}
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:consist_consist_change' d.item.pk %}">Edit</a>{% endif %}
             </div>
           </div>
         </div>

ram/portal/templates/cards/magazine.html

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

ram/portal/templates/cards/manufacturer.html

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

ram/portal/templates/cards/rolling_stock_type.html

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

ram/portal/templates/cards/roster.html

@@ -3,41 +3,34 @@
 
         <div class="col">
           <div class="card shadow-sm">
-            <div id="card-img-container" class="position-relative">
+            {% if d.item.image.exists %}
-              {% if d.featured %}
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d.item }}"></a>
-              <span class="position-absolute translate-middle top-0 start-0 m-3 text-danger">
+            {% else %}
-                <abbr title="Featured item"><i class="bi bi-heart-fill"></i></abbr>
+            <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
-              </span>
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d.item }}"></a>
-              {% endif %}
+            {% endif %}
-              {% if d.image.exists %}
-              <a href="{{d.get_absolute_url}}"><img class="card-img-top" src="{{ d.image.first.image.url }}" alt="{{ d }}"></a>
-              {% else %}
-              <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
-              <a href="{{d.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}"></a>
-              {% endif %}
-            </div>
             <div class="card-body">
               <p class="card-text" style="position: relative;">
-                <strong>{{ d }}</strong>
+                <strong>{{ d.item }}</strong>
-                <a class="stretched-link" href="{{ d.get_absolute_url }}"></a>
+                <a class="stretched-link" href="{{ d.item.get_absolute_url }}"></a>
               </p>
+              {% if d.item.tags.all %}
               <p class="card-text"><small>Tags:</small>
-                {% for t in d.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                {% for t in d.item.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
                 {{ t.name }}</a>{# new line is required #}
-                {% empty %}
-                <span class="badge rounded-pill bg-secondary"><i class="bi bi-ban"></i></span>
                 {% endfor %}
               </p>
+              {% endif %}
               <table class="table table-striped">
                 <thead>
                   <tr>
                     <th colspan="2" scope="row">
                       Rolling stock
                       <div class="float-end">
-                        {% if not d.published %}
+                        {% if not d.item.published %}
                         <span class="badge text-bg-warning">Unpublished</span>
                         {% endif %}
-                        {% if d.company.freelance %}
+                        {% if d.item.company.freelance %}
                         <span class="badge text-bg-secondary">Freelance</span>
                         {% endif %}
                       </div>
@@ -47,50 +40,50 @@
                 <tbody class="table-group-divider">
                   <tr>
                     <th class="w-33" scope="row">Type</th>
-                    <td>{{ d.rolling_class.type }}</td>
+                    <td>{{ d.item.rolling_class.type }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Company</th>
                     <td>
-                      <img src="{{ d.company.country.flag }}" alt="{{ d.company.country }}">
+                      <img src="{{ d.item.company.country.flag }}" alt="{{ d.item.company.country }}">
-                      <a href="{% url 'filtered' _filter="company" search=d.company.slug %}"><abbr title="{{ d.company.extended_name }}">{{ d.company }}</abbr></a>
+                      <a href="{% url 'filtered' _filter="company" search=d.item.company.slug %}"><abbr title="{{ d.item.company.extended_name }}">{{ d.item.company }}</abbr></a>
                     </td>
                   </tr>
                   <tr>
                     <th scope="row">Class</th>
-                    <td>{{ d.rolling_class.identifier }}</td>
+                    <td>{{ d.item.rolling_class.identifier }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Road number</th>
-                    <td>{{ d.road_number }}</td>
+                    <td>{{ d.item.road_number }}</td>
                   </tr>
                   <tr>
                     <th scope="row">Era</th>
-                    <td>{{ d.era }}</td>
+                    <td>{{ d.item.era }}</td>
                   </tr>
                   <tr>
                     <th class="w-33" scope="row">Manufacturer</th>
-                    <td>{%if d.manufacturer %}
+                    <td>{%if d.item.manufacturer %}
-                      <a href="{% url 'filtered' _filter="manufacturer" search=d.manufacturer.slug %}">{{ d.manufacturer }}{% if d.manufacturer.website %}</a> <a href="{{ d.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                      <a href="{% url 'filtered' _filter="manufacturer" search=d.item.manufacturer.slug %}">{{ d.item.manufacturer }}{% if d.item.manufacturer.website %}</a> <a href="{{ d.item.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                     {% endif %}</td>
                   </tr>
                   <tr>
                     <th scope="row">Scale</th>
-                    <td><a href="{% url 'filtered' _filter="scale" search=d.scale.slug %}"><abbr title="{{ d.scale.ratio }} - {{ d.scale.tracks }} mm">{{ d.scale }}</abbr></a></td>
+                    <td><a href="{% url 'filtered' _filter="scale" search=d.item.scale.slug %}"><abbr title="{{ d.item.scale.ratio }} - {{ d.item.scale.tracks }} mm">{{ d.item.scale }}</abbr></a></td>
                   </tr>
                   <tr>
                     <th scope="row">Item number</th>
-                    <td>{{ d.item_number }}{%if d.set %} | <a class="badge text-bg-primary" href="{% url 'manufacturer' manufacturer=d.manufacturer.slug search=d.item_number_slug %}">SET</a>{% endif %}</td>
+                    <td>{{ d.item.item_number }}{%if d.item.set %} | <a class="badge text-bg-primary" href="{% url 'manufacturer' manufacturer=d.item.manufacturer.slug search=d.item.item_number_slug %}">SET</a>{% endif %}</td>
                   </tr>
                   <tr>
                     <th scope="row">DCC</th>
-                    <td><a class="text-reset text-decoration-none" title="Symbols" href="" data-bs-toggle="modal" data-bs-target="#symbolsModal">{% dcc d %}</a></td>
+                    <td><a class="text-reset text-decoration-none" title="Symbols" href="" data-bs-toggle="modal" data-bs-target="#symbolsModal">{% dcc d.item %}</a></td>
                   </tr>
                 </tbody>
               </table>
               <div class="d-grid gap-2 mb-1 d-md-block">
-               <a class="btn btn-sm btn-outline-primary" href="{{d.get_absolute_url}}">Show all data</a>
+               <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.pk %}">Edit</a>{% endif %}
+                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' d.item.pk %}">Edit</a>{% endif %}
               </div>
             </div>
           </div>

ram/portal/templates/cards/scale.html

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

ram/portal/templates/consist.html

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

ram/portal/templates/filter.html

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

ram/portal/templates/home.html

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

ram/portal/templates/includes/login.html

@@ -11,10 +11,9 @@
             <ul class="dropdown-menu" aria-labelledby="dropdownLogin">
               <li><a class="dropdown-item" href="{% url 'admin:roster_rollingstock_changelist' %}">Rolling stock</a></li>
               <li><a class="dropdown-item" href="{% url 'admin:consist_consist_changelist' %}">Consists</a></li>
-              <li><a class="dropdown-item" href="{% url 'admin:app_list' 'bookshelf' %}">Bookshelf</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' 'repository' %}">Repository</a></li>
               <li><a class="dropdown-item" href="{% url 'admin:app_list' 'metadata' %}">Metadata</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>

ram/portal/templates/includes/search.html

@@ -0,0 +1,30 @@
+          <form class="d-flex needs-validation" action="{% url 'search' %}" method="post" novalidate>{% csrf_token %}
+            <div class="input-group has-validation">
+              <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>

ram/portal/templates/manufacturer.html

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

ram/portal/templates/pagination.html

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

ram/portal/templates/pagination_manufacturers.html

@@ -1,12 +1,12 @@
 {% extends "cards.html" %}
       {% block pagination %}
       {% if data.has_other_pages %}
-      {% with data.0.category as c %}
+      {% with data.0.item.category as c %}
       <nav aria-label="Page navigation">
         <ul class="pagination flex-wrap justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturers' category=c page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
+            <a class="page-link" href="{% url 'manufacturers_pagination' category=c page=data.previous_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-left"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -22,13 +22,13 @@
               {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'manufacturers' category=c page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'manufacturers_pagination' category=c page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturers' category=c page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
+            <a class="page-link" href="{% url 'manufacturers_pagination' category=c page=data.next_page_number %}#main-content" tabindex="-1"><i class="bi bi-chevron-right"></i></a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/rollingstock.html

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

ram/portal/templates/search.html

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

ram/portal/templatetags/dcc.py

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

ram/portal/templatetags/dynamic_url.py

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

ram/portal/templatetags/show_menu.py

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

ram/portal/templatetags/shuffle.py

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

ram/portal/tests.py

@@ -1,643 +1,3 @@
-import base64
+from django.test import TestCase
-from decimal import Decimal
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.core.exceptions import ObjectDoesNotExist
 
-from portal.models import SiteConfiguration, Flatpage
+# Create your tests here.
-from roster.models import RollingClass, RollingStock
-from consist.models import Consist, ConsistItem
-from bookshelf.models import (
-    Book,
-    Catalog,
-    Magazine,
-    MagazineIssue,
-    Author,
-    Publisher,
-)
-from metadata.models import (
-    Company,
-    Manufacturer,
-    Scale,
-    RollingStockType,
-    Tag,
-)
-
-
-class PortalTestBase(TestCase):
-    """Base test class with common setup for portal views."""
-
-    def setUp(self):
-        """Set up test data used across multiple test cases."""
-        # Create test user
-        self.user = User.objects.create_user(
-            username="testuser", password="testpass123"
-        )
-        self.client = Client()
-
-        # Create site configuration
-        self.site_config = SiteConfiguration.get_solo()
-        self.site_config.items_per_page = "6"
-        self.site_config.items_ordering = "type"
-        self.site_config.save()
-
-        # Create metadata
-        self.company = Company.objects.create(
-            name="Rio Grande Southern", country="US"
-        )
-        self.company2 = Company.objects.create(name="D&RGW", country="US")
-
-        self.scale_ho = Scale.objects.create(
-            scale="HO", ratio="1:87", tracks=16.5
-        )
-        self.scale_n = Scale.objects.create(
-            scale="N", ratio="1:160", tracks=9.0
-        )
-
-        self.stock_type = RollingStockType.objects.create(
-            type="Steam Locomotive", category="locomotive", order=1
-        )
-        self.stock_type2 = RollingStockType.objects.create(
-            type="Box Car", category="freight", order=2
-        )
-
-        self.real_manufacturer = Manufacturer.objects.create(
-            name="Baldwin Locomotive Works", category="real", country="US"
-        )
-        self.model_manufacturer = Manufacturer.objects.create(
-            name="Bachmann", category="model", country="US"
-        )
-
-        self.tag1 = Tag.objects.create(name="Narrow Gauge")
-        self.tag2 = Tag.objects.create(name="Colorado")
-
-        # Create rolling classes
-        self.rolling_class1 = RollingClass.objects.create(
-            identifier="C-19",
-            type=self.stock_type,
-            company=self.company,
-            description="<p>Narrow gauge steam locomotive</p>",
-        )
-
-        self.rolling_class2 = RollingClass.objects.create(
-            identifier="K-27",
-            type=self.stock_type,
-            company=self.company2,
-            description="<p>Another narrow gauge locomotive</p>",
-        )
-
-        # Create rolling stock
-        self.rolling_stock1 = RollingStock.objects.create(
-            rolling_class=self.rolling_class1,
-            road_number="346",
-            scale=self.scale_ho,
-            manufacturer=self.model_manufacturer,
-            item_number="28698",
-            published=True,
-            featured=True,
-        )
-        self.rolling_stock1.tags.add(self.tag1, self.tag2)
-
-        self.rolling_stock2 = RollingStock.objects.create(
-            rolling_class=self.rolling_class2,
-            road_number="455",
-            scale=self.scale_ho,
-            manufacturer=self.model_manufacturer,
-            item_number="28699",
-            published=True,
-            featured=False,
-        )
-
-        self.rolling_stock3 = RollingStock.objects.create(
-            rolling_class=self.rolling_class1,
-            road_number="340",
-            scale=self.scale_n,
-            manufacturer=self.model_manufacturer,
-            item_number="28700",
-            published=False,  # Unpublished
-        )
-
-        # Create consist
-        self.consist = Consist.objects.create(
-            identifier="Freight Train 1",
-            company=self.company,
-            scale=self.scale_ho,
-            era="1950s",
-            published=True,
-        )
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock1,
-            order=1,
-            load=False,
-        )
-
-        # Create bookshelf data
-        self.publisher = Publisher.objects.create(
-            name="Kalmbach Publishing", country="US"
-        )
-        self.author = Author.objects.create(
-            first_name="John", last_name="Doe"
-        )
-
-        self.book = Book.objects.create(
-            title="Model Railroading Basics",
-            publisher=self.publisher,
-            ISBN="978-0-89024-123-4",
-            language="en",
-            number_of_pages=200,
-            publication_year=2020,
-            published=True,
-        )
-        self.book.authors.add(self.author)
-
-        self.catalog = Catalog.objects.create(
-            manufacturer=self.model_manufacturer,
-            years="2020-2021",
-            publication_year=2020,
-            published=True,
-        )
-        self.catalog.scales.add(self.scale_ho)
-
-        self.magazine = Magazine.objects.create(
-            name="Model Railroader", publisher=self.publisher, published=True
-        )
-
-        self.magazine_issue = MagazineIssue.objects.create(
-            magazine=self.magazine,
-            issue_number="Jan 2020",
-            publication_year=2020,
-            publication_month=1,
-            published=True,
-        )
-
-        # Create flatpage
-        self.flatpage = Flatpage.objects.create(
-            name="About Us",
-            path="about-us",
-            content="<p>About our site</p>",
-            published=True,
-        )
-
-
-class GetHomeViewTest(PortalTestBase):
-    """Test cases for GetHome view (homepage)."""
-
-    def test_home_view_loads(self):
-        """Test that the home page loads successfully."""
-        response = self.client.get(reverse("index"))
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "home.html")
-
-    def test_home_view_shows_featured_items(self):
-        """Test that featured items appear on homepage."""
-        response = self.client.get(reverse("index"))
-        self.assertContains(response, "346")  # Featured rolling stock
-        self.assertIn(self.rolling_stock1, response.context["data"])
-
-    def test_home_view_hides_unpublished_for_anonymous(self):
-        """Test that unpublished items are hidden from anonymous users."""
-        response = self.client.get(reverse("index"))
-        # rolling_stock3 is unpublished, should not appear
-        self.assertNotIn(self.rolling_stock3, response.context["data"])
-
-    def test_home_view_shows_unpublished_for_authenticated(self):
-        """Test that authenticated users see unpublished items."""
-        self.client.login(username="testuser", password="testpass123")
-        response = self.client.get(reverse("index"))
-        # Authenticated users should see all items
-        self.assertEqual(response.status_code, 200)
-
-
-class GetRosterViewTest(PortalTestBase):
-    """Test cases for GetRoster view."""
-
-    def test_roster_view_loads(self):
-        """Test that the roster page loads successfully."""
-        response = self.client.get(reverse("roster"))
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "pagination.html")
-
-    def test_roster_view_shows_published_items(self):
-        """Test that roster shows published rolling stock."""
-        response = self.client.get(reverse("roster"))
-        self.assertIn(self.rolling_stock1, response.context["data"])
-        self.assertIn(self.rolling_stock2, response.context["data"])
-
-    def test_roster_pagination(self):
-        """Test roster pagination."""
-        # Create more items to test pagination
-        for i in range(10):
-            RollingStock.objects.create(
-                rolling_class=self.rolling_class1,
-                road_number=f"35{i}",
-                scale=self.scale_ho,
-                manufacturer=self.model_manufacturer,
-                published=True,
-            )
-
-        response = self.client.get(reverse("roster"))
-        self.assertIn("page_range", response.context)
-        # Should paginate with items_per_page=6
-        self.assertLessEqual(len(response.context["data"]), 6)
-
-
-class GetRollingStockViewTest(PortalTestBase):
-    """Test cases for GetRollingStock detail view."""
-
-    def test_rolling_stock_detail_view(self):
-        """Test rolling stock detail view loads correctly."""
-        url = reverse("rolling_stock", kwargs={"uuid": self.rolling_stock1.uuid})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "rollingstock.html")
-        self.assertEqual(
-            response.context["rolling_stock"], self.rolling_stock1
-        )
-
-    def test_rolling_stock_detail_with_properties(self):
-        """Test detail view includes properties and documents."""
-        url = reverse("rolling_stock", kwargs={"uuid": self.rolling_stock1.uuid})
-        response = self.client.get(url)
-        self.assertIn("properties", response.context)
-        self.assertIn("documents", response.context)
-        self.assertIn("class_properties", response.context)
-
-    def test_rolling_stock_detail_shows_consists(self):
-        """Test detail view shows consists this rolling stock is in."""
-        url = reverse("rolling_stock", kwargs={"uuid": self.rolling_stock1.uuid})
-        response = self.client.get(url)
-        self.assertIn("consists", response.context)
-        self.assertIn(self.consist, response.context["consists"])
-
-    def test_rolling_stock_detail_not_found(self):
-        """Test 404 for non-existent rolling stock."""
-        from uuid import uuid4
-
-        url = reverse("rolling_stock", kwargs={"uuid": uuid4()})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-
-class SearchObjectsViewTest(PortalTestBase):
-    """Test cases for SearchObjects view."""
-
-    def test_search_view_post(self):
-        """Test search via POST request."""
-        response = self.client.post(reverse("search"), {"search": "346"})
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "search.html")
-
-    def test_search_finds_rolling_stock(self):
-        """Test search finds rolling stock by road number."""
-        search_term = base64.b64encode(b"346").decode()
-        url = reverse("search", kwargs={"search": search_term, "page": 1})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        # Should find rolling_stock1 with road number 346
-
-    def test_search_with_filter_type(self):
-        """Test search with type filter."""
-        search_term = base64.b64encode(b"type:Steam").decode()
-        url = reverse("search", kwargs={"search": search_term, "page": 1})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_search_with_filter_company(self):
-        """Test search with company filter."""
-        search_term = base64.b64encode(b"company:Rio Grande").decode()
-        url = reverse("search", kwargs={"search": search_term, "page": 1})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_search_finds_books(self):
-        """Test search finds books."""
-        search_term = base64.b64encode(b"Railroading").decode()
-        url = reverse("search", kwargs={"search": search_term, "page": 1})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_search_empty_returns_bad_request(self):
-        """Test search with empty string returns error."""
-        response = self.client.post(reverse("search"), {"search": ""})
-        self.assertEqual(response.status_code, 400)
-
-
-class GetObjectsFilteredViewTest(PortalTestBase):
-    """Test cases for GetObjectsFiltered view."""
-
-    def test_filter_by_type(self):
-        """Test filtering by rolling stock type."""
-        url = reverse(
-            "filtered",
-            kwargs={"_filter": "type", "search": self.stock_type.slug},
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "filter.html")
-
-    def test_filter_by_company(self):
-        """Test filtering by company."""
-        url = reverse(
-            "filtered",
-            kwargs={"_filter": "company", "search": self.company.slug},
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_filter_by_scale(self):
-        """Test filtering by scale."""
-        url = reverse(
-            "filtered",
-            kwargs={"_filter": "scale", "search": self.scale_ho.slug},
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_filter_by_tag(self):
-        """Test filtering by tag."""
-        url = reverse(
-            "filtered", kwargs={"_filter": "tag", "search": self.tag1.slug}
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        # Should find rolling_stock1 which has tag1
-
-    def test_filter_invalid_raises_404(self):
-        """Test invalid filter type raises 404."""
-        url = reverse(
-            "filtered", kwargs={"_filter": "invalid", "search": "test"}
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-
-class GetManufacturerItemViewTest(PortalTestBase):
-    """Test cases for GetManufacturerItem view."""
-
-    def test_manufacturer_view_all_items(self):
-        """Test manufacturer view showing all items."""
-        url = reverse(
-            "manufacturer",
-            kwargs={
-                "manufacturer": self.model_manufacturer.slug,
-                "search": "all",
-            },
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "manufacturer.html")
-
-    def test_manufacturer_view_specific_item(self):
-        """Test manufacturer view filtered by item number."""
-        url = reverse(
-            "manufacturer",
-            kwargs={
-                "manufacturer": self.model_manufacturer.slug,
-                "search": self.rolling_stock1.item_number_slug,
-            },
-        )
-        response = self.client.get(url)
-        # Should return rolling stock with that item number
-        self.assertEqual(response.status_code, 200)
-
-    def test_manufacturer_not_found(self):
-        """Test 404 for non-existent manufacturer."""
-        url = reverse(
-            "manufacturer",
-            kwargs={"manufacturer": "nonexistent", "search": "all"},
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-
-class ConsistsViewTest(PortalTestBase):
-    """Test cases for Consists list view."""
-
-    def test_consists_list_view(self):
-        """Test consists list view loads."""
-        response = self.client.get(reverse("consists"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.consist, response.context["data"])
-
-    def test_consists_pagination(self):
-        """Test consists list pagination."""
-        # Create more consists for pagination
-        for i in range(10):
-            Consist.objects.create(
-                identifier=f"Train {i}",
-                company=self.company,
-                scale=self.scale_ho,
-                published=True,
-            )
-
-        response = self.client.get(reverse("consists"))
-        self.assertIn("page_range", response.context)
-
-
-class GetConsistViewTest(PortalTestBase):
-    """Test cases for GetConsist detail view."""
-
-    def test_consist_detail_view(self):
-        """Test consist detail view loads correctly."""
-        url = reverse("consist", kwargs={"uuid": self.consist.uuid})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "consist.html")
-        self.assertEqual(response.context["consist"], self.consist)
-
-    def test_consist_shows_rolling_stock(self):
-        """Test consist detail shows constituent rolling stock."""
-        url = reverse("consist", kwargs={"uuid": self.consist.uuid})
-        response = self.client.get(url)
-        self.assertIn("data", response.context)
-        # Should show rolling_stock1 which is in the consist
-
-    def test_consist_not_found(self):
-        """Test 404 for non-existent consist."""
-        from uuid import uuid4
-
-        url = reverse("consist", kwargs={"uuid": uuid4()})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-
-class MetadataListViewsTest(PortalTestBase):
-    """Test cases for metadata list views (Companies, Scales, Types)."""
-
-    def test_companies_view(self):
-        """Test companies list view."""
-        response = self.client.get(reverse("companies"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.company, response.context["data"])
-
-    def test_manufacturers_view_real(self):
-        """Test manufacturers view for real manufacturers."""
-        url = reverse("manufacturers", kwargs={"category": "real"})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.real_manufacturer, response.context["data"])
-
-    def test_manufacturers_view_model(self):
-        """Test manufacturers view for model manufacturers."""
-        url = reverse("manufacturers", kwargs={"category": "model"})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.model_manufacturer, response.context["data"])
-
-    def test_manufacturers_invalid_category(self):
-        """Test manufacturers view with invalid category."""
-        url = reverse("manufacturers", kwargs={"category": "invalid"})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-    def test_scales_view(self):
-        """Test scales list view."""
-        response = self.client.get(reverse("scales"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.scale_ho, response.context["data"])
-
-    def test_types_view(self):
-        """Test rolling stock types list view."""
-        response = self.client.get(reverse("rolling_stock_types"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.stock_type, response.context["data"])
-
-
-class BookshelfViewsTest(PortalTestBase):
-    """Test cases for bookshelf views."""
-
-    def test_books_list_view(self):
-        """Test books list view."""
-        response = self.client.get(reverse("books"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.book, response.context["data"])
-
-    def test_catalogs_list_view(self):
-        """Test catalogs list view."""
-        response = self.client.get(reverse("catalogs"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.catalog, response.context["data"])
-
-    def test_magazines_list_view(self):
-        """Test magazines list view."""
-        response = self.client.get(reverse("magazines"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(self.magazine, response.context["data"])
-
-    def test_book_detail_view(self):
-        """Test book detail view."""
-        url = reverse(
-            "bookshelf_item",
-            kwargs={"selector": "book", "uuid": self.book.uuid},
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "bookshelf/book.html")
-        self.assertEqual(response.context["data"], self.book)
-
-    def test_catalog_detail_view(self):
-        """Test catalog detail view."""
-        url = reverse(
-            "bookshelf_item",
-            kwargs={"selector": "catalog", "uuid": self.catalog.uuid},
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["data"], self.catalog)
-
-    def test_bookshelf_item_invalid_selector(self):
-        """Test bookshelf item with invalid selector."""
-        url = reverse(
-            "bookshelf_item",
-            kwargs={"selector": "invalid", "uuid": self.book.uuid},
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-    def test_magazine_detail_view(self):
-        """Test magazine detail view."""
-        url = reverse("magazine", kwargs={"uuid": self.magazine.uuid})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "bookshelf/magazine.html")
-
-    def test_magazine_issue_detail_view(self):
-        """Test magazine issue detail view."""
-        url = reverse(
-            "issue",
-            kwargs={
-                "magazine": self.magazine.uuid,
-                "uuid": self.magazine_issue.uuid,
-            },
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["data"], self.magazine_issue)
-
-
-class FlatpageViewTest(PortalTestBase):
-    """Test cases for Flatpage view."""
-
-    def test_flatpage_view_loads(self):
-        """Test flatpage loads correctly."""
-        url = reverse("flatpage", kwargs={"flatpage": self.flatpage.path})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "flatpages/flatpage.html")
-        self.assertEqual(response.context["flatpage"], self.flatpage)
-
-    def test_flatpage_not_found(self):
-        """Test 404 for non-existent flatpage."""
-        url = reverse("flatpage", kwargs={"flatpage": "nonexistent"})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-    def test_unpublished_flatpage_hidden_from_anonymous(self):
-        """Test unpublished flatpage is hidden from anonymous users."""
-        self.flatpage.published = False
-        self.flatpage.save()
-
-        url = reverse("flatpage", kwargs={"flatpage": self.flatpage.path})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-
-class RenderExtraJSViewTest(PortalTestBase):
-    """Test cases for RenderExtraJS view."""
-
-    def test_extra_js_view_loads(self):
-        """Test extra JS endpoint loads."""
-        response = self.client.get(reverse("extra_js"))
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response["Content-Type"], "application/javascript")
-
-    def test_extra_js_returns_configured_content(self):
-        """Test extra JS returns configured JavaScript."""
-        self.site_config.extra_js = "console.log('test');"
-        self.site_config.save()
-
-        response = self.client.get(reverse("extra_js"))
-        self.assertContains(response, "console.log('test');")
-
-
-class QueryOptimizationTest(PortalTestBase):
-    """Test cases to verify query optimization is working."""
-
-    def test_rolling_stock_list_uses_select_related(self):
-        """Test that rolling stock list view uses query optimization."""
-        # This test verifies the optimization exists in the code
-        # In a real scenario, you'd use django-debug-toolbar or
-        # assertNumQueries to verify actual query counts
-        response = self.client.get(reverse("roster"))
-        self.assertEqual(response.status_code, 200)
-        # If optimization is working, this should use far fewer queries
-        # than the number of rolling stock items
-
-    def test_consist_detail_uses_prefetch_related(self):
-        """Test that consist detail view uses query optimization."""
-        url = reverse("consist", kwargs={"uuid": self.consist.uuid})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        # Should prefetch rolling stock items to avoid N+1 queries

ram/portal/urls.py

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

ram/portal/views.py

@@ -4,13 +4,10 @@ from itertools import chain
 from functools import reduce
 from urllib.parse import unquote
 
-from django.conf import settings
 from django.views import View
-from django.urls import Resolver404
+from django.http import Http404, HttpResponseBadRequest
-from django.http import Http404, HttpResponse, HttpResponseBadRequest
 from django.db.utils import OperationalError, ProgrammingError
 from django.db.models import F, Q, Count
-from django.db.models.functions import Lower
 from django.shortcuts import render, get_object_or_404, get_list_or_404
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.paginator import Paginator
@@ -19,7 +16,7 @@ from portal.utils import get_site_conf
 from portal.models import Flatpage
 from roster.models import RollingStock
 from consist.models import Consist
-from bookshelf.models import Book, Catalog, Magazine, MagazineIssue
+from bookshelf.models import Book, Catalog
 from metadata.models import (
     Company,
     Manufacturer,
@@ -34,78 +31,52 @@ def get_items_per_page():
         items_per_page = get_site_conf().items_per_page
     except (OperationalError, ProgrammingError):
         items_per_page = 6
-    return int(items_per_page)
+    return items_per_page
 
 
-def get_items_ordering(config="items_ordering"):
+def get_order_by_field():
     try:
-        order_by = getattr(get_site_conf(), config)
+        order_by = get_site_conf().items_ordering
     except (OperationalError, ProgrammingError):
         order_by = "type"
 
     fields = [
-        "rolling_class__type",              # 0
+        "rolling_class__type",
-        "rolling_class__company",           # 1
+        "rolling_class__company",
-        "rolling_class__company__country",  # 2
+        "rolling_class__identifier",
-        "rolling_class__identifier",        # 3
+        "road_number_int",
-        "road_number_int",                  # 4
     ]
 
-    order_map = {
+    if order_by == "type":
-        "type": (0, 1, 3, 4),
+        return (fields[0], fields[1], fields[2], fields[3])
-        "company": (1, 0, 3, 4),
+    elif order_by == "company":
-        "country": (2, 0, 1, 3, 4),
+        return (fields[1], fields[0], fields[2], fields[3])
-        "cou+com": (2, 1, 0, 3, 4),
+    elif order_by == "identifier":
-        "class": (0, 3, 1, 4),
+        return (fields[2], fields[0], fields[1], fields[3])
-    }
-
-    return tuple(fields[i] for i in order_map.get(order_by, "type"))
 
 
 class Render404(View):
     def get(self, request, exception):
-        generic_message = "Page not found"
+        return render(request, "base.html", {"title": "404 page not found"})
-        if isinstance(exception, Resolver404):
-            message = generic_message
-        else:
-            message = str(exception) if exception else generic_message
-
-        return render(
-            request,
-            "base.html",
-            {"title": message},
-            status=404,
-        )
-
-
-class RenderExtraJS(View):
-    def get(self, request):
-        try:
-            extra_js = get_site_conf().extra_js
-        except (OperationalError, ProgrammingError):
-            extra_js = ""
-
-        return HttpResponse(extra_js, content_type="application/javascript")
 
 
 class GetData(View):
-    title = None
+    title = "Home"
     template = "pagination.html"
+    item_type = "roster"
     filter = Q()  # empty filter by default
 
     def get_data(self, request):
         return (
             RollingStock.objects.get_published(request.user)
-            .with_related()
+            .order_by(*get_order_by_field())
-            .order_by(*get_items_ordering())
             .filter(self.filter)
         )
 
     def get(self, request, page=1):
-        if self.title is None or self.template is None:
+        data = []
-            raise Exception("title and template must be defined")
+        for item in self.get_data(request):
-
+            data.append({"type": self.item_type, "item": item})
-        data = list(self.get_data(request))
 
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -118,6 +89,7 @@ class GetData(View):
             self.template,
             {
                 "title": self.title,
+                "type": self.item_type,
                 "data": data,
                 "matches": paginator.count,
                 "page_range": page_range,
@@ -125,39 +97,18 @@ class GetData(View):
         )
 
 
-class GetHome(GetData):
-    title = "Home"
-    template = "home.html"
-
-    def get_data(self, request):
-        max_items = min(settings.FEATURED_ITEMS_MAX, get_items_per_page())
-        return (
-            RollingStock.objects.get_published(request.user)
-            .with_related()
-            .filter(featured=True)
-            .order_by(*get_items_ordering(config="featured_items_ordering"))[
-                :max_items
-            ]
-        ) or super().get_data(request)
-
-
 class GetRoster(GetData):
     title = "The Roster"
+    item_type = "roster"
+
+    def get_data(self, request):
+        return RollingStock.objects.get_published(request.user).order_by(
+            *get_order_by_field()
+        )
 
 
 class SearchObjects(View):
     def run_search(self, request, search, _filter, page=1):
-        """
-        Run the search query on the database and return the results.
-        param request: HTTP request
-        param search: search string
-        param _filter: filter to apply (type, company, manufacturer, scale)
-        param page: page number for pagination
-        return: tuple (data, matches, page_range)
-        1. data: list of dicts with keys "type" and "item"
-        2. matches: total number of matches
-        3. page_range: elided page range for pagination
-        """
         if _filter is None:
             query = reduce(
                 operator.or_,
@@ -200,19 +151,19 @@ class SearchObjects(View):
         # FIXME duplicated code!
         # FIXME see if it makes sense to filter calatogs and books by scale
         #       and manufacturer as well
+        data = []
         roster = (
             RollingStock.objects.get_published(request.user)
-            .with_related()
             .filter(query)
             .distinct()
-            .order_by(*get_items_ordering())
+            .order_by(*get_order_by_field())
         )
-        data = list(roster)
+        for item in roster:
+            data.append({"type": "roster", "item": item})
 
         if _filter is None:
             consists = (
                 Consist.objects.get_published(request.user)
-                .with_related()
                 .filter(
                     Q(
                         Q(identifier__icontains=search)
@@ -221,44 +172,20 @@ class SearchObjects(View):
                 )
                 .distinct()
             )
-            data = list(chain(data, consists))
+            for item in consists:
+                data.append({"type": "consist", "item": item})
             books = (
                 Book.objects.get_published(request.user)
-                .with_related()
+                .filter(title__icontains=search)
-                .filter(
-                    Q(
-                        Q(title__icontains=search)
-                        | Q(description__icontains=search)
-                        | Q(toc__title__icontains=search)
-                    )
-                )
                 .distinct()
             )
             catalogs = (
                 Catalog.objects.get_published(request.user)
-                .with_related()
+                .filter(manufacturer__name__icontains=search)
-                .filter(
-                    Q(
-                        Q(manufacturer__name__icontains=search)
-                        | Q(description__icontains=search)
-                    )
-                )
                 .distinct()
             )
-            data = list(chain(data, books, catalogs))
+            for item in list(chain(books, catalogs)):
-            magazine_issues = (
+                data.append({"type": "book", "item": item})
-                MagazineIssue.objects.get_published(request.user)
-                .with_related()
-                .filter(
-                    Q(
-                        Q(magazine__name__icontains=search)
-                        | Q(description__icontains=search)
-                        | Q(toc__title__icontains=search)
-                    )
-                )
-                .distinct()
-            )
-            data = list(chain(data, magazine_issues))
 
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -284,9 +211,6 @@ class SearchObjects(View):
         return _filter, search
 
     def get(self, request, search, page=1):
-        if not search:
-            return HttpResponseBadRequest()
-
         try:
             encoded_search = search
             search = base64.b64decode(search.encode()).decode()
@@ -317,43 +241,20 @@ class SearchObjects(View):
 
 class GetManufacturerItem(View):
     def get(self, request, manufacturer, search="all", page=1):
-        """
-        Get all items from a specific manufacturer. If `search` is not "all",
-        filter by item number as well, for example to get all itmes from the
-        same set.
-        The view returns both rolling stock and catalogs.
-        param request: HTTP request
-        param manufacturer: Manufacturer slug
-        param search: item number slug or "all"
-        param page: page number for pagination
-        return: rendered template
-        1. manufacturer: Manufacturer object
-        2. search: item number slug or "all"
-        3. data: list of dicts with keys "type" and "item"
-        4. matches: total number of matches
-        5. page_range: elided page range for pagination
-        """
         manufacturer = get_object_or_404(
             Manufacturer, slug__iexact=manufacturer
         )
+
         if search != "all":
             roster = get_list_or_404(
-                RollingStock.objects.get_published(request.user)
+                RollingStock.objects.get_published(request.user).order_by(
-                .select_related(
+                    *get_order_by_field()
-                    'rolling_class',
+                ),
-                    'rolling_class__company',
-                    'rolling_class__type',
-                    'manufacturer',
-                    'scale',
-                )
-                .prefetch_related('image')
-                .order_by(*get_items_ordering()),
                 Q(
                     Q(manufacturer=manufacturer)
                     & Q(item_number_slug__exact=search)
                 ),
             )
-            catalogs = []  # no catalogs when searching for a specific item
             title = "{0}: {1}".format(
                 manufacturer,
                 # all returned records must have the same `item_number``;
@@ -363,22 +264,19 @@ class GetManufacturerItem(View):
         else:
             roster = (
                 RollingStock.objects.get_published(request.user)
-                .with_related()
                 .filter(
                     Q(manufacturer=manufacturer)
                     | Q(rolling_class__manufacturer=manufacturer)
                 )
                 .distinct()
-                .order_by(*get_items_ordering())
+                .order_by(*get_order_by_field())
-            )
-            catalogs = (
-                Catalog.objects.get_published(request.user)
-                .with_related()
-                .filter(manufacturer=manufacturer)
             )
             title = "Manufacturer: {0}".format(manufacturer)
 
-        data = list(chain(roster, catalogs))
+        data = []
+        for item in roster:
+            data.append({"type": "roster", "item": item})
+
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
         page_range = paginator.get_elided_page_range(
@@ -422,51 +320,38 @@ class GetObjectsFiltered(View):
 
         roster = (
             RollingStock.objects.get_published(request.user)
-            .with_related()
             .filter(query)
             .distinct()
-            .order_by(*get_items_ordering())
+            .order_by(*get_order_by_field())
         )
 
-        data = list(roster)
+        data = []
-
+        for item in roster:
-        if _filter == "scale":
+            data.append({"type": "roster", "item": item})
-            catalogs = (
-                Catalog.objects.get_published(request.user)
-                .with_related()
-                .filter(scales__slug=search)
-                .distinct()
-            )
-            data = list(chain(data, catalogs))
 
         try:  # Execute only if query_2nd is defined
             consists = (
                 Consist.objects.get_published(request.user)
-                .with_related()
                 .filter(query_2nd)
                 .distinct()
             )
-            data = list(chain(data, consists))
+            for item in consists:
+                data.append({"type": "consist", "item": item})
             if _filter == "tag":  # Books can be filtered only by tag
                 books = (
                     Book.objects.get_published(request.user)
-                    .with_related()
                     .filter(query_2nd)
                     .distinct()
                 )
+                for item in books:
+                    data.append({"type": "book", "item": item})
                 catalogs = (
                     Catalog.objects.get_published(request.user)
-                    .with_related()
                     .filter(query_2nd)
                     .distinct()
                 )
-                magazine_issues = (
+                for item in catalogs:
-                    MagazineIssue.objects.get_published(request.user)
+                    data.append({"type": "catalog", "item": item})
-                    .with_related()
-                    .filter(query_2nd)
-                    .distinct()
-                )
-                data = list(chain(data, books, catalogs, magazine_issues))
         except NameError:
             pass
 
@@ -500,11 +385,9 @@ class GetObjectsFiltered(View):
 class GetRollingStock(View):
     def get(self, request, uuid):
         try:
-            rolling_stock = (
+            rolling_stock = RollingStock.objects.get_published(
-                RollingStock.objects.get_published(request.user)
+                request.user
-                .with_details()
+            ).get(uuid=uuid)
-                .get(uuid=uuid)
-            )
         except ObjectDoesNotExist:
             raise Http404
 
@@ -522,23 +405,24 @@ class GetRollingStock(View):
                 request.user
             )
 
-        consists = list(
+        consists = [
-            Consist.objects.get_published(request.user)
+            {"type": "consist", "item": c}
-            .with_related()
+            for c in Consist.objects.get_published(request.user).filter(
-            .filter(consist_item__rolling_stock=rolling_stock)
+                consist_item__rolling_stock=rolling_stock
-        )
+            )
+        ]  # A dict with "item" is required by the consists card
 
-        trainset = list(
+        set = [
-            RollingStock.objects.get_published(request.user)
+            {"type": "set", "item": s}
-            .with_related()
+            for s in RollingStock.objects.get_published(request.user)
             .filter(
                 Q(
                     Q(item_number__exact=rolling_stock.item_number)
                     & Q(set=True)
                 )
             )
-            .order_by(*get_items_ordering())
+            .order_by(*get_order_by_field())
-        )
+        ]
 
         return render(
             request,
@@ -551,7 +435,7 @@ class GetRollingStock(View):
                 "decoder_documents": decoder_documents,
                 "documents": documents,
                 "journal": journal,
-                "set": trainset,
+                "set": set,
                 "consists": consists,
             },
         )
@@ -559,52 +443,28 @@ class GetRollingStock(View):
 
 class Consists(GetData):
     title = "Consists"
+    item_type = "consist"
 
     def get_data(self, request):
-        return (
+        return Consist.objects.get_published(request.user).all()
-            Consist.objects.get_published(request.user)
-            .with_related()
-            .all()
-        )
 
 
 class GetConsist(View):
     def get(self, request, uuid, page=1):
         try:
-            consist = (
+            consist = Consist.objects.get_published(request.user).get(
-                Consist.objects.get_published(request.user)
+                uuid=uuid
-                .with_rolling_stock()
-                .get(uuid=uuid)
             )
         except ObjectDoesNotExist:
             raise Http404
-
-        # Get all published rolling stock IDs for efficient filtering
-        published_ids = set(
-            RollingStock.objects.get_published(request.user)
-            .values_list('uuid', flat=True)
-        )
-
-        # Fetch consist items with related rolling stock in one query
-        consist_items = consist.consist_item.select_related(
-            'rolling_stock',
-            'rolling_stock__rolling_class',
-            'rolling_stock__rolling_class__company',
-            'rolling_stock__rolling_class__type',
-            'rolling_stock__manufacturer',
-            'rolling_stock__scale',
-        ).prefetch_related('rolling_stock__image')
-
-        # Filter items and loads efficiently
         data = [
-            item.rolling_stock
+            {
-            for item in consist_items.filter(load=False)
+                "type": "roster",
-            if item.rolling_stock.uuid in published_ids
+                "item": RollingStock.objects.get_published(request.user).get(
-        ]
+                    uuid=r.rolling_stock_id
-        loads = [
+                ),
-            item.rolling_stock
+            }
-            for item in consist_items.filter(load=True)
+            for r in consist.consist_item.all()
-            if item.rolling_stock.uuid in published_ids
         ]
 
         paginator = Paginator(data, get_items_per_page())
@@ -620,8 +480,6 @@ class GetConsist(View):
                 "title": consist,
                 "consist": consist,
                 "data": data,
-                "loads": loads,
-                "loads_count": len(loads),
                 "page_range": page_range,
             },
         )
@@ -629,11 +487,11 @@ class GetConsist(View):
 
 class Manufacturers(GetData):
     title = "Manufacturers"
+    item_type = "manufacturer"
 
     def get_data(self, request):
         return (
-            Manufacturer.objects.filter(self.filter)
+            Manufacturer.objects.filter(self.filter).annotate(
-            .annotate(
                 num_rollingstock=(
                     Count(
                         "rollingstock",
@@ -663,26 +521,7 @@ class Manufacturers(GetData):
                     )
                 )
             )
-            .annotate(
+            .annotate(num_items=F("num_rollingstock") + F("num_rollingclass"))
-                num_catalogs=(
-                    Count(
-                        "catalogs",
-                        filter=Q(
-                            catalogs__in=(
-                                Catalog.objects.get_published(request.user)
-                            ),
-                        ),
-                        distinct=True,
-                    )
-                )
-            )
-            .annotate(
-                num_items=(
-                    F("num_rollingstock")
-                    + F("num_rollingclass")
-                    + F("num_catalogs")
-                )
-            )
             .order_by("name")
         )
 
@@ -697,6 +536,7 @@ class Manufacturers(GetData):
 
 class Companies(GetData):
     title = "Companies"
+    item_type = "company"
 
     def get_data(self, request):
         return (
@@ -735,6 +575,7 @@ class Companies(GetData):
 
 class Scales(GetData):
     title = "Scales"
+    item_type = "scale"
 
     def get_data(self, request):
         return (
@@ -751,25 +592,21 @@ class Scales(GetData):
                 num_consists=Count(
                     "consist",
                     filter=Q(
-                        consist__in=Consist.objects.get_published(request.user)
+                        consist__in=Consist.objects.get_published(
+                            request.user
+                        )
                     ),
                     distinct=True,
                 ),
-                num_catalogs=Count("catalogs", distinct=True),
-            )
-            .annotate(
-                num_items=(
-                    F("num_rollingstock")
-                    + F("num_consists")
-                    + F("num_catalogs")
-                )
             )
+            .annotate(num_items=F("num_rollingstock") + F("num_consists"))
             .order_by("-ratio_int", "-tracks", "scale")
         )
 
 
 class Types(GetData):
     title = "Types"
+    item_type = "rolling_stock_type"
 
     def get_data(self, request):
         return RollingStockType.objects.annotate(
@@ -786,121 +623,26 @@ class Types(GetData):
 
 class Books(GetData):
     title = "Books"
+    item_type = "book"
 
     def get_data(self, request):
-        return (
+        return Book.objects.get_published(request.user).all()
-            Book.objects.get_published(request.user)
-            .with_related()
-            .all()
-        )
 
 
 class Catalogs(GetData):
     title = "Catalogs"
+    item_type = "catalog"
 
     def get_data(self, request):
-        return (
+        return Catalog.objects.get_published(request.user).all()
-            Catalog.objects.get_published(request.user)
-            .with_related()
-            .all()
-        )
-
-
-class Magazines(GetData):
-    title = "Magazines"
-
-    def get_data(self, request):
-        return (
-            Magazine.objects.get_published(request.user)
-            .select_related('publisher')
-            .prefetch_related('tags')
-            .order_by(Lower("name"))
-            .annotate(
-                issues=Count(
-                    "issue",
-                    filter=Q(
-                        issue__in=(
-                            MagazineIssue.objects.get_published(request.user)
-                        )
-                    ),
-                )
-            )
-        )
-
-
-class GetMagazine(View):
-    def get(self, request, uuid, page=1):
-        try:
-            magazine = (
-                Magazine.objects.get_published(request.user)
-                .select_related('publisher')
-                .prefetch_related('tags')
-                .get(uuid=uuid)
-            )
-        except ObjectDoesNotExist:
-            raise Http404
-        data = list(
-            magazine.issue.get_published(request.user)
-            .with_related()
-            .all()
-        )
-        paginator = Paginator(data, get_items_per_page())
-        data = paginator.get_page(page)
-        page_range = paginator.get_elided_page_range(
-            data.number, on_each_side=1, on_ends=1
-        )
-
-        return render(
-            request,
-            "bookshelf/magazine.html",
-            {
-                "title": magazine,
-                "magazine": magazine,
-                "data": data,
-                "matches": paginator.count,
-                "page_range": page_range,
-            },
-        )
-
-
-class GetMagazineIssue(View):
-    def get(self, request, uuid, magazine, page=1):
-        try:
-            issue = (
-                MagazineIssue.objects.get_published(request.user)
-                .with_details()
-                .get(uuid=uuid, magazine__uuid=magazine)
-            )
-        except ObjectDoesNotExist:
-            raise Http404
-        properties = issue.property.get_public(request.user)
-        documents = issue.document.get_public(request.user)
-        return render(
-            request,
-            "bookshelf/book.html",
-            {
-                "title": issue,
-                "data": issue,
-                "documents": documents,
-                "properties": properties,
-            },
-        )
 
 
 class GetBookCatalog(View):
     def get_object(self, request, uuid, selector):
         if selector == "book":
-            return (
+            return Book.objects.get_published(request.user).get(uuid=uuid)
-                Book.objects.get_published(request.user)
-                .with_details()
-                .get(uuid=uuid)
-            )
         elif selector == "catalog":
-            return (
+            return Catalog.objects.get_published(request.user).get(uuid=uuid)
-                Catalog.objects.get_published(request.user)
-                .with_details()
-                .get(uuid=uuid)
-            )
         else:
             raise Http404
 
@@ -917,9 +659,10 @@ class GetBookCatalog(View):
             "bookshelf/book.html",
             {
                 "title": book,
-                "data": book,
+                "book": book,
                 "documents": documents,
                 "properties": properties,
+                "type": selector,
             },
         )
 

ram/ram/__init__.py

@@ -1,13 +1,4 @@
-from django import VERSION as DJANGO_VERSION
-from django.utils.termcolors import colorize
 from ram.utils import git_suffix
 
-if DJANGO_VERSION < (6, 0):
+__version__ = "0.17.15"
-    exit(
-        colorize(
-            "ERROR: This project requires Django 6.0 or higher.", fg="red"
-        )
-    )
-
-__version__ = "0.20.1"
 __version__ += git_suffix(__file__)