Merge pull request #159 from springload/fix/bed-fixes

Updating some wording
springload · Aug 13, 2024 · 65ed7b4 · 65ed7b4
2 parents f66ce55 + c18f023
commit 65ed7b4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/cdhweb/pages/blocks/accordion_block.py b/cdhweb/pages/blocks/accordion_block.py
@@ -64,7 +64,7 @@ class AccordionTitles(models.TextChoices):
         CODE = "code", "Code"
         DATA = "data", "Data"
         DOCUMENTATION = "documentation", "Documentation"
-        ANALYSIS = "analysis", "Analysis"
+        PUBLICATIONS_AND_PRESENTATIONS = "publications_and_presentations", "Publications and Presentations"
         RELATED_COURSES = (
             "related_courses_and_course_modules",
             "Related Courses and Course Modules",

diff --git a/cdhweb/projects/forms.py b/cdhweb/projects/forms.py
@@ -28,7 +28,7 @@ class ProjectFiltersForm(forms.Form):
         empty_label="--Select--",
         required=False,
         blank=True,
-        label="Role",
+        label="Project Lead",
     )
     current = forms.BooleanField(required=False, initial=True)
     cdh_built = forms.BooleanField(required=False, label="Built by CDH")
diff --git a/cdhweb/projects/migrations/0032_alter_project_accordion.py b/cdhweb/projects/migrations/0032_alter_project_accordion.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0.5 on 2024-08-08 22:49
+
+import wagtail.blocks
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0031_remove_project_field_remove_project_method_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='accordion',
+            field=wagtail.fields.StreamField([('accordion', wagtail.blocks.StructBlock([('accordion_items', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('heading', wagtail.blocks.ChoiceBlock(choices=[('code', 'Code'), ('data', 'Data'), ('documentation', 'Documentation'), ('publications_and_presentations', 'Publications and Presentations'), ('related_courses_and_course_modules', 'Related Courses and Course Modules'), ('project_peer_review', 'Project Peer Review'), ('awards', 'Awards')])), ('body', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'link', 'ol', 'ul', 'document-link', 'h3', 'h4']))])))], label='Project Accordion'))], blank=True, use_json_field=True, verbose_name='Project Details'),
+        ),
+    ]
diff --git a/templates/people/person_page.html b/templates/people/person_page.html
@@ -16,7 +16,7 @@
             {% if recent_projects %}
                 <div class="block block--tiles">
                     <div class="tiles__title-wrapper">
-                        <h2>Recent projects</h2>
+                        <h2>Related projects</h2>
                     </div>
                     <div class="tiles__list">
                         {% for project in recent_projects %}
@@ -29,7 +29,7 @@ <h2>Recent projects</h2>
             {% if recent_events %}
                 <div class="block block--tiles">
                     <div class="tiles__title-wrapper">
-                        <h2>Recent events</h2>
+                        <h2>Related events</h2>
                     </div>
                     <div class="tiles__list">
                         {% for event in recent_events %}
@@ -43,7 +43,7 @@ <h2>Recent events</h2>
             {% if recent_posts %}
                 <div class="block block--tiles">
                     <div class="tiles__title-wrapper">
-                        <h2>Recent posts</h2>
+                        <h2>Related posts</h2>
                     </div>
                     <div class="tiles__list">
                         {% for post in recent_posts %}