Merge branch 'main' into wagtailcharts-test

cfpb · Aug 22, 2024 · 8c23e5f · 8c23e5f
2 parents 3e95b8c + a418aa1
commit 8c23e5f
Show file tree

Hide file tree

Showing 507 changed files with 9,965 additions and 10,384 deletions.
diff --git a/cfgov/ask_cfpb/migrations/0008_add_footnotes.py b/cfgov/ask_cfpb/migrations/0008_add_footnotes.py
diff --git a/cfgov/filing_instruction_guide/migrations/0013_add_footnotes.py b/cfgov/filing_instruction_guide/migrations/0013_add_footnotes.py
diff --git a/cfgov/form_explainer/migrations/0010_add_footnotes.py b/cfgov/form_explainer/migrations/0010_add_footnotes.py
diff --git a/cfgov/hmda/jinja2/hmda/hmda-explorer-controls.html b/cfgov/hmda/jinja2/hmda/hmda-explorer-controls.html
@@ -25,7 +25,7 @@
                 content-l__col-1">
         <div class="o-form__group">
             <fieldset class="o-form__fieldset">
-                <legend class="a-legend">
+                <legend class="h4">
                     Records included
                 </legend>
                {% for radio in form.records %}
@@ -49,7 +49,7 @@
         </div>
         <div class="o-form__group">
             <fieldset class="o-form__fieldset">
-                <legend class="a-legend">
+                <legend class="h4">
                     Variable descriptions
                 </legend>
                {% for radio in form.field_descriptions %}

diff --git a/cfgov/jobmanager/models/django.py b/cfgov/jobmanager/models/django.py
@@ -92,6 +92,12 @@ class Meta:
         InlinePanel("major_cities", label="Major cities"),
     ]
 
+    def states_in_region(self):
+        return ", ".join(str(state) for state in self.states.all())
+
+    def major_city_names(self):
+        return "; ".join(str(city) for city in self.major_cities.all())
+
 
 class State(models.Model):
     name = models.CharField(max_length=255)

diff --git a/cfgov/jobmanager/views.py b/cfgov/jobmanager/views.py
@@ -48,13 +48,12 @@ class RegionViewSet(SnippetViewSet):
     icon = "site"
     menu_label = "Regions"
 
-    def states_in_region(self):
-        return ", ".join(str(state) for state in self.states.all())
-
-    def major_cities(self):
-        return "; ".join(str(city) for city in self.major_cities.all())
-
-    list_display = ["abbreviation", "name", states_in_region, major_cities]
+    list_display = [
+        "abbreviation",
+        "name",
+        "states_in_region",
+        "major_city_names",
+    ]
 
 
 class ServiceTypeViewSet(SnippetViewSet):

diff --git a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/0-intro.html b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/0-intro.html
@@ -1,7 +1,7 @@
-<div class="college-costs__intro-segment u-js-only">
+<div class="college-costs__intro-segment u-layout-grid u-js-only">
     {% if return_user %}
-        <div class="wrapper">
-            <div class="content__main">
+        <div class="u-layout-grid__wrapper">
+            <div class="u-layout-grid__main">
                 <div class="m-notification
                             m-notification--visible">
                     {{ svg_icon('updating') }}
@@ -17,8 +17,8 @@
                 {% include_block block %}
             {% endif %}
         {%- endfor %}
-        <div class="wrapper">
-            <div class="content__main">
+        <div class="u-layout-grid__wrapper">
+            <div class="u-layout-grid__main">
                {% for block in page.header -%}
                     {% if block.block_type != 'hero' %}
                         {{ render_block.render(block, loop.index) }}