-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Rick Butterfield
committed
Aug 28, 2024
1 parent
244e26b
commit e221e2d
Showing
37 changed files
with
572 additions
and
187 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.10.1 | ||
| 1.10.2 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.BlockList> | ||
| @using ContentModels = Umbraco.Cms.Web.Common.PublishedModels; | ||
| @{ | ||
| Layout = "Layout.cshtml"; | ||
| } | ||
|
|
||
| @await Html.GetBlockListHtmlAsync(Model.Content) |
23 changes: 23 additions & 0 deletions
23
src/Umbraco.Cms.13.x/Views/Partials/blocklist/Components/heroBlock.cshtml
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,23 @@ | ||
| @inherits UmbracoViewPage<BlockListItem<HeroBlock>> | ||
| @{ | ||
| var backgroundColor = Model.Content.BackgroundColor; | ||
| var image = Model.Content.Image; | ||
| var hasBrightContrast = Model.Content.Contrast == "ffffff"; | ||
| } | ||
|
|
||
| <div | ||
| class="hero" | ||
| style="background-color:#@backgroundColor" | ||
| @(hasBrightContrast ? "bright-contrast" : null)> | ||
|
|
||
| @if (image is not null) { | ||
| <div class="hero-background" style="background-image: url(@image.GetCropUrl(width:3840))"> | ||
| </div> | ||
| } | ||
|
|
||
| <div class="hero-content"> | ||
| <h1>@Model.Content.Headline</h1> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
23 changes: 23 additions & 0 deletions
23
src/Umbraco.Cms.13.x/Views/Partials/richtext/Components/cardBlock.cshtml
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,23 @@ | ||
| @inherits UmbracoViewPage<RichTextBlockItem<CardBlock>> | ||
|
|
||
| <div class="card --medium"> | ||
|
|
||
| <div class="card-media"> | ||
| @{ | ||
| var image = Model.Content.Image; | ||
| if (image is not null) | ||
| { | ||
| <img src="@image.GetCropUrl(width: 360)" /> | ||
| } | ||
| else | ||
| { | ||
| <p>Missing image</p> | ||
| } | ||
| } | ||
| </div> | ||
| <div class="card-content"> | ||
| <h4>@Model.Content.Headline</h4> | ||
| <div>@Model.Content.RichText</div> | ||
| </div> | ||
|
|
||
| </div> |
57 changes: 57 additions & 0 deletions
57
src/Umbraco.Cms.13.x/uSync/v9/Content/block-list-test.config
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,57 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Content Key="2ed5a2c4-b6a0-4566-9d44-23fb7844abdc" Alias="Block List Test" Level="2"> | ||
| <Info> | ||
| <Parent Key="6e2ff1f7-114e-484b-a407-918daded1aa6">Home</Parent> | ||
| <Path>/Home/BlockListTest</Path> | ||
| <Trashed>false</Trashed> | ||
| <ContentType>blockList</ContentType> | ||
| <CreateDate>2024-04-23T14:41:04</CreateDate> | ||
| <NodeName Default="Block List Test" /> | ||
| <SortOrder>2</SortOrder> | ||
| <Published Default="true" /> | ||
| <Schedule /> | ||
| <Template Key="21af993e-d1d4-4a3b-a7d8-971c3202eddc">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": [ | ||
| { | ||
| "key": "59b1c1a0-203d-491f-ac3e-0311a0c00330", | ||
| "mediaKey": "65a066c2-b30d-497b-a53c-968e3f9a20d1" | ||
| } | ||
| ], | ||
| "backgroundColor": "", | ||
| "contrast": { | ||
| "value": "ffffff", | ||
| "label": "ffffff", | ||
| "sortOrder": 1, | ||
| "id": "2" | ||
| } | ||
| } | ||
| ], | ||
| "settingsData": [ | ||
| { | ||
| "contentTypeKey": "1a16c578-dacc-4552-ad07-26553c8a34fd", | ||
| "udi": "umb://element/edf219148160418b96da6d11d063fa7a", | ||
| "backgroundColor": "", | ||
| "contrast": "" | ||
| } | ||
| ] | ||
| }]]></Value> | ||
| </content> | ||
| </Properties> | ||
| </Content> |
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
108 changes: 108 additions & 0 deletions
108
src/Umbraco.Cms.13.x/uSync/v9/Content/test_jjdoauzk.config
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,108 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Content Key="53e0464a-d92a-44dd-a067-668a778b6fdb" Alias="Test" Level="2"> | ||
| <Info> | ||
| <Parent Key="6e2ff1f7-114e-484b-a407-918daded1aa6">Home</Parent> | ||
| <Path>/Home/Test</Path> | ||
| <Trashed>false</Trashed> | ||
| <ContentType>blockGrid</ContentType> | ||
| <CreateDate>2024-04-22T20:05:43</CreateDate> | ||
| <NodeName Default="Test" /> | ||
| <SortOrder>1</SortOrder> | ||
| <Published Default="true" /> | ||
| <Schedule /> | ||
| <Template Key="bce3dfc2-5152-427f-999b-0f0901548bdc">BlockGrid</Template> | ||
| </Info> | ||
| <Properties> | ||
| <content> | ||
| <Value><![CDATA[{ | ||
| "layout": { | ||
| "Umbraco.BlockGrid": [ | ||
| { | ||
| "contentUdi": "umb://element/b77e9f1fc48d467bb9523e3c27d430eb", | ||
| "areas": [ | ||
| { | ||
| "key": "3b490f17-1471-4ac4-9434-60e676639e29", | ||
| "items": [] | ||
| } | ||
| ], | ||
| "columnSpan": 12, | ||
| "rowSpan": 1 | ||
| }, | ||
| { | ||
| "contentUdi": "umb://element/b825be81ca8246e192cae6a49df26ce4", | ||
| "settingsUdi": "umb://element/70df878539664925aeb8f0c8b64029d9", | ||
| "areas": [ | ||
| { | ||
| "key": "9f1c62ff-38ec-4488-bdc4-b39edfd425f3", | ||
| "items": [ | ||
| { | ||
| "contentUdi": "umb://element/3e0a7fda6dce45ceb512230c2f9db9c6", | ||
| "areas": [], | ||
| "columnSpan": 12, | ||
| "rowSpan": 1 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "columnSpan": 12, | ||
| "rowSpan": 1 | ||
| } | ||
| ] | ||
| }, | ||
| "contentData": [ | ||
| { | ||
| "contentTypeKey": "432b58a8-01b7-47dc-8664-f72bf1045f66", | ||
| "udi": "umb://element/b77e9f1fc48d467bb9523e3c27d430eb", | ||
| "image": [ | ||
| { | ||
| "key": "fe426d97-d83d-429f-8509-a50d8ffb9eca", | ||
| "mediaKey": "65a066c2-b30d-497b-a53c-968e3f9a20d1" | ||
| } | ||
| ], | ||
| "headline": "Test", | ||
| "backgroundColor": "", | ||
| "contrast": "" | ||
| }, | ||
| { | ||
| "contentTypeKey": "964feee4-efb3-4676-91a0-b960f26e9d92", | ||
| "udi": "umb://element/b825be81ca8246e192cae6a49df26ce4" | ||
| }, | ||
| { | ||
| "contentTypeKey": "69de9db6-ec92-4989-a5f6-8437b8f3d5cd", | ||
| "udi": "umb://element/3e0a7fda6dce45ceb512230c2f9db9c6", | ||
| "richText": { | ||
| "markup": "<p>RTE Block test</p>\n<umb-rte-block class=\"ng-scope ng-isolate-scope\" data-content-udi=\"umb://element/faf1d30eb6c540ab9b7e51bedb6c34b1\"><!--Umbraco-Block--></umb-rte-block>", | ||
| "blocks": { | ||
| "layout": { | ||
| "Umbraco.TinyMCE": [ | ||
| { | ||
| "contentUdi": "umb://element/faf1d30eb6c540ab9b7e51bedb6c34b1" | ||
| } | ||
| ] | ||
| }, | ||
| "contentData": [ | ||
| { | ||
| "contentTypeKey": "56a73241-9dbd-46aa-a1ff-3d24ae2b6a33", | ||
| "udi": "umb://element/faf1d30eb6c540ab9b7e51bedb6c34b1", | ||
| "headline": "Test card block inside RTE", | ||
| "richText": "{\"markup\":\"<p>Blah blah blah</p>\",\"blocks\":{\"contentData\":[],\"settingsData\":[]}}", | ||
| "image": "[{\"key\":\"90a8b07e-131e-40fc-8c93-af937fa0f6f7\",\"mediaKey\":\"65a066c2-b30d-497b-a53c-968e3f9a20d1\"}]" | ||
| } | ||
| ], | ||
| "settingsData": [] | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "settingsData": [ | ||
| { | ||
| "contentTypeKey": "1a16c578-dacc-4552-ad07-26553c8a34fd", | ||
| "udi": "umb://element/70df878539664925aeb8f0c8b64029d9", | ||
| "backgroundColor": "", | ||
| "contrast": "" | ||
| } | ||
| ] | ||
| }]]></Value> | ||
| </content> | ||
| </Properties> | ||
| </Content> |
53 changes: 53 additions & 0 deletions
53
src/Umbraco.Cms.13.x/uSync/v9/ContentTypes/blocklist.config
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,53 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <ContentType Key="36a2e617-030d-498b-a7d4-18a281923142" Alias="blockList" Level="1"> | ||
| <Info> | ||
| <Name>Block List</Name> | ||
| <Icon>icon-filter-arrows color-black</Icon> | ||
| <Thumbnail>folder.png</Thumbnail> | ||
| <Description></Description> | ||
| <AllowAtRoot>True</AllowAtRoot> | ||
| <IsListView>False</IsListView> | ||
| <Variations>Nothing</Variations> | ||
| <IsElement>false</IsElement> | ||
| <HistoryCleanup> | ||
| <PreventCleanup>False</PreventCleanup> | ||
| <KeepAllVersionsNewerThanDays></KeepAllVersionsNewerThanDays> | ||
| <KeepLatestVersionPerDayForDays></KeepLatestVersionPerDayForDays> | ||
| </HistoryCleanup> | ||
| <Compositions /> | ||
| <DefaultTemplate>BlockList</DefaultTemplate> | ||
| <AllowedTemplates> | ||
| <Template Key="21af993e-d1d4-4a3b-a7d8-971c3202eddc">BlockList</Template> | ||
| </AllowedTemplates> | ||
| </Info> | ||
| <Structure> | ||
| <ContentType Key="ca01f2ad-4fde-42ff-9952-76629e8c1780" SortOrder="0">blockGrid</ContentType> | ||
| </Structure> | ||
| <GenericProperties> | ||
| <GenericProperty> | ||
| <Key>1e95879e-7623-443d-9b4c-34910a8fbe20</Key> | ||
| <Name>Content</Name> | ||
| <Alias>content</Alias> | ||
| <Definition>d455ec3d-a214-4b10-9d77-ca61ea867cd0</Definition> | ||
| <Type>Umbraco.BlockList</Type> | ||
| <Mandatory>false</Mandatory> | ||
| <Validation></Validation> | ||
| <Description><![CDATA[]]></Description> | ||
| <SortOrder>1</SortOrder> | ||
| <Tab Alias="content">Content</Tab> | ||
| <Variations>Nothing</Variations> | ||
| <MandatoryMessage></MandatoryMessage> | ||
| <ValidationRegExpMessage></ValidationRegExpMessage> | ||
| <LabelOnTop>true</LabelOnTop> | ||
| </GenericProperty> | ||
| </GenericProperties> | ||
| <Tabs> | ||
| <Tab> | ||
| <Key>5abf23a8-c995-4c3b-bf26-9f9dea2a6604</Key> | ||
| <Caption>Content</Caption> | ||
| <Alias>content</Alias> | ||
| <Type>Group</Type> | ||
| <SortOrder>0</SortOrder> | ||
| </Tab> | ||
| </Tabs> | ||
| </ContentType> |
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,33 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DataType Key="d455ec3d-a214-4b10-9d77-ca61ea867cd0" Alias="Block List" Level="2"> | ||
| <Info> | ||
| <Name>Block List</Name> | ||
| <EditorAlias>Umbraco.BlockList</EditorAlias> | ||
| <DatabaseType>Ntext</DatabaseType> | ||
| <Folder>Block+Grid</Folder> | ||
| </Info> | ||
| <Config><![CDATA[{ | ||
| "Blocks": [ | ||
| { | ||
| "backgroundColor": null, | ||
| "contentElementTypeKey": "432b58a8-01b7-47dc-8664-f72bf1045f66", | ||
| "editorSize": "medium", | ||
| "forceHideContentEditorInOverlay": false, | ||
| "iconColor": null, | ||
| "label": null, | ||
| "settingsElementTypeKey": "1a16c578-dacc-4552-ad07-26553c8a34fd", | ||
| "stylesheet": "~/css/myblockgridlayout.css", | ||
| "thumbnail": null, | ||
| "view": "~/App_Plugins/Umbraco.Community.BlockPreview/views/block-preview.html" | ||
| } | ||
| ], | ||
| "MaxPropertyWidth": "100%", | ||
| "UseInlineEditingAsDefault": false, | ||
| "UseLiveEditing": false, | ||
| "UseSingleBlockMode": false, | ||
| "ValidationLimit": { | ||
| "max": null, | ||
| "min": null | ||
| } | ||
| }]]></Config> | ||
| </DataType> |
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.