From e3794db097a53937422be8b18e13069cad2ad5f3 Mon Sep 17 00:00:00 2001 From: Pascal Repond Date: Sun, 4 Jan 2026 21:35:42 +0100 Subject: [PATCH] fix: display corrections - Reimplement stars in media list. - Fix EasyMDE dark mode styles. - Correct media edit template block structure for drawer compatibility with EasyMDE. --- src/core/templatetags/media_tags.py | 2 +- src/static/css/easymde.css | 2 +- src/templates/base.html | 8 +++-- src/templates/media_edit.html | 12 +++++-- src/templates/partials/media-items.html | 31 +++++++++++++------ src/templates/partials/media-list.html | 2 +- .../partials/media-score-stars-inner.html | 17 ++++++++++ src/templates/partials/media-score-stars.html | 29 +++++++++-------- 8 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 src/templates/partials/media-score-stars-inner.html diff --git a/src/core/templatetags/media_tags.py b/src/core/templatetags/media_tags.py index 542774d..6270e4a 100644 --- a/src/core/templatetags/media_tags.py +++ b/src/core/templatetags/media_tags.py @@ -26,7 +26,7 @@ "PLANNED": "badge-info", "IN_PROGRESS": "badge-accent", "COMPLETED": "badge-success", - "PAUSED": "badge-neutral", + "PAUSED": "badge-primary", "DNF": "badge-error", } diff --git a/src/static/css/easymde.css b/src/static/css/easymde.css index 62717a3..9c6b628 100644 --- a/src/static/css/easymde.css +++ b/src/static/css/easymde.css @@ -29,7 +29,7 @@ } [data-theme="forest"] .EasyMDEContainer .CodeMirror-cursor { - border-left-color: var(--color-base-content); + border-left-color: var(--color-base-content) !important; } /* Editor toolbar dark mode */ diff --git a/src/templates/base.html b/src/templates/base.html index 099b146..0c44227 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -22,16 +22,18 @@ {% htmx_script %} {% block extra_css %} {% endblock extra_css %} + {% block head_js %} + {% endblock head_js %} -
+
-
+
-
+
{% block content %} {% endblock content %}
diff --git a/src/templates/media_edit.html b/src/templates/media_edit.html index 1107cd9..1a26d13 100644 --- a/src/templates/media_edit.html +++ b/src/templates/media_edit.html @@ -9,10 +9,16 @@ {% endif %} {% endblock title %} {% block extra_css %} + {{ form.media.css }} {% endblock extra_css %} +{% block head_js %} + {{ form.media.js }} +{% endblock head_js %} +{% block extra_js %} + +{% endblock extra_js %} {% block content %} - {{ form.media }}
{% csrf_token %} @@ -227,5 +233,5 @@

{# Confirmation modal for media deletion #} {% include "partials/confirm-modal.html" with modal_id="confirm-delete-modal" title=_("Delete Media") message=_("Are you sure you want to delete this media? This action cannot be undone.") confirm_text=_("Yes, delete") is_danger=True form_id="delete-form" %} {% endif %} - - {% endblock content %} +

+{% endblock content %} diff --git a/src/templates/partials/media-items.html b/src/templates/partials/media-items.html index c0da297..5d9d659 100644 --- a/src/templates/partials/media-items.html +++ b/src/templates/partials/media-items.html @@ -22,9 +22,6 @@ {% media_icon media.media_type size="md" %}
- {% if media.score %} -
{% include "partials/media-score-badge.html" %}
- {% endif %}
@@ -38,6 +35,10 @@

{{ media.title }}

{% include "partials/media-edit-button.html" %}
{% include "partials/media-status-badge.html" %} + {% if media.score %} +
{% include "partials/media-score-stars.html" with size="sm" show_badge=False %}
+ {% include "partials/media-score-badge.html" %} + {% endif %} {% if media.review %}
{% include "partials/media-review-clamped.html" %} @@ -57,20 +58,30 @@

{{ media.title }}

{# Title, contributors #}
- -

- {{ media.title }} - {% if media.pub_year %}({{ media.pub_year }}){% endif %} -

- +
+ +

+ {{ media.title }} + {% if media.pub_year %}({{ media.pub_year }}){% endif %} +

+ +
{% if media.contributors.all %}
{% include "partials/media-contributors.html" %}
{% endif %} + {# Show badge on small screens only (hidden from md+) #} + {% if media.score %} +
{% include "partials/media-score-badge.html" with size="sm" %}
+ {% endif %}
{# Review #} - {% include "partials/media-score-badge.html" with size="sm" extra_class="mb-2" %} + {% if media.score %} + {# Show only badge on medium screens, stars + badge on large screens #} + +
{% include "partials/media-score-badge.html" with size="sm" %}
+ {% endif %} {% if media.review %}
{% include "partials/media-review-clamped.html" %} diff --git a/src/templates/partials/media-list.html b/src/templates/partials/media-list.html index a9a0a14..6c837cd 100644 --- a/src/templates/partials/media-list.html +++ b/src/templates/partials/media-list.html @@ -3,7 +3,7 @@ {% if page_obj %} {% if view_mode == 'grid' %} {# Grid view - Cards layout #} -
{% include "partials/media-items-page.html" %}
{% else %} {# List view - Table layout #} diff --git a/src/templates/partials/media-score-stars-inner.html b/src/templates/partials/media-score-stars-inner.html new file mode 100644 index 0000000..6b203ea --- /dev/null +++ b/src/templates/partials/media-score-stars-inner.html @@ -0,0 +1,17 @@ +{% load i18n %} +{# Inner template for star display - called by media-score-stars.html #} + diff --git a/src/templates/partials/media-score-stars.html b/src/templates/partials/media-score-stars.html index 8600ff7..168759a 100644 --- a/src/templates/partials/media-score-stars.html +++ b/src/templates/partials/media-score-stars.html @@ -1,15 +1,18 @@ {% load i18n %} {# Display score with stars (read-only) #} - +{# Parameters: size (optional) - 'sm', 'md' (default), or 'lg' #} +{# Parameters: show_badge (optional) - show score badge, default True #} +{% if size == 'sm' %} + {% with rating_size="rating-sm" badge_size="sm" gap_size="gap-2" %} + {% include "partials/media-score-stars-inner.html" %} + {% endwith %} +{% elif size == 'lg' %} + {% with rating_size="rating-lg" badge_size="lg" gap_size="gap-3" %} + {% include "partials/media-score-stars-inner.html" %} + {% endwith %} +{% else %} + {# Default: medium size #} + {% with rating_size="rating-md" badge_size="md" gap_size="gap-2" %} + {% include "partials/media-score-stars-inner.html" %} + {% endwith %} +{% endif %}