-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into TP1-307-refactor-primaryheroguts-template
- Loading branch information
Showing
34 changed files
with
267 additions
and
157 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
network-api/networkapi/wagtailpages/migrations/0160_homepageideasposts_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
import django.db.models.deletion | ||
import modelcluster.fields | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("wagtailcore", "0089_log_entry_data_json_null_to_object"), | ||
("wagtailimages", "0025_alter_image_file_alter_rendition_file"), | ||
("wagtailpages", "0159_update_bgcta_with_linkblock"), | ||
] | ||
|
||
operations = [ | ||
migrations.RenameModel( | ||
old_name="HomepageSpotlightPosts", | ||
new_name="HomepageIdeasPosts", | ||
), | ||
migrations.RenameField( | ||
model_name="homepage", | ||
old_name="spotlight_headline", | ||
new_name="ideas_headline", | ||
), | ||
migrations.RenameField( | ||
model_name="homepage", | ||
old_name="spotlight_image", | ||
new_name="ideas_image", | ||
), | ||
migrations.AddField( | ||
model_name="homepageideasposts", | ||
name="cta", | ||
field=models.CharField(default="Read more", max_length=50), | ||
), | ||
migrations.AlterField( | ||
model_name="homepageideasposts", | ||
name="page", | ||
field=modelcluster.fields.ParentalKey( | ||
on_delete=django.db.models.deletion.CASCADE, related_name="ideas_posts", to="wagtailpages.homepage" | ||
), | ||
), | ||
] |
31 changes: 31 additions & 0 deletions
31
...ork-api/networkapi/wagtailpages/migrations/0161_alter_homepage_ideas_headline_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Generated by Django 4.2.15 on 2024-09-09 19:16 | ||
|
||
import django.db.models.deletion | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("wagtailimages", "0025_alter_image_file_alter_rendition_file"), | ||
("wagtailpages", "0160_homepageideasposts_and_more"), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name="homepage", | ||
name="ideas_headline", | ||
field=models.CharField(blank=True, max_length=140), | ||
), | ||
migrations.AlterField( | ||
model_name="homepage", | ||
name="ideas_image", | ||
field=models.ForeignKey( | ||
blank=True, | ||
null=True, | ||
on_delete=django.db.models.deletion.SET_NULL, | ||
related_name="ideas_image", | ||
to="wagtailimages.image", | ||
), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/ideas_posts.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{% load wagtailimages_tags i18n %} | ||
|
||
<div class="row section-ideas section-padding"> | ||
|
||
<div class="col-12"> | ||
<h2 class="capsule-label mb-0 ml-md-4">{% trans "Ideas" %}</h2> | ||
</div> | ||
<div class="col-12 col-lg-6 mb-md-4 mb-lg-0 tw-dark"> | ||
<div class="ideas-banner d-flex align-items-end full-bleed-xs p-3 p-md-4" style="background-image: linear-gradient(180deg, rgba(238,238,238,0) 14%, #000000 100%), url({% image_url page.ideas_image "width-540" %});"> | ||
<h3 class="tw-h2-heading ideas-headline mb-0">{{ page.ideas_headline }}</h3> | ||
</div> | ||
</div> | ||
|
||
<div class="col-12 col-lg-6"> | ||
{% for post in page.ideas_posts.all %} | ||
{% with localized=post.blog.localized %} | ||
<div class="ideas-post"> | ||
<h4 class="mb-2 tw-h5-heading"> | ||
<a href="{{ localized.url }}">{{ localized.title }}</a> | ||
</h4> | ||
{% include "./blog_authors.html" with blog_page=localized %} | ||
<a href="{{ localized.url }}" class="tw-cta-link d-inline-block tw-mt-2">{{ post.cta }}</a> | ||
</div> | ||
{% endwith %} | ||
{% endfor %} | ||
</div> | ||
|
||
</div> |
27 changes: 0 additions & 27 deletions
27
network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/spotlight_posts.html
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.