From 672cadd7e136a23e71d1c319fa452695821f2846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Wed, 28 May 2025 23:38:02 +0200 Subject: [PATCH] Introduce symbols legend --- ram/portal/templates/base.html | 1 + ram/portal/templates/cards/roster.html | 2 +- ram/portal/templates/includes/symbols.html | 39 ++++++++++++++++++++++ ram/portal/templates/rollingstock.html | 10 +++--- ram/portal/templatetags/dcc.py | 7 ++-- 5 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 ram/portal/templates/includes/symbols.html diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html index 00fb3ae..8968660 100644 --- a/ram/portal/templates/base.html +++ b/ram/portal/templates/base.html @@ -215,6 +215,7 @@
{% block pagination %}{% endblock %}
{% block extra_content %}{% endblock %} + {% include 'includes/symbols.html' %} {% include 'includes/footer.html' %} {% if site_conf.use_cdn %} diff --git a/ram/portal/templates/cards/roster.html b/ram/portal/templates/cards/roster.html index 4915334..4519c05 100644 --- a/ram/portal/templates/cards/roster.html +++ b/ram/portal/templates/cards/roster.html @@ -77,7 +77,7 @@ DCC - {% dcc d.item %} + {% dcc d.item %} diff --git a/ram/portal/templates/includes/symbols.html b/ram/portal/templates/includes/symbols.html new file mode 100644 index 0000000..ff31c03 --- /dev/null +++ b/ram/portal/templates/includes/symbols.html @@ -0,0 +1,39 @@ + + + diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html index 0b63f37..6cb0eef 100644 --- a/ram/portal/templates/rollingstock.html +++ b/ram/portal/templates/rollingstock.html @@ -52,7 +52,7 @@ - {% if rolling_stock.decoder %}{% endif %} + {% if rolling_stock.decoder or rolling_stock.decoder_interface %}{% endif %} {% if documents or decoder_documents %}{% endif %} {% if journal %}{% endif %} {% if set %}{% endif %} @@ -63,7 +63,7 @@ - {% if rolling_stock.decoder %}{% endif %} + {% if rolling_stock.decoder or rolling_stock.decoder_interface %}{% endif %} {% if documents or decoder_documents %}{% endif %} {% if journal %}{% endif %} {% if set %}{% endif %} @@ -144,7 +144,7 @@ DCC data - {% dcc rolling_stock %} + {% dcc rolling_stock %} @@ -353,7 +353,7 @@ Decoder data - {% dcc rolling_stock %} + {% dcc rolling_stock %} @@ -362,6 +362,7 @@ Interface {{ rolling_stock.get_decoder_interface }} + {% if rolling_stock.decoder %} Manufacturer {{ rolling_stock.decoder.manufacturer | default:"-" }} @@ -397,6 +398,7 @@ Address {{ rolling_stock.address }} + {% endif %} diff --git a/ram/portal/templatetags/dcc.py b/ram/portal/templatetags/dcc.py index e5fa600..c1ff7e9 100644 --- a/ram/portal/templatetags/dcc.py +++ b/ram/portal/templatetags/dcc.py @@ -18,18 +18,19 @@ def dcc(object): if object.decoder: if object.decoder.sound: decoder = ( - f'' + f'' '' ) else: decoder = ( - f'' + f'' '' ) if decoder: return format_html( - f'{socket} {decoder}' + f'{socket} {decoder}' ) return format_html(socket)