Skip to content

WIP: Allow Thumbnail Choice Blocks To Use All Icons In A Directory #1240

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

Draft
dchukhin wants to merge 134 commits into
base: main
Choose a base branch
from
Draft

WIP: Allow Thumbnail Choice Blocks To Use All Icons In A Directory #1240

Show file tree
Hide file tree
Changes from 119 commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
8eabf10
update get_locales_for_cms_page() to also return fallback locale codes
dchukhin Mar 3, 2026
8cd93ae
add a utility function to find the fallback page for a locale
dchukhin Mar 3, 2026
aa9d7fb
add a migration to ensure expected Locales exist in database
dchukhin Mar 3, 2026
a96b8ec
update FALLBACK_LOCALES mapping in settings to match expected locale …
dchukhin Mar 3, 2026
948dadf
update CMSLocaleFallbackMiddleware to serve content from a fallback l…
dchukhin Mar 3, 2026
356d331
update SpringfieldLocale.get_active to find fallback locale if needed
dchukhin Mar 3, 2026
6943e16
update i18n context processor to return a CANONICAL_LANG
dchukhin Mar 3, 2026
71156ed
update SpringfieldLinkBlock to return expected page URLs
dchukhin Mar 3, 2026
0bae1aa
avoid bug of always returning a 200 response by reverting commit 356d…
dchukhin Mar 3, 2026
1671fca
add tests for changes to get_locale() and render()
dchukhin Mar 3, 2026
9619838
make sure that locales created in migration are translations of root …
dchukhin Mar 4, 2026
702a635
update get_locale_options to return alias locales that have fallback …
dchukhin Mar 4, 2026
034a034
make sure canonical href points to appropriate URL for content
dchukhin Mar 4, 2026
f035cfd
add a test that alias locale pages do not appear in the sitemap
dchukhin Mar 4, 2026
9698819
for consistency, make sure non-Wagtail pages also serve fallback cont…
dchukhin Mar 4, 2026
4ee22ad
serve fallback locale content even when alias Locale does not exist i…
dchukhin Mar 4, 2026
2d5c15a
make sure page links in link block return alias locale URLs even when…
dchukhin Mar 4, 2026
5551777
update tests that rely on FALLBACK_LOCALES to explicitly set it
dchukhin Mar 4, 2026
dfe1e89
correct an incorrectly defined variable in a test
dchukhin Mar 4, 2026
2409910
make sure relative links in link block return alias locale URLs even …
dchukhin Mar 4, 2026
243fcb7
add an indicator for alias locales on the locale list page in Wagtail
dchukhin Mar 4, 2026
cff9645
make sure root pages in new Locales are properly created
dchukhin Mar 5, 2026
25c7b83
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 5, 2026
a0b0437
make sure page links correctly point to page URLs in other locales
dchukhin Mar 5, 2026
422c677
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 5, 2026
508e78a
add column filters in the wagtail localize dashboard
dchukhin Mar 5, 2026
abbad4a
use latest version of wagtail-localize-dashboard
dchukhin Mar 5, 2026
9dd5734
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 9, 2026
db3e105
make sure canonical and alternate hreflangs are valid
dchukhin Mar 9, 2026
6d6669a
add template file used in test
dchukhin Mar 9, 2026
cfa66ed
avoid leaking test state by modifying jinja2_loader.searchpath, rathe…
dchukhin Mar 9, 2026
b594172
make sure new root pages are created at the correct depth
dchukhin Mar 10, 2026
8ea18af
make sure we correctly render homepage content for alias locales
dchukhin Mar 10, 2026
cd4b6c9
make logic more readable by separating middleware and URL-routing logic
dchukhin Mar 10, 2026
e230643
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 10, 2026
b43520d
reorder migrations after merge
dchukhin Mar 10, 2026
37df87c
make sure redirects based on Accept-Language header work for non-dept…
dchukhin Mar 11, 2026
bfd4689
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 12, 2026
87fef95
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 16, 2026
0a4f928
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 19, 2026
9d2cc6c
reorder migrations after merge
dchukhin Mar 19, 2026
16544c1
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 23, 2026
f9eb43e
fix minor typos in tests
dchukhin Mar 23, 2026
9a64d74
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 24, 2026
a8f811a
add unit tests for different root page scenarios in fallback locale
dchukhin Mar 24, 2026
91b48c7
disable creating alias locale records in db export script
dchukhin Mar 24, 2026
9e6ed2d
update comment in migration to be accurate based on middleware refact…
dchukhin Mar 24, 2026
db4ea9d
make code more readable by referring to request interception in a con…
dchukhin Mar 24, 2026
f58ae8a
make code more readable by moving fallback locale check into helper f…
dchukhin Mar 24, 2026
eef8239
add explicit test that a live Page in an alias locale is served as ex…
dchukhin Mar 24, 2026
d19178b
be more specific about the exception when the site root does not exis…
dchukhin Mar 24, 2026
45cc7ff
be more efficient when calculating existing locales
dchukhin Mar 24, 2026
10414e1
be more specific about the exceptions raised in SpringfieldLinkBlockU…
dchukhin Mar 24, 2026
d8eede5
Remove extra whitespace in comment
dchukhin Mar 24, 2026
b9e1cbb
get locale directly from the URL, rather than an attribute on the req…
dchukhin Mar 24, 2026
380e007
Merge branch 'WT-854-language-fallback-for-pages' of github.com:mozme…
dchukhin Mar 24, 2026
7a1cda1
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 26, 2026
06c37ee
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Mar 27, 2026
25eb52c
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Apr 1, 2026
2408295
update 'compare' and 'more' URLs to use prefer_cms()
dchukhin Apr 1, 2026
7f90c61
add helper functions for FTL parsing
dchukhin Apr 2, 2026
611f3ad
add a field to determine if article detail siblings should be visible…
dchukhin Apr 2, 2026
f947b3e
add a management command to create 'compare' and 'more' CMS pages
dchukhin Apr 3, 2026
5c8f909
add migrations to create 'compare' and 'more' pages
dchukhin Apr 3, 2026
6281428
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
dchukhin Apr 3, 2026
8f5fd39
Merge branch 'main' into WT-854-language-fallback-for-pages
dchukhin Apr 3, 2026
098bfa5
reorder migrations after merge
dchukhin Apr 3, 2026
3509089
Merge branch 'WT-854-language-fallback-for-pages' into WT-961-program…
dchukhin Apr 3, 2026
edf8701
reorder migrations after merge
dchukhin Apr 3, 2026
836551a
explicitly set show_sibling_detail_pages in test object
dchukhin Apr 3, 2026
44b4c4d
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
dchukhin Apr 8, 2026
7d43ddf
update 'compare' and 'more' URLs to use prefer_cms()
dchukhin Apr 1, 2026
d44aecc
add helper functions for FTL parsing
dchukhin Apr 2, 2026
68b28d0
add a field to determine if article detail siblings should be visible…
dchukhin Apr 2, 2026
136d7d6
add a management command to create 'compare' and 'more' CMS pages
dchukhin Apr 3, 2026
3b696ad
add migrations to create 'compare' and 'more' pages
dchukhin Apr 3, 2026
3018427
explicitly set show_sibling_detail_pages in test object
dchukhin Apr 3, 2026
9eb23db
reorder migrations to account for changes in main branch
dchukhin Apr 8, 2026
095749b
add a management command to generate icon CSS for a directory
dchukhin Apr 6, 2026
87023f3
update flare-26-icon CSS rules with management command
dchukhin Apr 7, 2026
4c0756a
update IconListItemBlock to use a ThumbnailChoiceBlock pointing to a …
dchukhin Apr 7, 2026
bed531f
update other uses of ThumbnailChoiceBlock to use a directory of icons
dchukhin Apr 7, 2026
0d70f52
migrate ThumbnailChoiceBlock pre-thumbnail_directory values to their …
dchukhin Apr 7, 2026
36a0208
update fixtures based on changes to ThumbnailChoiceBlocks
dchukhin Apr 7, 2026
cd0cf3b
remove unused ICON_CHOICES constant
dchukhin Apr 8, 2026
f340422
remove unused template
dchukhin Apr 8, 2026
1640c77
update IconListItemBlock to use IconChoiceBlock
dchukhin Apr 8, 2026
8165452
fix tests based on recent changes to how we use ThumbnailChoiceBlock
dchukhin Apr 8, 2026
93ce075
update another template based on changes to ThumbnailChoiceBlock use
dchukhin Apr 8, 2026
df1fedf
make sure migration has license file
dchukhin Apr 8, 2026
4071e30
Merge branch 'main' into icon-directory-for-thumbnails
dchukhin Apr 13, 2026
76778e2
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
dchukhin Apr 21, 2026
dad40bf
reorder migrations after merge
dchukhin Apr 21, 2026
c8e1340
Merge branch 'WT-961-programmatically-make-cms-compare-and-more-pages…
dchukhin Apr 21, 2026
1fbff1f
Merge branch 'WT-961-programmatically-make-cms-compare-and-more-pages…
dchukhin Apr 21, 2026
0bf8858
reorder migrations after merge
dchukhin Apr 21, 2026
7039173
remove special-case rule for .fl-icon-experiments, since it is automa…
dchukhin Apr 21, 2026
0ab7e80
fix test based on changes from merge
dchukhin Apr 21, 2026
69f9c01
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
kkellydesign Apr 22, 2026
df50e76
Merge branch 'WT-961-programmatically-make-cms-compare-and-more-pages…
kkellydesign Apr 22, 2026
afbecb6
reorder migrations after merge
dchukhin Apr 23, 2026
7f3e611
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
dchukhin Apr 23, 2026
73d81d3
Merge branch 'WT-961-programmatically-make-cms-compare-and-more-pages…
dchukhin Apr 23, 2026
98170bd
reorder migrations after merge
dchukhin Apr 23, 2026
a0e54a0
keep database values for thumbnails the same, while still auto-findin…
dchukhin Apr 27, 2026
37a594f
use existing icon for icons that were previously found in a different…
dchukhin Apr 27, 2026
601e49e
Merge branch 'main' into icon-directory-for-thumbnails
dchukhin Apr 28, 2026
a07e12e
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
dchukhin Apr 28, 2026
287856a
reorder migrations after merge
dchukhin Apr 28, 2026
b39fa25
Merge branch 'WT-961-programmatically-make-cms-compare-and-more-pages…
dchukhin Apr 28, 2026
7f42857
rename icon that was an exception, to avoid extra data migrations
dchukhin Apr 28, 2026
b5d8908
make sure all duplicate paths are in _COLLIDING_PATHS constant
dchukhin Apr 28, 2026
fc69845
update displayed label for 'screenshot-camera' to match what it used …
dchukhin Apr 28, 2026
86fa099
update icon_value_fn() to return relative path with '/' replaced with…
dchukhin Apr 28, 2026
b781956
update management command to build CSS to handle colliding filenames
dchukhin Apr 28, 2026
7f06103
update management command to build CSS to handle colliding filenames
dchukhin Apr 28, 2026
ead63ea
add CSS rules for new icons to flare26-icon
dchukhin Apr 28, 2026
d0bc75e
undo changes to fixtures files, so icons remain as they were before t…
dchukhin Apr 28, 2026
b51c542
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
kkellydesign Apr 29, 2026
1f684a2
[reset-db]
kkellydesign Apr 29, 2026
c44bb30
[reset-db]
kkellydesign Apr 29, 2026
1d196b7
add wagtailsearch migration dependency, to allow migration to run on …
dchukhin Apr 29, 2026
c5db397
Remove icon that only rendered a black circle
maribedran Apr 29, 2026
2549ca5
Remove CSS rule for removed icon
maribedran Apr 29, 2026
06b84a5
Organize imports on create compare pages command
maribedran Apr 30, 2026
59308ff
Merge branch 'icon-directory-for-thumbnails' of github.com:mozmeao/sp…
dchukhin Apr 30, 2026
6d8805d
Merge branch 'main' into icon-directory-for-thumbnails
dchukhin Apr 30, 2026
6dd5eaf
Merge branch 'WT-961-programmatically-make-cms-compare-and-more-pages…
dchukhin Apr 30, 2026
12ed402
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
dchukhin May 1, 2026
e7e8f8b
ArticleIndexPage supports 3 different card types
dchukhin May 1, 2026
40bf518
update logic to create 'compare' and 'more' pages to set pages' index…
dchukhin May 1, 2026
6a110d3
Merge branch 'main' into WT-961-programmatically-make-cms-compare-and…
dchukhin May 1, 2026
7633740
Merge branch 'WT-961-programmatically-make-cms-compare-and-more-pages…
dchukhin May 1, 2026
fddf8d8
reorder migrations after merge
dchukhin May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,245 changes: 810 additions & 435 deletions media/css/cms/flare26-icon.css
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions media/img/firefox/flare/2026/icons/android.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions media/img/firefox/flare/2026/icons/apple.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions ...lare/2026/icons/desktop-16/avatars/avatar-signed-in-fill-profile-picture-16.svg
View file
Open in desktop

This file was deleted.

0 ...icons/desktop-16/screenshot/camera-16.svg → ...op-16/screenshot/screenshot-camera-16.svg
View file
Open in desktop
File renamed without changes
3 changes: 3 additions & 0 deletions media/img/firefox/flare/2026/icons/toggle-on.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading