Improve page layout on mobile

Bugfixing (#27 )
* Enforce ordering on some metadata models * Fix a 500 error while accessing flat pages * Clean up HTML and fix cards (missing class) * Make the "driver" app optional and disabled by default
2025-08-07 14:47:49 +02:00 · 2023-10-11 22:39:29 +02:00 · 2023-10-10 22:17:21 +02:00 · 2023-10-09 23:17:00 +02:00 · 2023-10-09 23:16:06 +02:00
16 changed files with 67 additions and 27 deletions
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -13,7 +13,7 @@ jobs:
    strategy:
      max-parallel: 2
      matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']

    steps:
    - uses: actions/checkout@v3
--- a/ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py
+++ b/ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2023-10-10 12:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("metadata", "0013_decoderdocument_private"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="decoder",
+            options={"ordering": ["manufacturer", "name"]},
+        ),
+        migrations.AlterModelOptions(
+            name="tag",
+            options={"ordering": ["name"]},
+        ),
+    ]
--- a/ram/metadata/models.py
+++ b/ram/metadata/models.py
@@ -95,6 +95,9 @@ class Decoder(models.Model):
        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
    )

+    class Meta(object):
+        ordering = ["manufacturer", "name"]
+
    def __str__(self):
        return "{0} - {1}".format(self.manufacturer, self.name)

@@ -163,6 +166,9 @@ class Tag(models.Model):
    name = models.CharField(max_length=128, unique=True)
    slug = models.CharField(max_length=128, unique=True)

+    class Meta(object):
+        ordering = ["name"]
+
    def __str__(self):
        return self.name

--- a/ram/portal/static/css/main.css
+++ b/ram/portal/static/css/main.css
@@ -7,6 +7,11 @@ html[data-bs-theme='dark'] .navbar svg {
  width: 100%;
 }

+td > img.logo {
+  max-width: 200px;
+  max-height: 48px;
+}
+
 .btn > span {
  display: inline-block;
 }
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -121,7 +121,7 @@
  </head>
  <body>
    <header>
-      <nav class="navbar navbar-expand-lg bg-body-tertiary shadow-sm">
+      <nav class="navbar navbar-expand-sm bg-body-tertiary shadow-sm">
        <div class="container d-flex">
          <div class="me-auto">
            <a href="{% url 'index' %}" class="navbar-brand d-flex align-items-center">
@@ -146,7 +146,10 @@
        <nav class="navbar navbar-expand-lg">
          <div class="container-fluid g-0">
            <a class="navbar-brand" href="{% url 'index' %}">Home</a>
-            <div class="navbar-collapse" id="navbarSupportedContent">
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
              <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                <li class="nav-item dropdown">
                  <a class="nav-link dropdown-toggle" href="#" id="rosterDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
--- a/ram/portal/templates/cards.html
+++ b/ram/portal/templates/cards.html
@@ -3,7 +3,7 @@
        <p class="lead text-muted">Results found: {{ matches }}</p>
      {% endblock %}
      {% block cards_layout %}
-      <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
+      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
      {% block cards %}
        {% for d in data %}
        {% if d.type == "rolling_stock" %}
--- a/ram/portal/templates/cards/book.html
+++ b/ram/portal/templates/cards/book.html
@@ -1,11 +1,7 @@
        <div class="col">
          <div class="card shadow-sm">
-            {% if d.item.image.all %}
-            <a href="{{ d.item.get_absolute_url }}">
-              {% for r in d.item.image.all %}
-                {% if forloop.first %}<img src="{{ r.image.url }}" alt="Card image cap">{% endif %}
-              {% endfor %}
-              </a>
+            {% if d.item.image.exists %}
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d }}"></a>
            {% endif %}
            <div class="card-body">
              <p class="card-text" style="position: relative;">
--- a/ram/portal/templates/cards/consist.html
+++ b/ram/portal/templates/cards/consist.html
@@ -2,12 +2,10 @@
        <div class="card shadow-sm">
          <a href="{{ d.item.get_absolute_url }}">
          {% if d.item.image %}
-            <img src="{{ d.item.image.url }}" alt="Card image cap">
+            <img class="card-img-top" src="{{ d.item.image.url }}" alt="{{ d }}">
          {% else %}
            {% with d.item.consist_item.first.rolling_stock as r %}
-            {% for i in r.image.all %}
-              {% if forloop.first %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
-            {% endfor %}
+            <img class="card-img-top" src="{{ r.image.first.image.url }}" alt="{{ d }}"></a>
            {% endwith %}
          {% endif %}
          </a>
--- a/ram/portal/templates/cards/manufacturer.html
+++ b/ram/portal/templates/cards/manufacturer.html
@@ -14,7 +14,7 @@
                  {% if d.item.logo %}
                  <tr>
                    <th class="w-33" scope="row">Logo</th>
-                    <td><img style="max-height: 48px" src="{{ d.item.logo.url }}" /></td>
+                    <td><img class="logo" src="{{ d.item.logo.url }}" /></td>
                  </tr>
                  {% endif %}
                  {% if d.item.website %}
--- a/ram/portal/templates/includes/login.html
+++ b/ram/portal/templates/includes/login.html
@@ -1,4 +1,7 @@
-      <div class="navbar-collapse justify-content-end" id="loginNavbar">
+     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#loginNavbar" aria-controls="loginNavbar" aria-expanded="false" aria-label="Toggle navigation">
+     <span class="bi bi-box-arrow-in-right"></span>
+     </button>
+      <div class="collapse navbar-collapse justify-content-end" id="loginNavbar">
        <ul class="navbar-nav">
          <li class="nav-item dropdown">
            {% if request.user.is_staff %}
@@ -14,7 +17,6 @@
              <li><hr class="dropdown-divider"></li>
              <li><a class="dropdown-item" href="{% url 'admin:index' %}">Admin</a></li>
              <li><a class="dropdown-item" href="{% url 'admin:portal_siteconfiguration_changelist' %}">Site configuration</a></li>
-              <li><a class="dropdown-item" href="{% url 'admin:driver_driverconfiguration_changelist' %}">DCC configuration</a></li>
              <li><hr class="dropdown-divider"></li>
              <li><a class="dropdown-item text-danger" href="{% url 'admin:logout' %}?next={{ request.path }}">Logout</a></li>
            </ul>
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -244,7 +244,7 @@
                  <table class="table table-striped">
                    <thead>
                      <tr>
-                        <th colspan="2" scope="row">DCC data</th>
+                        <th colspan="2" scope="row">Decoder data</th>
                      </tr>
                    </thead>
                    <tbody class="table-group-divider">
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -444,14 +444,15 @@ class GetBook(View):

 class GetFlatpage(View):
    def get(self, request, flatpage):
+        _filter = Q(published=True)  # Show only published pages
+        if request.user.is_authenticated:
+            _filter = Q()  # Reset the filter if user is authenticated
+
        try:
-            flatpage = Flatpage.objects.get(path=flatpage)
+            flatpage = Flatpage.objects.filter(_filter).get(path=flatpage)
        except ObjectDoesNotExist:
            raise Http404

-        if not request.user.is_authenticated:
-            flatpage = flatpage.filter(published=False)
-
        return render(
            request,
            "flatpages/flatpage.html",
--- a/ram/ram/init.py
+++ b/ram/ram/init.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix

-__version__ = "0.6.5"
+__version__ = "0.7.1"
 __version__ += git_suffix(__file__)
--- a/ram/ram/settings.py
+++ b/ram/ram/settings.py
@@ -51,7 +51,7 @@ INSTALLED_APPS = [
    "rest_framework",
    "ram",
    "portal",
-    "driver",
+    # "driver",
    "metadata",
    "roster",
    "consist",
--- a/ram/ram/urls.py
+++ b/ram/ram/urls.py
@@ -13,6 +13,7 @@ Including another URLconf
    1. Import the include() function: from django.urls import include, path
    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.apps import apps
 from django.conf import settings
 from django.shortcuts import redirect
 from django.conf.urls.static import static
@@ -27,10 +28,15 @@ urlpatterns = [
    path("admin/", admin.site.urls),
    path("api/v1/consist/", include("consist.urls")),
    path("api/v1/roster/", include("roster.urls")),
-    path("api/v1/dcc/", include("driver.urls")),
    path("api/v1/bookshelf/", include("bookshelf.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

+# Enable the "/dcc" routing only if the "driver" app is active
+if apps.is_installed("driver"):
+    urlpatterns += [
+        path("api/v1/dcc/", include("driver.urls")),
+    ]
+
 if settings.DEBUG:
    from django.views.generic import TemplateView
    from rest_framework.schemas import get_schema_view
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,5 +8,8 @@ django-countries
 django-health-check
 django-admin-sortable2
 django-ckeditor
-# psycopg2-binary
-pySerial
+# Optional: # psycopg2-binary
+# Optional: # pySerial
+# Required by django-countries and not always installed
+# by default on modern venvs (like Python 3.12 on Fedora 39)
+setuptools
Author	SHA1	Message	Date
Daniele Viganò	8d8ede4c06	Improve page layout on mobile	2023-10-11 22:39:29 +02:00
Daniele Viganò	87e1107156	Bugfixing (#27 ) * Enforce ordering on some metadata models * Fix a 500 error while accessing flat pages * Clean up HTML and fix cards (missing class) * Make the "driver" app optional and disabled by default	2023-10-10 22:17:21 +02:00
Daniele Viganò	448ecae070	Add Python 3.12 flow	2023-10-09 23:17:00 +02:00
Daniele Viganò	2b0fdc4487	Workaround for python 3.12 on Fedora 39	2023-10-09 23:16:06 +02:00