Merge pull request #8277 from cfpb/ans_hardcode_tdp_hero

TDP: hardcode `TdpSearchHeroImage`
cfpb · Mar 29, 2024 · aac379c · aac379c
2 parents 23d91ef + 660432f
commit aac379c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 36 deletions.
diff --git a/cfgov/teachers_digital_platform/jinja2/teachers_digital_platform/activity_index_page.html b/cfgov/teachers_digital_platform/jinja2/teachers_digital_platform/activity_index_page.html
@@ -14,15 +14,16 @@
         <section class="m-search-hero">
             <div class="m-search-hero_text">
                 {% for block in page.header -%}
-                    {% if block.block_type != 'hero' %}
-                        {{ render_block.render(block, loop.index) }}
-                    {% endif %}
+                    {{ render_block.render(block, loop.index) }}
                 {%- endfor %}
             </div>
             <div class="m-search-hero_image-wrapper">
-                {% for block in page.header_sidebar -%}
-                    {% include_block block %}
-                {%- endfor %}
+                <img class="m-search-hero_image"
+                     srcset="{{ static('apps/teachers-digital-platform/img/search-landing-hero.jpg') }},
+                             {{ static('apps/teachers-digital-platform/img/search-landing-hero-2x.jpg') }} 2x"
+                     src="{{ static('apps/teachers-digital-platform/img/search-landing-hero-2x.jpg') }}"
+                     width="498"
+                     alt="Illustration of teacher and student activity books">
             </div>
         </section>
         <div class="block block__padded-top block__flush-top u-mb30">

diff --git a/cfgov/teachers_digital_platform/migrations/0004_remove_activityindexpage_header_sidebar.py b/cfgov/teachers_digital_platform/migrations/0004_remove_activityindexpage_header_sidebar.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.24 on 2024-03-29 18:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teachers_digital_platform', '0003_rtf_to_urtf'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='activityindexpage',
+            name='header_sidebar',
+        ),
+    ]
diff --git a/cfgov/teachers_digital_platform/models/activity_index_page.py b/cfgov/teachers_digital_platform/models/activity_index_page.py
@@ -25,7 +25,6 @@
     ActivityType,
 )
 from teachers_digital_platform.models.pages import ActivityPage
-from teachers_digital_platform.molecules import TdpSearchHeroImage
 from v1.atomic_elements import molecules
 from v1.models import CFGOVPage
 
@@ -79,19 +78,10 @@ class ActivityIndexPage(CFGOVPage):
         use_json_field=True,
     )
 
-    header_sidebar = StreamField(
-        [
-            ("image", TdpSearchHeroImage()),
-        ],
-        blank=True,
-        use_json_field=True,
-    )
-
     results = {}
     activity_setups = None
     content_panels = CFGOVPage.content_panels + [
         FieldPanel("header"),
-        FieldPanel("header_sidebar"),
     ]
 
     edit_handler = TabbedInterface(

diff --git a/cfgov/teachers_digital_platform/molecules.py b/cfgov/teachers_digital_platform/molecules.py
diff --git a/cfgov/teachers_digital_platform/tests/models/test_activity_index_page.py b/cfgov/teachers_digital_platform/tests/models/test_activity_index_page.py
@@ -68,7 +68,6 @@ def test_can_create_activity_index_page(self):
             {
                 "title": "Search for activities",
                 "header-count": "0",
-                "header_sidebar-count": "0",
                 "sidefoot-count": "0",
                 "categories-TOTAL_FORMS": "0",
                 "categories-INITIAL_FORMS": "0",