Skip to content

Commit 49039f3

Browse files
Morsey187Ben Morse
andauthored
And images with different file formats. Fix wagtail#457 (wagtail#506)
Co-authored-by: Ben Morse <[email protected]>
1 parent 14eea87 commit 49039f3

File tree

8 files changed

+31
-11
lines changed

8 files changed

+31
-11
lines changed

bakerydemo/base/fixtures/bakerydemo.json

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7541,7 +7541,7 @@
75417541
"latest_revision_created_at": "2019-04-01T07:35:26.199Z",
75427542
"alias_of": null,
75437543
"introduction": "Sandwich bread (also referred to as sandwich loaf) is bread that is prepared specifically to be used for the preparation of sandwiches.",
7544-
"image": 25,
7544+
"image": 55,
75457545
"body": "[{\"type\": \"paragraph_block\", \"value\": \"<p>Sandwich breads are produced in many varieties, such as white, whole wheat, sourdough, rye, multigrain and others. Sandwich bread may be formulated to slice easily,[8] cleanly or uniformly, and may have a fine crumb (the soft, inner part of bread) and a light texture.[4] Sandwich bread may be designed to have a balanced proportion of crumb and crust, whereby the bread holds and supports fillings in place and reduces drips and messiness. <a href=\\\"https://en.wikipedia.org/wiki/Sandwich_bread\\\">Some may be designed</a> to not become crumbly, hardened, dried or have too squishy a texture.</p>\", \"id\": \"6fbdf2bd-8994-40ed-b645-959e7dbf2d1e\"}, {\"type\": \"block_quote\", \"value\": {\"attribute_name\": \"Jim Davis\", \"text\": \"Vegetables are a must on a diet. I suggest carrot cake, zucchini bread, and pumpkin pie.\"}, \"id\": \"244030ba-e734-4c10-a819-4abac3dfdd21\"}, {\"type\": \"image_block\", \"value\": {\"image\": 35, \"attribution\": \"Creative Commons\", \"caption\": \"Belgian Waffle\"}, \"id\": \"9330b160-1111-4a25-b927-ec11a5fa10aa\"}, {\"type\": \"paragraph_block\", \"value\": \"<p>Sandwich bread can refer to cross-sectionally square, sliced white and wheat bread, which has been described as \\\"perfectly designed for holding square luncheon meat\\\".[10] The bread used for preparing finger sandwiches is sometimes referred to as sandwich bread.[10] Pan de molde is a sandwich loaf.[11][12] Some sandwich breads are designed for use in the creation of specific types of sandwiches, such as the submarine sandwich.[13] For barbecuing, use of a high-quality white sandwich bread has been described as suitable for toasting over a fire.[14] Gluten-free sandwich bread may be prepared using gluten-free flour, teff flour.[15][16] and other ingredients.<br/></p><p>In the 1930s in the United States, the term sandwich loaf referred to sliced bread.[10] In contemporary times, U.S. consumers sometimes refer to white bread such as Wonder Bread as sandwich bread and sandwich loaf.[1] Wonder Bread produced and marketed a bread called Wonder Round sandwich bread, which was designed to be used with round-shaped cold cuts and other fillings such as eggs and hamburgers, but it was discontinued due to low consumer demand.[17] American sandwich breads have historically included some fat derived from the use of milk or oil to enrich the bread.</p>\", \"id\": \"ef3345bb-a75c-4723-8662-15b006dae55e\"}]",
75467546
"subtitle": "Innovation in the brick oven",
75477547
"date_published": "2019-02-02",
@@ -12275,7 +12275,7 @@
1227512275
"fields": {
1227612276
"collection": 2,
1227712277
"title": "Yeast",
12278-
"file": "original_images/yeast.jpg",
12278+
"file": "original_images/yeast.avif",
1227912279
"description": "A close-up of small brown bits on a white surface, highlighting the texture and details of yeast extract",
1228012280
"width": 1024,
1228112281
"height": 682,
@@ -12285,8 +12285,8 @@
1228512285
"focal_point_y": null,
1228612286
"focal_point_width": null,
1228712287
"focal_point_height": null,
12288-
"file_size": 122348,
12289-
"file_hash": ""
12288+
"file_size": 14643,
12289+
"file_hash": "214c67da2b04efc27497219d23a03c8abb284a9d"
1229012290
}
1229112291
},
1229212292
{
@@ -12655,7 +12655,7 @@
1265512655
"fields": {
1265612656
"collection": 3,
1265712657
"title": "Baking Soda",
12658-
"file": "original_images/bakingsoda.jpg",
12658+
"file": "original_images/bakingsoda.webp",
1265912659
"description": "A bowl of baking soda with a wooden spoon resting on top, ready for use in baking or cooking",
1266012660
"width": 1024,
1266112661
"height": 678,
@@ -12665,8 +12665,8 @@
1266512665
"focal_point_y": 319,
1266612666
"focal_point_width": 601,
1266712667
"focal_point_height": 570,
12668-
"file_size": 87095,
12669-
"file_hash": ""
12668+
"file_size": 42086,
12669+
"file_hash": "4b74a7d0e602e7b46f3442794891129f93e7dcc6"
1267012670
}
1267112671
},
1267212672
{
@@ -12675,7 +12675,7 @@
1267512675
"fields": {
1267612676
"collection": 3,
1267712677
"title": "Boston Cream Pie",
12678-
"file": "original_images/bostoncream.jpg",
12678+
"file": "original_images/bostoncream.png",
1267912679
"description": "A plate featuring three Boston Cream Pies, each adorned with rich chocolate frosting",
1268012680
"width": 1024,
1268112681
"height": 683,
@@ -12685,8 +12685,8 @@
1268512685
"focal_point_y": 291,
1268612686
"focal_point_width": 923,
1268712687
"focal_point_height": 582,
12688-
"file_size": 117057,
12689-
"file_hash": ""
12688+
"file_size": 116643,
12689+
"file_hash": "cf02dc2beaec08464e2deb27ddbe11548e5c6be9"
1269012690
}
1269112691
},
1269212692
{
@@ -12889,6 +12889,26 @@
1288912889
"file_hash": "aed007ce6a10899ed8267733393e51652365e09e"
1289012890
}
1289112891
},
12892+
{
12893+
"model": "wagtailimages.image",
12894+
"pk": 55,
12895+
"fields": {
12896+
"collection": 3,
12897+
"title": "Slicing bread animation",
12898+
"file": "original_images/slicing-bread.gif",
12899+
"description": "Close-up short looping video of someone slicing a baguette on a bread board",
12900+
"width": 1920,
12901+
"height": 1080,
12902+
"created_at": "2019-02-21T07:50:10.793Z",
12903+
"uploaded_by_user": ["admin"],
12904+
"focal_point_x": null,
12905+
"focal_point_y": null,
12906+
"focal_point_width": null,
12907+
"focal_point_height": null,
12908+
"file_size": 2912888,
12909+
"file_hash": "09d4f3b00fd28114ae54a37e4b60b108d96d155c"
12910+
}
12911+
},
1289212912
{
1289312913
"model": "wagtaildocs.document",
1289412914
"pk": 1,
@@ -13319,7 +13339,7 @@
1331913339
"pk": 74,
1332013340
"fields": {
1332113341
"introduction": "Sandwich bread (also referred to as sandwich loaf) is bread that is prepared specifically to be used for the preparation of sandwiches.",
13322-
"image": 25,
13342+
"image": 55,
1332313343
"body": "[{\"type\": \"paragraph_block\", \"value\": \"<p>Sandwich breads are produced in many varieties, such as white, whole wheat, sourdough, rye, multigrain and others. Sandwich bread may be formulated to slice easily,[8] cleanly or uniformly, and may have a fine crumb (the soft, inner part of bread) and a light texture.[4] Sandwich bread may be designed to have a balanced proportion of crumb and crust, whereby the bread holds and supports fillings in place and reduces drips and messiness. <a href=\\\"https://en.wikipedia.org/wiki/Sandwich_bread\\\">Some may be designed</a> to not become crumbly, hardened, dried or have too squishy a texture.</p>\", \"id\": \"6fbdf2bd-8994-40ed-b645-959e7dbf2d1e\"}, {\"type\": \"block_quote\", \"value\": {\"text\": \"Vegetables are a must on a diet. I suggest carrot cake, zucchini bread, and pumpkin pie.\", \"attribute_name\": \"Jim Davis\"}, \"id\": \"244030ba-e734-4c10-a819-4abac3dfdd21\"}, {\"type\": \"image_block\", \"value\": {\"image\": 35, \"caption\": \"Belgian Waffle\", \"attribution\": \"Creative Commons\"}, \"id\": \"9330b160-1111-4a25-b927-ec11a5fa10aa\"}, {\"type\": \"paragraph_block\", \"value\": \"<p>Sandwich bread can refer to cross-sectionally square, sliced white and wheat bread, which has been described as \\\"perfectly designed for holding square luncheon meat\\\".[10] The bread used for preparing finger sandwiches is sometimes referred to as sandwich bread.[10] Pan de molde is a sandwich loaf.[11][12] Some sandwich breads are designed for use in the creation of specific types of sandwiches, such as the submarine sandwich.[13] For barbecuing, use of a high-quality white sandwich bread has been described as suitable for toasting over a fire.[14] Gluten-free sandwich bread may be prepared using gluten-free flour, teff flour.[15][16] and other ingredients.<br/></p><p>In the 1930s in the United States, the term sandwich loaf referred to sliced bread.[10] In contemporary times, U.S. consumers sometimes refer to white bread such as Wonder Bread as sandwich bread and sandwich loaf.[1] Wonder Bread produced and marketed a bread called Wonder Round sandwich bread, which was designed to be used with round-shaped cold cuts and other fillings such as eggs and hamburgers, but it was discontinued due to low consumer demand.[17] American sandwich breads have historically included some fat derived from the use of milk or oil to enrich the bread.</p>\", \"id\": \"ef3345bb-a75c-4723-8662-15b006dae55e\"}]",
1332413344
"subtitle": "Innovation in the brick oven",
1332513345
"date_published": "2019-02-02"
Binary file not shown.
Binary file not shown.
Binary file not shown.
114 KB
Loading
2.78 MB
Loading
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)