Skip to content

Commit 0be8ca8

Browse files
idseefeldidseefeld
authored
Merge pull request #28 from idseefeld/bugs/24-can-not-remove-background-image-from-layout-setting
fix background image update issue
2 parents 3b02fd2 + 9ecc954 commit 0be8ca8

39 files changed

+847
-528
lines changed

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/Content/home_pqnnwmzt.config‎

Lines changed: 166 additions & 100 deletions
Large diffs are not rendered by default.

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/Content/imprint.config‎

Lines changed: 35 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -23,173 +23,78 @@
2323
<Value><![CDATA[{
2424
"contentData": [
2525
{
26-
"contentTypeKey": "7cc64771-0f34-4845-a7d9-1e7a2528a512",
27-
"key": "fd05ff48-b3fc-44ea-ba38-0dc2903374ff",
26+
"contentTypeKey": "99dcf6a1-3b43-4fe9-a997-59eccce246c2",
27+
"key": "02f30d09-32bb-4d0c-8f40-c0f1f22f55b7",
2828
"udi": null,
2929
"values": []
3030
},
3131
{
32-
"contentTypeKey": "e6b7c8ba-7312-4d1a-93dc-58f77bfec3e8",
33-
"key": "f02a8ff3-71e5-4c0b-b38f-45c75d1d1db6",
32+
"contentTypeKey": "793d20b4-2f30-4920-84c3-557f5f85411f",
33+
"key": "82c53211-1200-4c42-90b8-b556cb7dff65",
3434
"udi": null,
3535
"values": [
3636
{
37-
"alias": "mediaItem",
38-
"culture": null,
39-
"editorAlias": null,
40-
"segment": null,
41-
"value": [
42-
{
43-
"key": "5e9a698f-1de8-410c-bf2e-5cbed2147f48",
44-
"mediaKey": "055545db-11c9-4f5d-86b8-90ca79ef37ce",
45-
"mediaTypeAlias": "",
46-
"focalPoint": null,
47-
"crops": [
48-
{
49-
"label": "Square",
50-
"alias": "square",
51-
"width": 1485,
52-
"height": 1485,
53-
"defaultCrop": true,
54-
"coordinates": {
55-
"x1": 0.43912913898035677,
56-
"x2": 0.09212086949423715,
57-
"y1": 0.2707345974063071,
58-
"y2": 0.10426539506072027
59-
}
60-
},
61-
{
62-
"label": "Portrait",
63-
"alias": "portrait",
64-
"width": 1050,
65-
"height": 1485,
66-
"defaultCrop": false,
67-
"coordinates": {
68-
"x1": 0.3831901821479978,
69-
"x2": 0.08650767068727322,
70-
"y1": 0,
71-
"y2": 0
72-
}
73-
},
74-
{
75-
"label": "Landscape",
76-
"alias": "landscape",
77-
"width": 1485,
78-
"height": 1050,
79-
"defaultCrop": false,
80-
"coordinates": {
81-
"x1": 0,
82-
"x2": 0,
83-
"y1": 0.057229022036653004,
84-
"y2": 1.1362988673281987e-8
85-
}
86-
},
87-
{
88-
"label": "Wide",
89-
"alias": "wide",
90-
"width": 1485,
91-
"height": 535,
92-
"defaultCrop": false,
93-
"coordinates": {
94-
"x1": 0,
95-
"x2": 0,
96-
"y1": 0.5064029311770138,
97-
"y2": 0.013250699450865905
98-
}
99-
}
100-
],
101-
"selectedCropAlias": "wide"
102-
}
103-
]
104-
},
105-
{
106-
"alias": "figCaption",
107-
"culture": "en-US",
108-
"editorAlias": null,
109-
"segment": null,
110-
"value": "Scotland near Loch Ness"
111-
},
112-
{
113-
"alias": "alternativeText",
37+
"alias": "text",
11438
"culture": "en-US",
11539
"editorAlias": null,
11640
"segment": null,
117-
"value": "Scotland"
118-
},
119-
{
120-
"alias": "captionColor",
121-
"culture": null,
122-
"editorAlias": null,
123-
"segment": null,
124-
"value": {
125-
"label": "Blue",
126-
"value": "#185ecd"
127-
}
41+
"value": "Imprint"
12842
}
12943
]
130-
},
44+
}
45+
],
46+
"settingsData": [
13147
{
132-
"contentTypeKey": "e6b7c8ba-7312-4d1a-93dc-58f77bfec3e8",
133-
"key": "86e5eae5-1075-451e-836e-efcfab004198",
48+
"contentTypeKey": "dfd0c542-1066-4ccc-9e61-6ec389826651",
49+
"key": "0b0fbaf8-2f01-4651-967c-95495e5aa4eb",
13450
"udi": null,
13551
"values": [
13652
{
137-
"alias": "mediaItem",
53+
"alias": "backgroundColor",
13854
"culture": null,
13955
"editorAlias": null,
14056
"segment": null,
141-
"value": [
142-
{
143-
"key": "29370c87-4ca7-46e4-9a81-d74248445bb3",
144-
"mediaKey": "b0d5cf72-29f0-49a2-adaa-8d5c980f3078",
145-
"mediaTypeAlias": "",
146-
"focalPoint": null,
147-
"crops": [],
148-
"selectedCropAlias": ""
149-
}
150-
]
57+
"value": {
58+
"label": "Transparent",
59+
"value": "#fff"
60+
}
15161
},
15262
{
153-
"alias": "figCaption",
154-
"culture": "en-US",
63+
"alias": "backgroundImage",
64+
"culture": null,
15565
"editorAlias": null,
15666
"segment": null,
157-
"value": "My Family"
67+
"value": ""
15868
},
15969
{
160-
"alias": "captionColor",
70+
"alias": "padding",
16171
"culture": null,
16272
"editorAlias": null,
16373
"segment": null,
164-
"value": {
165-
"label": "Blue",
166-
"value": "#185ecd"
167-
}
74+
"value": ""
16875
}
16976
]
170-
}
171-
],
172-
"settingsData": [
77+
},
17378
{
174-
"contentTypeKey": "dfd0c542-1066-4ccc-9e61-6ec389826651",
175-
"key": "71de9109-796d-44d9-b3aa-d57623814a7d",
79+
"contentTypeKey": "5a9ad4ea-4234-48b7-a0cc-b7dd81b67b19",
80+
"key": "8c28daa6-1bdc-478f-afcd-134ab70450f3",
17681
"udi": null,
17782
"values": []
17883
}
17984
],
18085
"expose": [
18186
{
182-
"contentKey": "fd05ff48-b3fc-44ea-ba38-0dc2903374ff",
183-
"culture": null,
87+
"contentKey": "86e5eae5-1075-451e-836e-efcfab004198",
88+
"culture": "en-US",
18489
"segment": null
18590
},
18691
{
187-
"contentKey": "f02a8ff3-71e5-4c0b-b38f-45c75d1d1db6",
188-
"culture": "en-US",
92+
"contentKey": "02f30d09-32bb-4d0c-8f40-c0f1f22f55b7",
93+
"culture": null,
18994
"segment": null
19095
},
19196
{
192-
"contentKey": "86e5eae5-1075-451e-836e-efcfab004198",
97+
"contentKey": "82c53211-1200-4c42-90b8-b556cb7dff65",
19398
"culture": "en-US",
19499
"segment": null
195100
}
@@ -202,36 +107,22 @@
202107
"items": [
203108
{
204109
"areas": [],
205-
"columnSpan": 4,
206-
"contentKey": "86e5eae5-1075-451e-836e-efcfab004198",
207-
"contentUdi": null,
208-
"rowSpan": 1,
209-
"settingsKey": null,
210-
"settingsUdi": null
211-
}
212-
],
213-
"key": "216a6253-145e-4dcd-b298-8e6081a2e77c"
214-
},
215-
{
216-
"items": [
217-
{
218-
"areas": [],
219-
"columnSpan": 8,
220-
"contentKey": "f02a8ff3-71e5-4c0b-b38f-45c75d1d1db6",
110+
"columnSpan": 12,
111+
"contentKey": "82c53211-1200-4c42-90b8-b556cb7dff65",
221112
"contentUdi": null,
222113
"rowSpan": 1,
223-
"settingsKey": null,
114+
"settingsKey": "8c28daa6-1bdc-478f-afcd-134ab70450f3",
224115
"settingsUdi": null
225116
}
226117
],
227-
"key": "aff4f809-d580-4ba4-8103-5cb38e7c1f59"
118+
"key": "2ec732e8-1597-4df0-a155-fedec16580aa"
228119
}
229120
],
230121
"columnSpan": 12,
231-
"contentKey": "fd05ff48-b3fc-44ea-ba38-0dc2903374ff",
122+
"contentKey": "02f30d09-32bb-4d0c-8f40-c0f1f22f55b7",
232123
"contentUdi": null,
233124
"rowSpan": 1,
234-
"settingsKey": "71de9109-796d-44d9-b3aa-d57623814a7d",
125+
"settingsKey": "0b0fbaf8-2f01-4651-967c-95495e5aa4eb",
235126
"settingsUdi": null
236127
}
237128
]

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/ContentTypes/pagesettings.config‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,22 @@
2121
</Info>
2222
<Structure />
2323
<GenericProperties>
24+
<GenericProperty>
25+
<Key>0f1efde7-8ae1-460c-a2b8-8e698b60a4c5</Key>
26+
<Name>Page Background Color</Name>
27+
<Alias>pageBackgroundColor</Alias>
28+
<Definition>0225af17-b302-49cb-9176-b9f35cab9c17</Definition>
29+
<Type>Umbraco.ColorPicker</Type>
30+
<Mandatory>false</Mandatory>
31+
<Validation></Validation>
32+
<Description><![CDATA[]]></Description>
33+
<SortOrder>2</SortOrder>
34+
<Tab Alias="pageSettings">Page Settings</Tab>
35+
<Variations>Nothing</Variations>
36+
<MandatoryMessage></MandatoryMessage>
37+
<ValidationRegExpMessage></ValidationRegExpMessage>
38+
<LabelOnTop>false</LabelOnTop>
39+
</GenericProperty>
2440
<GenericProperty>
2541
<Key>ac95936f-c22d-4c0d-916b-f266306f922f</Key>
2642
<Name>Umbraco Navi Hide</Name>

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/ContentTypes/rootpage.config‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,22 @@
2828
<ContentType Key="aad39c47-d9ec-4b63-b509-24bcff7e2d3f" SortOrder="0">standardPage</ContentType>
2929
</Structure>
3030
<GenericProperties>
31+
<GenericProperty>
32+
<Key>6ce61a98-fb7e-4087-ab05-fcebe3598fbe</Key>
33+
<Name>Another Property</Name>
34+
<Alias>anotherProperty</Alias>
35+
<Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
36+
<Type>Umbraco.TextBox</Type>
37+
<Mandatory>false</Mandatory>
38+
<Validation></Validation>
39+
<Description><![CDATA[]]></Description>
40+
<SortOrder>0</SortOrder>
41+
<Tab Alias="content">Content</Tab>
42+
<Variations>Nothing</Variations>
43+
<MandatoryMessage></MandatoryMessage>
44+
<ValidationRegExpMessage></ValidationRegExpMessage>
45+
<LabelOnTop>false</LabelOnTop>
46+
</GenericProperty>
3147
<GenericProperty>
3248
<Key>9a320875-10bc-456a-b53a-649b1d05a4e5</Key>
3349
<Name>Main</Name>
@@ -37,7 +53,7 @@
3753
<Mandatory>false</Mandatory>
3854
<Validation></Validation>
3955
<Description><![CDATA[]]></Description>
40-
<SortOrder>0</SortOrder>
56+
<SortOrder>1</SortOrder>
4157
<Tab Alias="content">Content</Tab>
4258
<Variations>Nothing</Variations>
4359
<MandatoryMessage></MandatoryMessage>

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/ContentTypes/wysiwg65_croppedpicture.config‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ContentType Key="0d018f9f-a815-4359-abc2-e757d958b3af" Alias="wysiwg65_croppedPicture" Level="3">
3+
<Info>
4+
<Name>Cropped Picture</Name>
5+
<Icon>icon-document-image</Icon>
6+
<Thumbnail>folder.png</Thumbnail>
7+
<Description></Description>
8+
<AllowAtRoot>False</AllowAtRoot>
9+
<ListView>00000000-0000-0000-0000-000000000000</ListView>
10+
<Variations>CultureAndSegment</Variations>
11+
<IsElement>true</IsElement>
12+
<HistoryCleanup>
13+
<PreventCleanup>False</PreventCleanup>
14+
<KeepAllVersionsNewerThanDays></KeepAllVersionsNewerThanDays>
15+
<KeepLatestVersionPerDayForDays></KeepLatestVersionPerDayForDays>
16+
</HistoryCleanup>
17+
<Folder>Wysiwg65_Content+Elements/Block+Elements</Folder>
18+
<Compositions />
19+
<DefaultTemplate></DefaultTemplate>
20+
<AllowedTemplates />
21+
</Info>
22+
<Structure />
23+
<GenericProperties>
24+
<GenericProperty>
25+
<Key>f6afb079-3a85-4677-9375-42952bda75c3</Key>
26+
<Name>Alternative Text</Name>
27+
<Alias>alternativeText</Alias>
28+
<Type>Umbraco.TextBox</Type>
29+
<Mandatory>false</Mandatory>
30+
<Validation></Validation>
31+
<Description><![CDATA[]]></Description>
32+
<SortOrder>2</SortOrder>
33+
<Tab Alias="content">Content</Tab>
34+
<Variations>Culture</Variations>
35+
<MandatoryMessage></MandatoryMessage>
36+
<ValidationRegExpMessage></ValidationRegExpMessage>
37+
<LabelOnTop>false</LabelOnTop>
38+
</GenericProperty>
39+
<GenericProperty>
40+
<Key>25494bae-a0f6-4b2a-a47d-3d53d512e6af</Key>
41+
<Name>Caption Color</Name>
42+
<Alias>captionColor</Alias>
43+
<Type>Umbraco.ColorPicker</Type>
44+
<Mandatory>false</Mandatory>
45+
<Validation></Validation>
46+
<Description><![CDATA[]]></Description>
47+
<SortOrder>5</SortOrder>
48+
<Tab Alias="content">Content</Tab>
49+
<Variations>Nothing</Variations>
50+
<MandatoryMessage></MandatoryMessage>
51+
<ValidationRegExpMessage></ValidationRegExpMessage>
52+
<LabelOnTop>false</LabelOnTop>
53+
</GenericProperty>
54+
<GenericProperty>
55+
<Key>58837009-331e-4e4d-b430-223d50cb2d3b</Key>
56+
<Name>Fig Caption</Name>
57+
<Alias>figCaption</Alias>
58+
<Type>Umbraco.TextBox</Type>
59+
<Mandatory>false</Mandatory>
60+
<Validation></Validation>
61+
<Description><![CDATA[]]></Description>
62+
<SortOrder>3</SortOrder>
63+
<Tab Alias="content">Content</Tab>
64+
<Variations>Culture</Variations>
65+
<MandatoryMessage></MandatoryMessage>
66+
<ValidationRegExpMessage></ValidationRegExpMessage>
67+
<LabelOnTop>false</LabelOnTop>
68+
</GenericProperty>
69+
<GenericProperty>
70+
<Key>44df659c-52dc-45cf-9bbb-cd00e38a2eef</Key>
71+
<Name>Media Item</Name>
72+
<Alias>mediaItem</Alias>
73+
<Type>Wysiwg.ImageAndCropPicker</Type>
74+
<Mandatory>false</Mandatory>
75+
<Validation></Validation>
76+
<Description><![CDATA[]]></Description>
77+
<SortOrder>1</SortOrder>
78+
<Tab Alias="content">Content</Tab>
79+
<Variations>Nothing</Variations>
80+
<MandatoryMessage></MandatoryMessage>
81+
<ValidationRegExpMessage></ValidationRegExpMessage>
82+
<LabelOnTop>false</LabelOnTop>
83+
</GenericProperty>
84+
</GenericProperties>
85+
<Tabs>
86+
<Tab>
87+
<Key>e1c4566a-aeb7-4bed-810a-479775f2eb36</Key>
88+
<Caption>Content</Caption>
89+
<Alias>content</Alias>
90+
<Type>Group</Type>
91+
<SortOrder>1</SortOrder>
92+
</Tab>
93+
</Tabs>
94+
</ContentType>

0 commit comments

Comments
 (0)