{% translate "Profile Information" %}
{{ profile_form.username }} @@ -37,7 +37,7 @@{% translate "Profile Information" %}
{{ profile_form.email }}
@@ -47,7 +47,7 @@
@@ -58,7 +58,7 @@ {% translate "Profile Information" %}
{{ profile_form.first_name }}{% translate "Profile Information" %}
{{ profile_form.last_name }} @@ -111,7 +111,7 @@{% translate "Change Password" %}
{{ password_form.old_password }} @@ -122,7 +122,7 @@{% translate "Change Password" %}
{{ password_form.new_password1 }} @@ -133,7 +133,7 @@{% translate "Change Password" %}
{{ password_form.new_password2 }} diff --git a/src/templates/backup_manage.html b/src/templates/backup_manage.html index 10f296d..8b5b041 100644 --- a/src/templates/backup_manage.html +++ b/src/templates/backup_manage.html @@ -74,10 +74,10 @@{% translate "and replace it with the backup data." %} -
+ {# 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 %} diff --git a/src/templates/partials/confirm-modal.html b/src/templates/partials/confirm-modal.html new file mode 100644 index 0000000..418a734 --- /dev/null +++ b/src/templates/partials/confirm-modal.html @@ -0,0 +1,28 @@ +{% load i18n %} +{# Reusable confirmation modal #} +{# Expected parameters: #} +{# - modal_id: Unique modal ID #} +{# - title: Modal title #} +{# - message: Confirmation message #} +{# - confirm_text: Confirm button text (optional, default: "Confirm") #} +{# - is_danger: Boolean for danger style (optional, default: False) #} +{# - form_id: Form ID to submit (optional) #} + +
+
diff --git a/src/templates/partials/media-contributors.html b/src/templates/partials/media-contributors.html
index e5af5e8..c708cfc 100644
--- a/src/templates/partials/media-contributors.html
+++ b/src/templates/partials/media-contributors.html
@@ -1,14 +1,21 @@
-{# Renders the list of contributors with HTMX links #}
-{# Parameters: media #}
+{# Renders the list of contributors with links #}
+{# Parameters: media, use_htmx (optional, default True if not set) #}
{% if media.contributors.all %}
{% for contributor in media.contributors.all %}
- {{ contributor.name }}{% if not forloop.last %};{% endif %}
+ {% if use_htmx == False %}
+ {# Normal link to home page with contributor filter #}
+ {{ contributor.name }}{% if not forloop.last %};{% endif %}
+ {% else %}
+ {# HTMX link for in-page filtering (default) #}
+ {{ contributor.name }}{% if not forloop.last %};{% endif %}
+ {% endif %}
{% endfor %}
{% endif %}
diff --git a/src/templates/partials/media-cover.html b/src/templates/partials/media-cover.html
index ea20afa..758f188 100644
--- a/src/templates/partials/media-cover.html
+++ b/src/templates/partials/media-cover.html
@@ -1,6 +1,6 @@
{% load i18n %}
{% load media_tags %}
-
+
+
+{{ title }}
+{{ message|safe }}
+
+
+ {% if form_id %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
{% if media.cover %}
- {% if media.cover %}
-
- {% else %}
-
- {% heroicon_outline "photo" class="w-24 h-24" %}
-
- {% endif %}
-
+
+ {% if media.cover %}
+
+ {% else %}
+
{# Cover with media type badge #}
- {% include "partials/media-cover.html" %}
+
+ {% include "partials/media-cover.html" %}
+
{# Title, contributors #}
+ {% heroicon_outline "photo" class="w-24 h-24" %}
+
+ {% endif %}
+
+
{% media_icon media.media_type size="md" %}
{% if media.score %}
- {% include "partials/media-score-badge.html" %}
+ {% include "partials/media-score-badge.html" %}
{% endif %}
-
@@ -46,14 +50,18 @@ {{ media.title }}
+ +{{ media.title }}
+ {% if media.pub_year %}({{ media.pub_year }}){% endif %}{% include "partials/media-contributors.html" %}
{{ media.title }}
{% for media in media_list %}
-
- {{ 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 %}
diff --git a/src/templates/partials/media-score-badge.html b/src/templates/partials/media-score-badge.html
index 074fd02..d4594fc 100644
--- a/src/templates/partials/media-score-badge.html
+++ b/src/templates/partials/media-score-badge.html
@@ -4,6 +4,5 @@
{{ media.score }}
{% heroicon_mini "star" class="fill-orange-400 h-4" %}
- - {{ media.get_score_display }}
-
+ {{ media.get_score_display }}
{% endif %}
diff --git a/src/templates/partials/media-score-stars.html b/src/templates/partials/media-score-stars.html
new file mode 100644
index 0000000..8600ff7
--- /dev/null
+++ b/src/templates/partials/media-score-stars.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+{# Display score with stars (read-only) #}
+
+ {# Star rating display #}
+
+ {# Score badge with label #}
+
diff --git a/src/tests/core/test_views.py b/src/tests/core/test_views.py
index 6c586a6..49cd8b9 100644
--- a/src/tests/core/test_views.py
+++ b/src/tests/core/test_views.py
@@ -672,3 +672,67 @@ def test_load_more_includes_view_mode_in_context(self, logged_in_client, media_f
assert response_list.context["view_mode"] == "list"
assert response_grid.context["view_mode"] == "grid"
+
+
+class TestMediaDetailView:
+ """Tests for the media_detail view."""
+
+ def test_media_detail_accessible_when_logged_in(self, logged_in_client, media):
+ """The detail view is accessible when logged in."""
+ response = logged_in_client.get(reverse("media_detail", kwargs={"pk": media.pk}))
+
+ assert response.status_code == 200
+ assert response.context["media"] == media
+
+ def test_media_detail_displays_correct_template(self, logged_in_client, media):
+ """The detail view uses the media_detail template."""
+ response = logged_in_client.get(reverse("media_detail", kwargs={"pk": media.pk}))
+
+ assert response.status_code == 200
+ assert "media_detail.html" in [t.name for t in response.templates]
+
+ def test_media_detail_nonexistent_returns_404(self, logged_in_client):
+ """Accessing detail view with nonexistent media returns 404."""
+ response = logged_in_client.get(reverse("media_detail", kwargs={"pk": 99999}))
+
+ assert response.status_code == 404
+
+ def test_media_detail_shows_all_fields(self, logged_in_client, db):
+ """The detail view displays all media fields."""
+ agent = Agent.objects.create(name="Test Author")
+ media = Media.objects.create(
+ title="Complete Media",
+ media_type="BOOK",
+ status="COMPLETED",
+ score=8,
+ review="This is a detailed review.",
+ pub_year=2023,
+ external_uri="https://example.com",
+ )
+ media.contributors.add(agent)
+
+ response = logged_in_client.get(reverse("media_detail", kwargs={"pk": media.pk}))
+ content = response.content.decode("utf-8")
+
+ assert media.title in content
+ assert "2023" in content
+ assert agent.name in content
+ assert "https://example.com" in content
+
+ def test_media_detail_contributor_links_to_filtered_list(self, logged_in_client, db):
+ """Contributor links in detail view navigate to filtered home page."""
+ agent = Agent.objects.create(name="Test Contributor")
+ media = Media.objects.create(
+ title="Test Media",
+ media_type="BOOK",
+ )
+ media.contributors.add(agent)
+
+ response = logged_in_client.get(reverse("media_detail", kwargs={"pk": media.pk}))
+ content = response.content.decode("utf-8")
+
+ # Should contain a normal link (not HTMX) to home with contributor filter
+ expected_url = f'href="/?contributor={agent.id}"'
+ assert expected_url in content
+ # Should NOT contain HTMX attributes for contributor links
+ assert "hx-target" not in content
diff --git a/src/theme/static_src/src/styles.css b/src/theme/static_src/src/styles.css
index 5aeaad6..716e1c4 100644
--- a/src/theme/static_src/src/styles.css
+++ b/src/theme/static_src/src/styles.css
@@ -28,6 +28,11 @@
transform: scale(0.95);
}
+/* Form validation error styles */
+.label-text-alt {
+ @apply inline-block max-w-full break-words whitespace-normal;
+}
+
/* Markdown content styles */
/* Uses DaisyUI/Tailwind utilities for theme consistency */
.review-text {
{% include "partials/media-score-badge.html" with size="lg" %}
+