v3.2.1

rickbutterfield · Jan 25, 2025 · 942500e · 942500e
1 parent 43e9dc7
commit 942500e
Show file tree

Hide file tree

Showing 119 changed files with 2,244 additions and 871 deletions.
diff --git a/src/Umbraco.Cms.15.x/Views/Partials/blockgrid/Components/heroBlock.cshtml b/src/Umbraco.Cms.15.x/Views/Partials/blockgrid/Components/heroBlock.cshtml
@@ -5,6 +5,9 @@
     var hasBrightContrast = Model.Content.Contrast == "#ffffff";
 }
 
+<pre>Dropdown: @Model.Content.Height</pre>
+<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+
 <div 
     class="hero"
     style="background-color:@backgroundColor"
@@ -24,5 +27,4 @@
         }
     </div>
 </div>
-
-<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+
diff --git a/src/Umbraco.Cms.15.x/Views/Partials/blocklist/Components/heroBlock.cshtml b/src/Umbraco.Cms.15.x/Views/Partials/blocklist/Components/heroBlock.cshtml
@@ -5,6 +5,9 @@
     var hasBrightContrast = Model.Content.Contrast == "ffffff";
 }
 
+<pre>Dropdown: @Model.Content.Height</pre>
+<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+
 <div 
     class="hero"
     style="background-color:#@backgroundColor"

diff --git a/src/Umbraco.Cms.15.x/Views/Partials/blocklist/Components/nestedBlockList.cshtml b/src/Umbraco.Cms.15.x/Views/Partials/blocklist/Components/nestedBlockList.cshtml
@@ -0,0 +1,3 @@
+@inherits UmbracoViewPage<BlockListItem<NestedBlockList>>
+
+@await Html.GetBlockListHtmlAsync(Model.Content.BlockList)
diff --git a/src/Umbraco.Cms.15.x/uSync/v15/Content/block-list-test.config b/src/Umbraco.Cms.15.x/uSync/v15/Content/block-list-test.config
@@ -10,47 +10,138 @@
     <SortOrder>2</SortOrder>
     <Published Default="true" />
     <Schedule />
-    <Template Key="21af993e-d1d4-4a3b-a7d8-971c3202eddc">BlockList</Template>
+    <Template Key="c021e223-9e49-4725-b942-eb2562f00b84">BlockList</Template>
   </Info>
   <Properties>
     <content>
       <Value><![CDATA[{
-  "layout": {
-    "Umbraco.BlockList": [
-      {
-        "contentUdi": "umb://element/b753b77647ca40e7bbef7637237fd560",
-        "settingsUdi": "umb://element/edf219148160418b96da6d11d063fa7a"
-      }
-    ]
-  },
   "contentData": [
     {
-      "contentTypeKey": "432b58a8-01b7-47dc-8664-f72bf1045f66",
-      "udi": "umb://element/b753b77647ca40e7bbef7637237fd560",
-      "headline": "Test",
-      "image": [
+      "contentTypeKey": "43e5784f-e3f1-4725-8d2c-876cadaba21b",
+      "key": "11d9782e-7e5a-45a1-9152-dbfd11f28973",
+      "udi": null,
+      "values": [
         {
-          "key": "59b1c1a0-203d-491f-ac3e-0311a0c00330",
-          "mediaKey": "65a066c2-b30d-497b-a53c-968e3f9a20d1"
+          "alias": "blockList",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": {
+            "contentData": [
+              {
+                "contentTypeKey": "432b58a8-01b7-47dc-8664-f72bf1045f66",
+                "key": "262c697d-b9db-47f7-9f5d-507fab25accd",
+                "udi": null,
+                "values": [
+                  {
+                    "alias": "headline",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": "Test"
+                  },
+                  {
+                    "alias": "contentPicker",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": "umb://document/6e2ff1f7114e484ba407918daded1aa6"
+                  },
+                  {
+                    "alias": "height",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": [
+                      "150"
+                    ]
+                  },
+                  {
+                    "alias": "image",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": [
+                      {
+                        "key": "bd823f3e-1587-4437-a946-58790b2be204",
+                        "mediaKey": "ff67c98b-dc69-43ec-859a-d22bba816664",
+                        "mediaTypeAlias": "",
+                        "crops": [],
+                        "focalPoint": null
+                      }
+                    ]
+                  },
+                  {
+                    "alias": "backgroundColor",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": {
+                      "label": "113635",
+                      "value": "#113635"
+                    }
+                  },
+                  {
+                    "alias": "contrast",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": {
+                      "label": "ffffff",
+                      "value": "#ffffff"
+                    }
+                  }
+                ]
+              }
+            ],
+            "settingsData": [
+              {
+                "contentTypeKey": "1a16c578-dacc-4552-ad07-26553c8a34fd",
+                "key": "da8cc569-a488-42db-a62d-e86d5d5c5857",
+                "udi": null,
+                "values": []
+              }
+            ],
+            "expose": [
+              {
+                "contentKey": "262c697d-b9db-47f7-9f5d-507fab25accd",
+                "culture": null,
+                "segment": null
+              }
+            ],
+            "Layout": {
+              "Umbraco.BlockList": [
+                {
+                  "contentKey": "262c697d-b9db-47f7-9f5d-507fab25accd",
+                  "contentUdi": null,
+                  "settingsKey": "da8cc569-a488-42db-a62d-e86d5d5c5857",
+                  "settingsUdi": null
+                }
+              ]
+            }
+          }
         }
-      ],
-      "backgroundColor": "",
-      "contrast": {
-        "value": "ffffff",
-        "label": "ffffff",
-        "sortOrder": 1,
-        "id": "2"
-      }
+      ]
     }
   ],
-  "settingsData": [
+  "settingsData": [],
+  "expose": [
     {
-      "contentTypeKey": "1a16c578-dacc-4552-ad07-26553c8a34fd",
-      "udi": "umb://element/edf219148160418b96da6d11d063fa7a",
-      "backgroundColor": "",
-      "contrast": ""
+      "contentKey": "11d9782e-7e5a-45a1-9152-dbfd11f28973",
+      "culture": null,
+      "segment": null
     }
-  ]
+  ],
+  "Layout": {
+    "Umbraco.BlockList": [
+      {
+        "contentKey": "11d9782e-7e5a-45a1-9152-dbfd11f28973",
+        "contentUdi": null,
+        "settingsKey": null,
+        "settingsUdi": null
+      }
+    ]
+  }
 }]]></Value>
     </content>
   </Properties>

diff --git a/src/Umbraco.Cms.15.x/uSync/v15/Content/home.config b/src/Umbraco.Cms.15.x/uSync/v15/Content/home.config
@@ -10,7 +10,7 @@
     <SortOrder>0</SortOrder>
     <Published Default="true" />
     <Schedule />
-    <Template Key="bce3dfc2-5152-427f-999b-0f0901548bdc">BlockGrid</Template>
+    <Template Key="09acf55b-fdd0-4cda-86fa-fa2caef695a9">BlockGrid</Template>
   </Info>
   <Properties>
     <content>

diff --git a/src/Umbraco.Cms.15.x/uSync/v15/Content/nested-block-grid-test.config b/src/Umbraco.Cms.15.x/uSync/v15/Content/nested-block-grid-test.config
@@ -10,7 +10,7 @@
     <SortOrder>3</SortOrder>
     <Published Default="true" />
     <Schedule />
-    <Template Key="bce3dfc2-5152-427f-999b-0f0901548bdc">BlockGrid</Template>
+    <Template Key="09acf55b-fdd0-4cda-86fa-fa2caef695a9">BlockGrid</Template>
   </Info>
   <Properties>
     <content>
@@ -114,6 +114,50 @@
           }
         }
       ]
+    },
+    {
+      "contentTypeKey": "56a73241-9dbd-46aa-a1ff-3d24ae2b6a33",
+      "key": "b8584779-47a5-460e-ae8e-1dbf6823d930",
+      "udi": null,
+      "values": [
+        {
+          "alias": "headline",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": "Card Test"
+        },
+        {
+          "alias": "richText",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": {
+            "markup": "\u003Cp\u003EWith some rich text\u003C/p\u003E",
+            "blocks": {
+              "contentData": [],
+              "settingsData": [],
+              "expose": [],
+              "Layout": {}
+            }
+          }
+        },
+        {
+          "alias": "image",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": [
+            {
+              "key": "b21746f2-6864-498b-a7f0-a4bdaa25c9fd",
+              "mediaKey": "8bf1f902-53a2-498e-a48b-26e35d42df57",
+              "mediaTypeAlias": "Image",
+              "crops": [],
+              "focalPoint": null
+            }
+          ]
+        }
+      ]
     }
   ],
   "settingsData": [
@@ -129,14 +173,29 @@
       "contentKey": "278edacc-89e3-4d99-afec-6731735238c9",
       "culture": null,
       "segment": null
+    },
+    {
+      "contentKey": "b8584779-47a5-460e-ae8e-1dbf6823d930",
+      "culture": null,
+      "segment": null
     }
   ],
   "Layout": {
     "Umbraco.BlockGrid": [
       {
         "areas": [
           {
-            "items": [],
+            "items": [
+              {
+                "areas": [],
+                "columnSpan": 6,
+                "contentKey": "b8584779-47a5-460e-ae8e-1dbf6823d930",
+                "contentUdi": null,
+                "rowSpan": 1,
+                "settingsKey": null,
+                "settingsUdi": null
+              }
+            ],
             "key": "9f1c62ff-38ec-4488-bdc4-b39edfd425f3"
           }
         ],
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		@inherits UmbracoViewPage<BlockListItem<NestedBlockList>>

		@await Html.GetBlockListHtmlAsync(Model.Content.BlockList)