Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: template and msgid naming #1533

Merged
merged 7 commits into from
Jul 14, 2023
Merged

Fix: template and msgid naming #1533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9a5192
refactor(icon--direct-args): rename to convention
thekaveman Jul 13, 2023
9d3fb20
refactor(media-item): rename to convention
thekaveman Jul 13, 2023
a0e738c
refactor(templates): rename to convention
thekaveman Jul 13, 2023
3d1c28f
refactor(widgets): rename to convention
thekaveman Jul 13, 2023
33b13d1
refactor(blocks): rename to convention
thekaveman Jul 13, 2023
5ff1955
refactor(senior): rename for flow
thekaveman Jul 13, 2023
9c82386
refactor(mst): spell out courtesy card
thekaveman Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion benefits/core/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

logger = logging.getLogger(__name__)
HEALTHCHECK_PATH = "/healthcheck"
TEMPLATE_USER_ERROR = "200_user_error.html"
TEMPLATE_USER_ERROR = "200-user-error.html"


def user_error(request):
Expand Down
26 changes: 13 additions & 13 deletions benefits/core/migrations/0002_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def load_data(app, *args, **kwargs):
eligibility_type=mst_senior_type,
auth_provider=senior_auth_provider,
selection_label_template="eligibility/includes/selection-label--senior.html",
start_template="eligibility/start__login_gov.html",
start_template="eligibility/start--senior.html",
unverified_title=_("eligibility.pages.unverified.title"),
unverified_blurb=_("eligibility.pages.unverified.p[0]"),
)
Expand All @@ -162,7 +162,7 @@ def load_data(app, *args, **kwargs):
eligibility_type=mst_veteran_type,
auth_provider=veteran_auth_provider,
selection_label_template="eligibility/includes/selection-label--veteran.html",
start_template="eligibility/start__veteran.html",
start_template="eligibility/start--veteran.html",
unverified_title=_("eligibility.pages.unverified.title"),
unverified_blurb=_("eligibility.pages.unverified.p[0]"),
)
Expand All @@ -179,30 +179,30 @@ def load_data(app, *args, **kwargs):
jws_signing_alg=os.environ.get("COURTESY_CARD_VERIFIER_JWS_SIGNING_ALG", "RS256"),
auth_provider=None,
selection_label_template="eligibility/includes/selection-label--mst-courtesy-card.html",
start_template="eligibility/start__mst_courtesy_card.html",
form_title=_("eligibility.pages.confirm.mst_cc.title"),
form_headline=_("eligibility.pages.confirm.mst_cc.headline"),
form_blurb=_("eligibility.pages.confirm.mst_cc.p[0]"),
form_sub_label=_("eligibility.forms.confirm.mst_cc.fields.sub"),
form_sub_help_text=_("eligibility.forms.confirm.mst_cc.fields.sub.help_text"),
start_template="eligibility/start--mst-courtesy-card.html",
form_title=_("eligibility.pages.confirm.mst_courtesy_card.title"),
form_headline=_("eligibility.pages.confirm.mst_courtesy_card.headline"),
form_blurb=_("eligibility.pages.confirm.mst_courtesy_card.p[0]"),
form_sub_label=_("eligibility.forms.confirm.mst_courtesy_card.fields.sub"),
form_sub_help_text=_("eligibility.forms.confirm.mst_courtesy_card.fields.sub.help_text"),
form_sub_placeholder="12345",
form_sub_pattern=r"\d{5}",
form_input_mode="numeric",
form_max_length=5,
form_name_label=_("eligibility.forms.confirm.mst_cc.fields.name"),
form_name_help_text=_("eligibility.forms.confirm.mst_cc.fields.name.help_text"),
form_name_label=_("eligibility.forms.confirm.mst_courtesy_card.fields.name"),
form_name_help_text=_("eligibility.forms.confirm.mst_courtesy_card.fields.name.help_text"),
form_name_placeholder="Garcia",
form_name_max_length=255,
unverified_title=_("eligibility.pages.unverified.mst_cc.title"),
unverified_blurb=_("eligibility.pages.unverified.mst_cc.p[0]"),
unverified_title=_("eligibility.pages.unverified.mst_courtesy_card.title"),
unverified_blurb=_("eligibility.pages.unverified.mst_courtesy_card.p[0]"),
)

sacrt_oauth_claims_verifier = EligibilityVerifier.objects.create(
name=os.environ.get("SACRT_OAUTH_VERIFIER_NAME", "OAuth claims via Login.gov (SacRT)"),
eligibility_type=sacrt_senior_type,
auth_provider=senior_auth_provider,
selection_label_template="eligibility/includes/selection-label--senior.html",
start_template="eligibility/start__login_gov.html",
start_template="eligibility/start--senior.html",
unverified_title=_("eligibility.pages.unverified.title"),
unverified_blurb=_("eligibility.pages.unverified.p[0]"),
)
Expand Down
0 ...its/core/templates/core/agency_index.html → ...its/core/templates/core/agency-index.html
View file
Open in desktop
File renamed without changes.
20 changes: 6 additions & 14 deletions benefits/core/templates/core/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
{% load i18n %}
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!doctype html>
<!DOCTYPE html>
<html lang="{{ LANGUAGE_CODE }}" class="{% block classes %}{% endblock classes %}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="{% translate "core.pages.help.about.p[0]" %}">
{# djlint:off #}
<title>{% block page_title %}{% if page.title %}{{ page.title }}&nbsp;|&nbsp;{% endif %}{% endblock page_title %}{% translate "core.pages.title.suffix" %}</title>
<title>{% block page-title %}{% if page.title %}{{ page.title }}&nbsp;|&nbsp;{% endif %}{% endblock page-title %}{% translate "core.pages.title.suffix" %}</title>
{# djlint:on #}

<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet" type="text/css">
Expand Down Expand Up @@ -57,24 +57,16 @@
<div id="header-container" class="navbar navbar-expand-sm navbar-dark bg-primary justify-content-between">
<div class="container">
<span class="navbar-brand p-0">
<img class="sm d-lg-none"
src="{% static "img/logo-sm.svg" %}"
width="90"
height="51.3"
alt="{% translate "core.logos.small" context "image alt text" %}"/>
<img class="lg d-none d-lg-block"
src="{% static "img/logo-lg.svg" %}"
width="220"
height="50"
alt="{% translate "core.logos.large" context "image alt text" %}"/>
<img class="sm d-lg-none" src="{% static "img/logo-sm.svg" %}" width="90" height="51.3" alt="{% translate "core.logos.small" context "image alt text" %}" />
<img class="lg d-none d-lg-block" src="{% static "img/logo-lg.svg" %}" width="220" height="50" alt="{% translate "core.logos.large" context "image alt text" %}" />
</span>
<div class="form-inline">{% include "core/includes/lang-selector.html" %}</div>
</div>
</div>
</header>

<main id="main-content" role="main">
{% block main_content %}
{% block main-content %}
{% block nav-buttons %}
{% endblock nav-buttons %}
<div class="container main-row">
Expand Down Expand Up @@ -106,7 +98,7 @@ <h1>{{ page.headline }}</h1>
</div>
{% endblock call-to-action %}
</div>
{% endblock main_content %}
{% endblock main-content %}
</main>

<footer id="footer">
Expand Down
8 changes: 4 additions & 4 deletions benefits/core/templates/core/help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}
{% load static %}

{% block main_content %}
{% block main-content %}
<div class="container">
<div class="row justify-content-center">
<div class="col-10">
Expand Down Expand Up @@ -46,8 +46,8 @@ <h2 class="pt-8" id="login-gov-verify">{% translate "core.pages.help.login_gov_v
<p class="pt-4">{% translate "core.pages.help.login_gov_verify.p[2]" %}</p>
<p class="pt-4">{% translate "core.pages.help.login_gov_verify.p[3]" %}</p>

<h2 class="pt-8" id="mst-courtesy-card">{% translate "core.pages.help.mst_cc" %}</h2>
<p class="pt-4">{% translate "core.pages.help.mst_cc.p[0]" %}</p>
<h2 class="pt-8" id="mst-courtesy-card">{% translate "core.pages.help.mst_courtesy_card" %}</h2>
<p class="pt-4">{% translate "core.pages.help.mst_courtesy_card.p[0]" %}</p>

<h2 class="pt-8" id="littlepay">{% translate "core.pages.help.littlepay" %}</h2>
<p class="pt-4">{% translate "core.pages.help.littlepay.p[0]" %}</p>
Expand Down Expand Up @@ -88,4 +88,4 @@ <h2 class="pt-8" id="questions">{% translate "core.pages.help.questions" %}</h2>
</div>
</div>
</div>
{% endblock main_content %}
{% endblock main-content %}
0 ...ates/core/includes/icon__direct_args.html → ...ates/core/includes/icon--direct-args.html
View file
Open in desktop
File renamed without changes.
0 ...e/templates/core/includes/media_item.html → ...e/templates/core/includes/media-item.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions benefits/core/templates/core/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{ block.super |add:" landing" }}
{% endblock classes %}

{% block main_content %}
{% block main-content %}
<div class="container">
<div class="row align-items-end align-items-lg-center">
<div class="col-lg-5">
Expand All @@ -17,4 +17,4 @@ <h2 class="p-sm pb-lg-8 pt-1 pt-lg-4 pb-4">{% translate "core.pages.landing.h2"
</div>
</div>
</div>
{% endblock main_content %}
{% endblock main-content %}
4 changes: 2 additions & 2 deletions benefits/core/templates/core/logged_out.html → benefits/core/templates/core/logged-out.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "core/base.html" %}
{% load i18n %}

{% block main_content %}
{% block main-content %}
<div class="container">
<div class="row justify-content-lg-center">
<h1 class="pb-lg-8 pb-5">
Expand All @@ -11,4 +11,4 @@ <h1 class="pb-lg-8 pb-5">
{% include "core/includes/icon.html" with icon=page.icon %}
</div>
</div>
{% endblock main_content %}
{% endblock main-content %}
0 ...widgets/verifier_radio_select_option.html → ...widgets/verifier-radio-select-option.html
View file
Open in desktop
File renamed without changes.
0 ...s/core/widgets/verifier_radio_select.html → ...s/core/widgets/verifier-radio-select.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions benefits/core/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
ROUTE_LOGGED_OUT = "core:logged_out"

TEMPLATE_INDEX = "core/index.html"
TEMPLATE_AGENCY = "core/agency_index.html"
TEMPLATE_AGENCY = "core/agency-index.html"
TEMPLATE_HELP = "core/help.html"
TEMPLATE_LOGGED_OUT = "core/logged_out.html"
TEMPLATE_LOGGED_OUT = "core/logged-out.html"


@pageview_decorator
Expand Down
4 changes: 2 additions & 2 deletions benefits/core/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ def __init__(self, pattern=None, placeholder=None, **kwargs):
class VerifierRadioSelect(widgets.RadioSelect):
"""A radio select input styled for the Eligibility Verifier"""

template_name = "core/widgets/verifier_radio_select.html"
option_template_name = "core/widgets/verifier_radio_select_option.html"
template_name = "core/widgets/verifier-radio-select.html"
option_template_name = "core/widgets/verifier-radio-select-option.html"

def __init__(self, selection_label_templates=(), *args, **kwargs):
super().__init__(*args, **kwargs)
Expand Down
4 changes: 2 additions & 2 deletions ...des/media_item__bankcardcheck__start.html → ...des/media-item--bankcardcheck--start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% extends "core/includes/media_item.html" %}
{% extends "core/includes/media-item.html" %}
{% load i18n %}

{% 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--direct-args.html" with name="bankcardcheck" alt=icon_alt %}
{% endblock icon %}

{% block heading %}
Expand Down
13 changes: 13 additions & 0 deletions ...ity/templates/eligibility/includes/media-item--idcardcheck--start--mst-courtesy-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{% extends "eligibility/includes/media-item--idcardcheck.html" %}

{% load i18n %}

{% block heading %}
{% translate "eligibility.pages.start.mst_courtesy_card.start_item.heading" %}
{% endblock heading %}

{% block body %}
<div class="media-body--details">
<p>{% translate "eligibility.pages.start.mst_courtesy_card.start_item.details" %}</p>
</div>
{% endblock body %}
12 changes: 6 additions & 6 deletions ..._item__idcardcheck__start__login_gov.html → ...dia-item--idcardcheck--start--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% extends "eligibility/includes/media_item__idcardcheck.html" %}
{% extends "eligibility/includes/media-item--idcardcheck.html" %}

{% load i18n %}

{% block heading %}
{% translate "eligibility.pages.start.login_gov.start_item.heading" %}
{% translate "eligibility.pages.start.senior.start_item.heading" %}
{% endblock heading %}

{% block body %}
<div class="media-body--details">
<p>
{% translate "eligibility.pages.start.login_gov.start_item.details" %}
{% translate "eligibility.pages.start.senior.start_item.details" %}
<!-- Button to trigger modal -->
<button type="button" class="modal-trigger--link" data-bs-toggle="modal" data-bs-target="#identity-verification-help">
{% translate "eligibility.pages.start.senior.help.link_text" %}
Expand All @@ -18,9 +18,9 @@
<div class="media-body--items">
<p>{% translate "eligibility.pages.start.senior.start_item.secondary_details" %}</p>
<ul>
<li>{% translate "eligibility.pages.start.login_gov.required_items[0]" %}</li>
<li>{% translate "eligibility.pages.start.login_gov.required_items[1]" %}</li>
<li>{% translate "eligibility.pages.start.login_gov.required_items[2]" %}</li>
<li>{% translate "eligibility.pages.start.senior.required_items[0]" %}</li>
<li>{% translate "eligibility.pages.start.senior.required_items[1]" %}</li>
<li>{% translate "eligibility.pages.start.senior.required_items[2]" %}</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...ia_item__idcardcheck__start__veteran.html → ...ia-item--idcardcheck--start--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "eligibility/includes/media_item__idcardcheck.html" %}
{% extends "eligibility/includes/media-item--idcardcheck.html" %}

{% load i18n %}

Expand Down
4 changes: 2 additions & 2 deletions ...ity/includes/media_item__idcardcheck.html → ...ity/includes/media-item--idcardcheck.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/includes/media_item.html" %}
{% extends "core/includes/media-item.html" %}

{% load i18n %}

{% 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--direct-args.html" with name="idcardcheck" alt=icon_alt %}
{% endblock icon %}
13 changes: 0 additions & 13 deletions ...ity/templates/eligibility/includes/media_item__idcardcheck__start__mst_courtesy_card.html
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions benefits/eligibility/templates/eligibility/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
{{ block.super | add:" eligibility-index" }}
{% endblock classes %}

{% block page_title %}
{% block page-title %}
{% translate "eligibility.pages.index.title" %}&nbsp;|&nbsp;
{% endblock page_title %}
{% endblock page-title %}

{% block nav-buttons %}
{% url "core:index" as url %}
Expand Down
10 changes: 5 additions & 5 deletions ...eligibility/start__mst_courtesy_card.html → ...eligibility/start--mst-courtesy-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{% extends "eligibility/start.html" %}
{% load i18n %}

{% block page_title %}
{% translate "eligibility.pages.start.mst_cc.title" %}&nbsp;|&nbsp;
{% endblock page_title %}
{% block page-title %}
{% translate "eligibility.pages.start.mst_courtesy_card.title" %}&nbsp;|&nbsp;
{% endblock page-title %}

{% block headline %}
<div class="col-lg-10">
<h1>{% translate "eligibility.pages.start.mst_cc.headline" %}</h1>
<h1>{% translate "eligibility.pages.start.mst_courtesy_card.headline" %}</h1>
</div>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media_item__idcardcheck__start__mst_courtesy_card.html" %}
{% include "eligibility/includes/media-item--idcardcheck--start--mst-courtesy-card.html" %}
{% endblock media-item %}

{% block call-to-action-button %}
Expand Down
10 changes: 5 additions & 5 deletions ...mplates/eligibility/start__login_gov.html → .../templates/eligibility/start--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{% extends "eligibility/start.html" %}
{% load i18n %}

{% block page_title %}
{% translate "eligibility.pages.start.login_gov.title" %}&nbsp;|&nbsp;
{% endblock page_title %}
{% block page-title %}
{% translate "eligibility.pages.start.senior.title" %}&nbsp;|&nbsp;
{% endblock page-title %}

{% block headline %}
<div class="col-lg-10">
<h1>{% translate "eligibility.pages.start.login_gov.headline" %}</h1>
<h1>{% translate "eligibility.pages.start.senior.headline" %}</h1>
</div>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media_item__idcardcheck__start__login_gov.html" %}
{% include "eligibility/includes/media-item--idcardcheck--start--senior.html" %}
{% endblock media-item %}

{% block call-to-action-button %}
Expand Down
6 changes: 3 additions & 3 deletions ...templates/eligibility/start__veteran.html → ...templates/eligibility/start--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% extends "eligibility/start.html" %}
{% load i18n %}

{% block page_title %}
{% block page-title %}
{% translate "eligibility.pages.start.veteran.title" %}&nbsp;|&nbsp;
{% endblock page_title %}
{% endblock page-title %}

{% block headline %}
<div class="col-lg-10">
Expand All @@ -12,7 +12,7 @@ <h1>{% translate "eligibility.pages.start.veteran.headline" %}</h1>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media_item__idcardcheck__start__veteran.html" %}
{% include "eligibility/includes/media-item--idcardcheck--start--veteran.html" %}
{% endblock media-item %}

{% block call-to-action-button %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2 class="media-title p-sm">{% translate "eligibility.pages.start.sub_headline"
<ul class="media-list mx-0 px-0 d-flex justify-content-center flex-column">
{% block media-item %}
{% endblock media-item %}
{% include "eligibility/includes/media_item__bankcardcheck__start.html" %}
{% include "eligibility/includes/media-item--bankcardcheck--start.html" %}
</ul>
</div>
{% endblock inner-content %}
Expand Down
4 changes: 2 additions & 2 deletions benefits/eligibility/templates/eligibility/unverified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "core/base.html" %}

{% block main_content %}
{% block main-content %}
{% include "core/includes/sign-out-link.html" %}

<div class="container">
Expand All @@ -21,4 +21,4 @@
</div>

</div>
{% endblock main_content %}
{% endblock main-content %}