more tweaks for layout

Author: joshuadavidthomas

src/django_github_app/admin.py

@@ -17,13 +17,18 @@
 from .models import Repository
 
 
-class EventLogCleanupForm(forms.Form):
-    days_to_keep = forms.IntegerField(
-        label="Days to keep",
-        min_value=0,
-        initial=app_settings.DAYS_TO_KEEP_EVENTS,
-        help_text="Events older than this number of days will be deleted.",
-    )
+def get_cleanup_form(model_meta):
+    """Create a cleanup form with model-specific help text."""
+
+    class CleanupForm(forms.Form):
+        days_to_keep = forms.IntegerField(
+            label="Days to keep",
+            min_value=0,
+            initial=app_settings.DAYS_TO_KEEP_EVENTS,
+            help_text=f"{model_meta.verbose_name_plural.capitalize()} older than this number of days will be deleted.",
+        )
+
+    return CleanupForm
 
 
 @admin.register(EventLog)
@@ -57,9 +62,11 @@ def cleanup_view(self, request):
                 reverse("admin:django_github_app_eventlog_changelist")
             )
 
+        CleanupForm = get_cleanup_form(self.model._meta)
+
         # show form or confirmation
         if request.method == "POST":
-            form = EventLogCleanupForm(request.POST)
+            form = CleanupForm(request.POST)
             if form.is_valid():
                 days_to_keep = form.cleaned_data["days_to_keep"]
                 cutoff_date = timezone.now() - datetime.timedelta(days=days_to_keep)
@@ -68,7 +75,7 @@ def cleanup_view(self, request):
 
                 context = {
                     **self.admin_site.each_context(request),
-                    "title": "Confirm Event Cleanup",
+                    "title": f"Confirm {self.model._meta.verbose_name} deletion",
                     "days_to_keep": days_to_keep,
                     "delete_count": delete_count,
                     "cutoff_date": cutoff_date,
@@ -87,12 +94,12 @@ def cleanup_view(self, request):
                     "admin/django_github_app/eventlog/cleanup_confirmation.html",
                     context,
                 )
-        else:
-            form = EventLogCleanupForm()
+
+        form = CleanupForm()
 
         context = {
             **self.admin_site.each_context(request),
-            "title": "Clean up Events",
+            "title": f"Clean up {self.model._meta.verbose_name_plural}",
             "form": form,
             "opts": self.model._meta,
         }

src/django_github_app/templates/admin/django_github_app/eventlog/change_list.html

@@ -3,7 +3,7 @@
 {% block object-tools-items %}
     <li>
         {% url opts|admin_urlname:'cleanup' as cleanup_url %}
-        <a href="{{ cleanup_url }}">{% translate 'Clean up Events' %}</a>
+        <a href="{{ cleanup_url }}">{% blocktranslate with verbose_name_plural=opts.verbose_name_plural %}Clean up {{ verbose_name_plural }}{% endblocktranslate %}</a>
     </li>
     {{ block.super }}
 {% endblock %}

src/django_github_app/templates/admin/django_github_app/eventlog/cleanup.html

@@ -4,12 +4,7 @@
     {{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation
 {% endblock %}
 {% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
-        &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
-        &rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
-        &rsaquo; {% translate 'Clean up Events' %}
-    </div>
+    {% include "admin/django_github_app/eventlog/includes/cleanup_breadcrumbs.html" %}
 {% endblock %}
 {% block content %}
     <form method="post">
@@ -29,7 +24,7 @@
         </div>
         <div class="submit-row">
             <input type="submit"
-                   value="{% translate 'Submit' %}"
+                   value="{% translate 'Delete' %}"
                    class="default"
                    name="_save">
             {% url opts|admin_urlname:'changelist' as changelist_url %}

src/django_github_app/templates/admin/django_github_app/eventlog/cleanup_confirmation.html

@@ -1,19 +1,14 @@
 {% extends "admin/delete_confirmation.html" %}
 {% load i18n admin_urls %}
 {% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
-        &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
-        &rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
-        &rsaquo; {% translate 'Clean up Events' %}
-    </div>
+    {% include "admin/django_github_app/eventlog/includes/cleanup_breadcrumbs.html" %}
 {% endblock %}
 {% block delete_confirm %}
     <p>
-        {% blocktranslate count counter=delete_count %}You are about to delete {{ counter }} event older than {{ days_to_keep }} days.{% plural %}You are about to delete {{ counter }} events older than {{ days_to_keep }} days.{% endblocktranslate %}
+        {% blocktranslate count counter=delete_count with verbose_name=opts.verbose_name verbose_name_plural=opts.verbose_name_plural %}You are about to delete {{ counter }} {{ verbose_name }} older than {{ days_to_keep }} days.{% plural %}You are about to delete {{ counter }} {{ verbose_name_plural }} older than {{ days_to_keep }} days.{% endblocktranslate %}
     </p>
     <p>
-        {% blocktranslate %}All events received before {{ cutoff_date }} will be permanently deleted.{% endblocktranslate %}
+        {% blocktranslate with verbose_name_plural=opts.verbose_name_plural %}All {{ verbose_name_plural }} received before {{ cutoff_date }} will be permanently deleted.{% endblocktranslate %}
     </p>
     {% if model_count %}
         {% include "admin/includes/object_delete_summary.html" %}

src/django_github_app/templates/admin/django_github_app/eventlog/includes/cleanup_breadcrumbs.html

@@ -0,0 +1,7 @@
+{% load i18n admin_urls %}
+<div class="breadcrumbs">
+    <a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+    &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+    &rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+    &rsaquo; {{ title }}
+</div>

tests/test_admin.py

@@ -57,8 +57,8 @@ def test_cleanup_view_get(self, factory, admin_user, eventlog_admin):
         response = eventlog_admin.cleanup_view(request)
 
         assert response.status_code == 200
-        assert b"Clean up Events" in response.content
-        assert b"Days to keep events" in response.content
+        assert b"Clean up event logs" in response.content
+        assert b"Days to keep" in response.content
 
     def test_cleanup_view_post_shows_confirmation(self, client, admin_user, baker):
         # Create some test events
@@ -73,7 +73,7 @@ def test_cleanup_view_post_shows_confirmation(self, client, admin_user, baker):
         )
 
         assert response.status_code == 200
-        assert b"You are about to delete 3 events" in response.content
+        assert b"You are about to delete 3 event logs" in response.content
         assert b"Yes, I" in response.content and b"m sure" in response.content
 
     @patch("django_github_app.models.EventLog.objects.cleanup_events")
@@ -162,7 +162,7 @@ def test_cleanup_view_integration(self, client, admin_user, baker):
             {"days_to_keep": "5"},
         )
         assert response.status_code == 200
-        assert b"You are about to delete 1 event" in response.content
+        assert b"You are about to delete 1 event log" in response.content
 
         # Test POST request - Step 2: Confirm deletion
         response = client.post(