Refactor: remove icon/media item view models

benefits/core/templates/core/includes/icon.html

@@ -1,13 +1,13 @@
 
-{% if not icon.src %}
+{% if not name %}
   <p class="bg-grey-lightest color-standout">
-    Missing <strong><code>icon.src</code></strong> argument
+    Missing <strong><code>name</code></strong> argument
   </p>
-{% elif not icon.alt %}
+{% elif not alt %}
   <p class="bg-grey-lightest color-standout">
-    Missing <strong><code>icon.alt</code></strong> argument
+    Missing <strong><code>alt</code></strong> argument
   </p>
 {% else %}
   {% load static %}
-  <img class="icon" width="150" height="150" src="{% static icon.src %}" alt="{{ icon.alt }}" />
+  <img class="icon" width="150" height="150" src="{% get_static_prefix %}img/icon/{{ name }}.svg" alt="{{ alt }}" />
 {% endif %}

benefits/core/templates/core/logged-out.html

@@ -2,13 +2,14 @@
 {% load i18n %}
 
 {% block main-content %}
-    <div class="container">
-        <div class="row justify-content-lg-center">
-            <h1 class="pb-lg-8 pb-5">
-                <span class="h2 d-block d-lg-inline mb-4">{% translate "core.pages.logged_out.headline[0]" %}</span>
-                <span class="h2">{% translate "core.pages.logged_out.headline[1]" %}</span>
-            </h1>
-            {% include "core/includes/icon.html" with icon=page.icon %}
-        </div>
+  <div class="container">
+    <div class="row justify-content-lg-center">
+      <h1 class="pb-lg-8 pb-5">
+        <span class="h2 d-block d-lg-inline mb-4">{% translate "core.pages.logged_out.headline[0]" %}</span>
+        <span class="h2">{% translate "core.pages.logged_out.headline[1]" %}</span>
+      </h1>
+      {% translate "core.icons.happybus" context "image alt text" as alt_i18n %}
+      {% include "core/includes/icon.html" with name="happybus" alt=alt_i18n %}
     </div>
+  </div>
 {% endblock main-content %}

benefits/core/viewmodels.py

@@ -53,33 +53,6 @@ def previous_page(url):
         return Button(text=_("core.buttons.previous_page"), url=url)
 
 
-class Icon:
-    """Represents an icon."""
-
-    def __init__(self, icon, alt):
-        self.src = f"img/icon/{icon}.svg"
-        self.alt = alt
-
-
-class MediaItem:
-    """
-    Represents a media item in a list of items:
-    * icon: core.viewmodels.Icon
-    * details: str, str[]
-    * heading: str
-    """
-
-    def __init__(self, icon: Icon, details, heading=None):
-        self.icon = icon
-        if isinstance(details, str):
-            self.details = [details]
-        elif isinstance(details, list):
-            self.details = details
-        else:
-            self.details = [str(details)]
-        self.heading = heading
-
-
 class Page:
     """
     Represents a page of content:

benefits/core/views.py

@@ -5,7 +5,7 @@
 from django.template import loader
 from django.template.response import TemplateResponse
 from django.urls import reverse
-from django.utils.translation import pgettext, gettext as _
+from django.utils.translation import gettext as _
 
 from . import session, viewmodels
 from .middleware import pageview_decorator, index_or_agencyindex_origin_decorator
@@ -115,9 +115,5 @@ def server_error(request, template_name=TEMPLATE_SERVER_ERROR):
 
 def logged_out(request):
     """View handler for the final log out confirmation message."""
-    page = viewmodels.Page(
-        title=_("core.pages.logged_out.title"),
-        icon=viewmodels.Icon("happybus", pgettext("image alt text", "core.icons.happybus")),
-    )
-
+    page = viewmodels.Page(title=_("core.pages.logged_out.title"))
     return TemplateResponse(request, TEMPLATE_LOGGED_OUT, page.context_dict())

benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html

@@ -3,7 +3,7 @@
 
 {% block icon %}
     {% translate "core.icons.bankcardcheck" context "image alt text" as icon_alt %}
-    {% include "core/includes/icon--direct-args.html" with name="bankcardcheck" alt=icon_alt %}
+    {% include "core/includes/icon.html" with name="bankcardcheck" alt=icon_alt %}
 {% endblock icon %}
 
 {% block heading %}

benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck.html

@@ -4,5 +4,5 @@
 
 {% block icon %}
     {% translate "core.icons.idcardcheck" context "image alt text" as icon_alt %}
-    {% include "core/includes/icon--direct-args.html" with name="idcardcheck" alt=icon_alt %}
+    {% include "core/includes/icon.html" with name="idcardcheck" alt=icon_alt %}
 {% endblock icon %}

benefits/eligibility/templates/eligibility/unverified.html

@@ -11,8 +11,13 @@
   {% endif %}
 
   <div class="container">
-    {% translate "eligibility.pages.unverified.headline" as headline %}
-    {% include "core/includes/icon-title.html" with title=headline icon=page.icon %}
+    <h1 class="h2 text-center">
+      <span class="icon d-block pb-5">
+        {% translate "core.icons.idcardquestion" context "image alt text" as alt_i18n %}
+        {% include "core/includes/icon.html" with name="idcardquestion" alt=alt_i18n %}
+      </span>
+      {% translate "eligibility.pages.unverified.headline" %}
+    </h1>
 
     <div class="row justify-content-center">
       <div class="col-lg-8 pt-4">

benefits/eligibility/views.py

@@ -6,7 +6,7 @@
 from django.template.response import TemplateResponse
 from django.urls import reverse
 from django.utils.decorators import decorator_from_middleware
-from django.utils.translation import pgettext, gettext as _
+from django.utils.translation import gettext as _
 
 from benefits.core import recaptcha, session, viewmodels
 from benefits.core.middleware import AgencySessionRequired, LoginRequired, RecaptchaEnabled, VerifierSessionRequired
@@ -180,9 +180,4 @@ def unverified(request):
 
     analytics.returned_fail(request, types_to_verify)
 
-    page = viewmodels.Page(
-        icon=viewmodels.Icon("idcardquestion", pgettext("image alt text", "core.icons.idcardquestion")),
-    )
-
-    ctx = page.context_dict()
-    return TemplateResponse(request, TEMPLATE_UNVERIFIED, ctx)
+    return TemplateResponse(request, TEMPLATE_UNVERIFIED)

benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html

@@ -3,7 +3,7 @@
 
 {% block icon %}
     {% translate "core.icons.bankcardcheck" context "image alt text" as icon_alt %}
-    {% include "core/includes/icon--direct-args.html" with name="bankcardcheck" alt=icon_alt %}
+    {% include "core/includes/icon.html" with name="bankcardcheck" alt=icon_alt %}
 {% endblock icon %}
 
 {% block heading %}

benefits/enrollment/templates/enrollment/retry.html

@@ -1,12 +1,17 @@
 {% extends "core/base.html" %}
+{% load i18n %}
 
 {% block main-content %}
   {% if authentication and authentication.sign_out_link_template %}
     {% include authentication.sign_out_link_template %}
   {% endif %}
 
   <div class="container">
-    {% include "core/includes/icon-title.html" with title=page.headline icon=page.icon %}
+    <h1 class="h2 text-center">
+      {% translate "core.icons.bankcardquestion" context "image alt text" as alt_i18n %}
+      <span class="icon d-block pb-5">{% include "core/includes/icon.html" with name="bankcardquestion" alt=alt_i18n %}</span>
+      {% translate "enrollment.pages.retry.title" %}
+    </h1>
 
     <div class="row justify-content-center">
       <div class="col-lg-8 pt-4">

benefits/enrollment/views.py

@@ -7,7 +7,7 @@
 from django.template.response import TemplateResponse
 from django.urls import reverse
 from django.utils.decorators import decorator_from_middleware
-from django.utils.translation import pgettext, gettext as _
+from django.utils.translation import gettext as _
 
 from benefits.core import models, session, viewmodels
 from benefits.core.middleware import EligibleSessionRequired, VerifierSessionRequired, pageview_decorator
@@ -98,7 +98,6 @@ def retry(request):
         if form.is_valid():
             page = viewmodels.Page(
                 title=_("enrollment.pages.retry.title"),
-                icon=viewmodels.Icon("bankcardquestion", pgettext("image alt text", "core.icons.bankcardquestion")),
                 headline=_("enrollment.pages.retry.title"),
                 paragraphs=[_("enrollment.pages.retry.p[0]")],
             )

benefits/templates/error.html

@@ -11,8 +11,8 @@
   <div class="container">
     <h1 class="icon-title h2 text-center">
       <span class="icon d-block pb-5">
-        {% translate "core.icons.sadbus" as alt_i18n %}
-        {% include "core/includes/icon--direct-args.html" with name="sadbus" alt=alt_i18n %}
+        {% translate "core.icons.sadbus" context "image alt text" as alt_i18n %}
+        {% include "core/includes/icon.html" with name="sadbus" alt=alt_i18n %}
       </span>
       {% block headline %}
       {% endblock headline %}