From 6091b9649a7fe146cabac6a6cc7d4520fb18e40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 8 Sep 2020 10:39:45 +0200 Subject: [PATCH 01/19] focus first item, to remove focus from inline-create-button --- .../views/common/infiniteeditors/blockpicker/blockpicker.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html index 6dea4debb6..4b08d4e5fc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html @@ -16,7 +16,7 @@
-
+
Date: Tue, 8 Sep 2020 10:40:18 +0200 Subject: [PATCH 02/19] use icon-add instead of font plus + minor UI corrections --- .../inlineblock/inlineblock.editor.less | 2 +- .../labelblock/labelblock.editor.less | 2 +- .../umb-block-list-property-editor.html | 4 +++- .../umb-block-list-property-editor.less | 21 +++++++++++-------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less index 08306deeba..45a4c08598 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less @@ -4,7 +4,7 @@ margin-top: 4px; border: 1px solid @gray-9; border-radius: @baseBorderRadius; - transition: border-color 120ms; + transition: border-color 120ms, background-color 120ms; .umb-block-list__block:not(.--active) &:hover { border-color: @gray-8; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less index f589249f97..6611e1b209 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less @@ -14,7 +14,7 @@ padding-left: 20px; padding-bottom: 2px; user-select: none; - transition: border-color 120ms; + transition: border-color 120ms, background-color 120ms; i { font-size: 22px; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html index 4d3031602a..bc5824cf90 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html @@ -13,7 +13,9 @@ ng-click="vm.showCreateDialog($index, $event)" ng-controller="Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController as inlineCreateButtonCtrl" ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)"> -
+
+
+ +
.umb-block-list__block > .umb-blo left: 0; height: 2px; animation: umb-block-list__block--create-button_before 400ms ease-in-out alternate infinite; + transform: scaleX(.99); + transition: transform 240ms ease-out; @keyframes umb-block-list__block--create-button_before { 0% { opacity: 1; } @@ -197,39 +199,40 @@ ng-form.ng-invalid-val-server-match-settings > .umb-block-list__block > .umb-blo height: 28px; margin-left: -16px - 8px; margin-top: -16px; - padding: 0; border-radius: 3em; + font-size: 14px; border: 2px solid @blueMid; color: @blueMid; - line-height: 22px; - font-size: 20px; - font-weight: 800; background-color: rgba(255, 255, 255, .96); box-shadow: 0 0 0 2px rgba(255, 255, 255, .96); transform: scale(0); transition: transform 240ms ease-in; - animation: umb-block-list__block--create-button__plus 400ms ease-in-out infinite; + + animation: umb-block-list__block--create-button__plus 400ms ease-in-out alternate infinite; @keyframes umb-block-list__block--create-button__plus { - 0% { color: rgba(@blueMid, 0.8); } - 50% { color: rgba(@blueMid, 1); } + 0% { color: rgba(@blueMid, 1); } 100% { color: rgba(@blueMid, 0.8); } } + } &:focus { > .__plus { - border: 2px solid @ui-outline; + border-color: @ui-outline; } } &:hover, &:focus { opacity: 1; - transition-duration: 120ms; + &::before { + transform: scaleX(1); + } > .__plus { transform: scale(1); transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275); + } } } From c6dc4689b0930b8554142909248f4886ebe0656b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 11:01:22 +0200 Subject: [PATCH 03/19] Check for null as null is an object as well. --- .../src/common/services/blockeditor.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js index dfa0eae297..12e1144acc 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js @@ -51,7 +51,7 @@ } else { // lets crawl through all properties of layout to make sure get captured all `contentUdi` and `settingsUdi` properties. var propType = typeof obj[k]; - if(propType === "object" || propType === "array") { + if(propType != null && (propType === "object" || propType === "array")) { replaceUdisOfObject(obj[k], propValue) } } @@ -65,7 +65,7 @@ function replaceRawBlockListUDIsResolver(value, propClearingMethod) { - if (typeof value === "object") { + if (value != null && typeof value === "object") { // we got an object, and it has these three props then we are most likely dealing with a Block Editor. if ((value.layout !== undefined && value.contentData !== undefined && value.settingsData !== undefined)) { From 7bd2a1a8ef6e8257821790d3a563d1485070bdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 11:25:17 +0200 Subject: [PATCH 04/19] check scaffold exists --- .../common/services/blockeditormodelobject.service.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js index 868b8baba7..c640bd8b43 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js @@ -439,7 +439,14 @@ * @return {Array} array of strings representing alias. */ getAvailableAliasesForBlockContent: function () { - return this.blockConfigurations.map(blockConfiguration => this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey).contentTypeAlias); + return this.blockConfigurations.map( + (blockConfiguration) => { + var scaffold = this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey); + if (scaffold) { + return scaffold.contentTypeAlias; + } + } + ); }, /** From 7150d06fb280f8c0f851dd64f86546fe26b54a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 11:36:03 +0200 Subject: [PATCH 05/19] ensure this can be deleted from PreValue no matter the existence of the ElementType. --- .../prevalue/blocklist.blockconfiguration.controller.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js index 7c608cb3f4..3ca4203cd5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js @@ -52,6 +52,11 @@ vm.requestRemoveBlockByIndex = function (index) { localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockTypeMessage", "blockEditor_confirmDeleteBlockTypeNotice"]).then(function (data) { var contentElementType = vm.getElementTypeByKey($scope.model.value[index].contentElementTypeKey); + if(contentElementType == null) { + contentElementType = { + name: "Unavailable ElementType" + } + } overlayService.confirmDelete({ title: data[0], content: localizationService.tokenReplace(data[1], [contentElementType.name]), From 3efec3325dd9b84e526eda1a2527434554372e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 13:00:24 +0200 Subject: [PATCH 06/19] revert specific hack for NC when copying data. --- .../nestedcontent/nestedcontent.controller.js | 49 ++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js index 2d39e3a4c0..c1db03255f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js @@ -22,7 +22,9 @@ // Loop through all inner properties: for (var k in obj) { - propClearingMethod(obj[k], clipboardService.TYPES.RAW); + var innerProp = obj[k]; + + propClearingMethod(innerProp, clipboardService.TYPES.RAW); } } } @@ -441,6 +443,26 @@ function clearNodeForCopy(clonedData) { delete clonedData.key; delete clonedData.$$hashKey; + + var variant = clonedData.variants[0]; + for (var t = 0; t < variant.tabs.length; t++) { + var tab = variant.tabs[t]; + for (var p = 0; p < tab.properties.length; p++) { + var prop = tab.properties[p]; + + // If we have ncSpecific data, lets revert to standard data model. + if (prop.propertyAlias) { + prop.alias = prop.propertyAlias; + delete prop.propertyAlias; + } + + if(prop.ncMandatory !== undefined) { + prop.validation.mandatory = prop.ncMandatory; + delete prop.ncMandatory; + } + } + } + } vm.showCopy = clipboardService.isSupported(); @@ -466,6 +488,31 @@ // generate a new key. newNode.key = String.CreateGuid(); + // Ensure we have NC data in place: + var variant = newNode.variants[0]; + for (var t = 0; t < variant.tabs.length; t++) { + var tab = variant.tabs[t]; + for (var p = 0; p < tab.properties.length; p++) { + var prop = tab.properties[p]; + + if (prop.propertyAlias === undefined) { + prop.propertyAlias = prop.alias; + // NOTE: This is super ugly, the reason it is like this is because it controls the label/html id in the umb-property component at a higher level. + // not pretty :/ but we can't change this now since it would require a bunch of plumbing to be able to change the id's higher up. + prop.alias = model.alias + "___" + prop.alias; + } + + // this is hacky, but we need to make sure we have the right things for the model. + if(prop.ncMandatory === undefined) { + prop.ncMandatory = prop.validation.mandatory; + prop.validation = { + mandatory: false, + pattern: "" + }; + } + } + } + vm.nodes.push(newNode); setDirty(); //updateModel();// done by setting current node... From ab74d1c5db7993896da49ef326960b0d06929776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 13:06:38 +0200 Subject: [PATCH 07/19] bringing this back to original. --- .../propertyeditors/nestedcontent/nestedcontent.controller.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js index c1db03255f..b7e97099fb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js @@ -22,9 +22,7 @@ // Loop through all inner properties: for (var k in obj) { - var innerProp = obj[k]; - - propClearingMethod(innerProp, clipboardService.TYPES.RAW); + propClearingMethod(obj[k], clipboardService.TYPES.RAW); } } } From 3d8ab523a1d73777aa17371284cc3cd9246f9686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 13:31:26 +0200 Subject: [PATCH 08/19] break long texts in item-picker cards --- src/Umbraco.Web.UI.Client/src/less/components/card.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less index 017468fa0c..a1a4b4bc5e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/card.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less @@ -159,6 +159,7 @@ justify-content: center; flex-direction: column; background-color: transparent; + word-break: break-word; } } From a6340bb850f35e648d581f2abee5766a24f9a082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 14:24:19 +0200 Subject: [PATCH 09/19] refactor to one method --- .../nestedcontent/nestedcontent.controller.js | 59 ++++++++----------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js index b7e97099fb..55e6ba28c8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js @@ -491,23 +491,7 @@ for (var t = 0; t < variant.tabs.length; t++) { var tab = variant.tabs[t]; for (var p = 0; p < tab.properties.length; p++) { - var prop = tab.properties[p]; - - if (prop.propertyAlias === undefined) { - prop.propertyAlias = prop.alias; - // NOTE: This is super ugly, the reason it is like this is because it controls the label/html id in the umb-property component at a higher level. - // not pretty :/ but we can't change this now since it would require a bunch of plumbing to be able to change the id's higher up. - prop.alias = model.alias + "___" + prop.alias; - } - - // this is hacky, but we need to make sure we have the right things for the model. - if(prop.ncMandatory === undefined) { - prop.ncMandatory = prop.validation.mandatory; - prop.validation = { - mandatory: false, - pattern: "" - }; - } + extendPropertyWithNCData(tab.properties[p]); } } @@ -622,6 +606,30 @@ } } + function extendPropertyWithNCData(prop) { + + if (prop.propertyAlias === undefined) { + // store the original alias before we change below, see notes + prop.propertyAlias = prop.alias; + + // NOTE: This is super ugly, the reason it is like this is because it controls the label/html id in the umb-property component at a higher level. + // not pretty :/ but we can't change this now since it would require a bunch of plumbing to be able to change the id's higher up. + prop.alias = model.alias + "___" + prop.alias; + } + + // TODO: Do we need to deal with this separately? + // Force validation to occur server side as this is the + // only way we can have consistency between mandatory and + // regex validation messages. Not ideal, but it works. + if(prop.ncMandatory === undefined) { + prop.ncMandatory = prop.validation.mandatory; + prop.validation = { + mandatory: false, + pattern: "" + }; + } + } + function createNode(scaffold, fromNcEntry) { var node = Utilities.copy(scaffold); @@ -635,22 +643,7 @@ for (var p = 0; p < tab.properties.length; p++) { var prop = tab.properties[p]; - // store the original alias before we change below, see notes - prop.propertyAlias = prop.alias; - - // NOTE: This is super ugly, the reason it is like this is because it controls the label/html id in the umb-property component at a higher level. - // not pretty :/ but we can't change this now since it would require a bunch of plumbing to be able to change the id's higher up. - prop.alias = model.alias + "___" + prop.alias; - - // TODO: Do we need to deal with this separately? - // Force validation to occur server side as this is the - // only way we can have consistency between mandatory and - // regex validation messages. Not ideal, but it works. - prop.ncMandatory = prop.validation.mandatory; - prop.validation = { - mandatory: false, - pattern: "" - }; + extendPropertyWithNCData(prop); if (fromNcEntry && fromNcEntry[prop.propertyAlias]) { prop.value = fromNcEntry[prop.propertyAlias]; From 6d0dbd251acf0ab4006963e0fd950590f043ba26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 14:51:03 +0200 Subject: [PATCH 10/19] Always show validation limit message --- .../blocklist/umb-block-list-property-editor.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html index 4d3031602a..266e2942b9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html @@ -36,13 +36,13 @@ -
+
Minimum %0% entries, needs %1% more.
>
-
+
Maximum %0% entries, %1% too many.
From e1de2d06ec03ac69a2b9f05fd76d995dc7027527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 15:36:42 +0200 Subject: [PATCH 11/19] revert this one. --- .../src/less/components/umb-form-check.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less index 8a24d948ac..c0fcad6c30 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less @@ -106,7 +106,6 @@ label.umb-form-check--checkbox{ position: absolute; margin-top: 2px; top: 0; - left: -1px; } &__check { From 539c05f8ec06e153ee5d12672d8c38a4e89b11b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Sep 2020 16:01:04 +0200 Subject: [PATCH 12/19] got changes from skttl + corrections --- .../labelblock/labelblock.editor.less | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less index f589249f97..9f210fe7ab 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less @@ -1,6 +1,7 @@ .blockelement-labelblock-editor { position: relative; - display: block; + display: flex; + align-items: center; margin-bottom: 4px; margin-top: 4px; width: 100%; @@ -11,22 +12,21 @@ color: @ui-action-discreet-type; background-color: white; text-align: left; - padding-left: 20px; - padding-bottom: 2px; + padding: 0 20px; user-select: none; transition: border-color 120ms; - i { + > i { font-size: 22px; - margin-right: 5px; + margin-right: 10px; display: inline-block; - vertical-align: middle; } - span { + > span { position: relative; display: inline-block; - vertical-align: middle; + padding-top:2px; + padding-bottom:2px; } &:hover { @@ -44,7 +44,7 @@ color: @formErrorText; } ng-form.ng-invalid-val-server-match-content > .umb-block-list__block:not(.--active) > .umb-block-list__block--content > div > & { - span { + > span { &::after { content: "!"; text-align: center; @@ -62,7 +62,7 @@ line-height: 10px; background-color: @formErrorText; font-weight: 900; - + animation-duration: 1.4s; animation-iteration-count: infinite; animation-name: blockelement-inlineblock-editor--badge-bounce; From 80ab69edd7176501c9491837631678f5ab5e2e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 30 Sep 2020 14:31:15 +0200 Subject: [PATCH 13/19] Highlight blocks that are not available anymore --- .../components/blockcard/umb-block-card.html | 12 +++- .../components/blockcard/umb-block-card.less | 21 +++++- ...blocklist.blockconfiguration.controller.js | 64 ++++++++++--------- ...t.blockconfiguration.overlay.controller.js | 27 ++++---- src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 2 + src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 2 + .../Umbraco/config/lang/en_us.xml | 2 + 7 files changed, 83 insertions(+), 47 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html index c9cfcb825e..41e3d62886 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html @@ -1,11 +1,17 @@ -
- +
+
-
+
+
+
Other
+
Other
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less index 3afa32d099..f10b888ce1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less +++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less @@ -60,6 +60,14 @@ umb-block-card { background-size: cover; background-position: 50% 50%; background-repeat: no-repeat; + + &.--error { + border: 2px solid @errorBackground; + border-bottom: none; + border-top-left-radius: 6px; + border-top-right-radius: 6px; + box-sizing: border-box; + } .__icon { position: absolute; @@ -75,26 +83,35 @@ umb-block-card { .__info { width: 100%; background-color: #fff; + padding-top: 10px; padding-bottom: 11px;// 10 + 1 to compentiate for the -1 substraction in margin-bottom. + &.--error { + background-color: @errorBackground; + .__name, .__subname { + color: @errorText; + } + } + .__name { font-weight: bold; font-size: 14px; color: @ui-action-type; margin-left: 16px; - margin-top: 10px; margin-bottom: -1px; } .__subname { color: @gray-4; font-size: 12px; margin-left: 16px; + margin-top: 1px; margin-bottom: -1px; + line-height: 1.5em; } } &:hover { - .__info { + .__info:not(.--error) { .__name { color: @ui-action-type-hover; } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js index 3ca4203cd5..ebdeebc549 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js @@ -52,14 +52,9 @@ vm.requestRemoveBlockByIndex = function (index) { localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockTypeMessage", "blockEditor_confirmDeleteBlockTypeNotice"]).then(function (data) { var contentElementType = vm.getElementTypeByKey($scope.model.value[index].contentElementTypeKey); - if(contentElementType == null) { - contentElementType = { - name: "Unavailable ElementType" - } - } overlayService.confirmDelete({ title: data[0], - content: localizationService.tokenReplace(data[1], [contentElementType.name]), + content: localizationService.tokenReplace(data[1], [contentElementType ? contentElementType.name : "(Unavailable ElementType)"]), confirmMessage: data[2], close: function () { overlayService.close(); @@ -96,7 +91,7 @@ if (vm.elementTypes) { return vm.elementTypes.find(function (type) { return type.key === key; - }); + }) || null; } }; @@ -104,8 +99,11 @@ //we have to add the 'alias' property to the objects, to meet the data requirements of itempicker. var selectedItems = Utilities.copy($scope.model.value).forEach((obj) => { - obj.alias = vm.getElementTypeByKey(obj.contentElementTypeKey).alias; - return obj; + var elementType = vm.getElementTypeByKey(obj.contentElementTypeKey); + if(elementType) { + obj.alias = elementType.alias; + return obj; + } }); var availableItems = vm.getAvailableElementTypes() @@ -183,31 +181,37 @@ vm.openBlockOverlay = function (block) { - localizationService.localize("blockEditor_blockConfigurationOverlayTitle", [vm.getElementTypeByKey(block.contentElementTypeKey).name]).then(function (data) { + var elementType = vm.getElementTypeByKey(block.contentElementTypeKey); - var clonedBlockData = Utilities.copy(block); - vm.openBlock = block; + if(elementType) { + localizationService.localize("blockEditor_blockConfigurationOverlayTitle", [elementType.name]).then(function (data) { - var overlayModel = { - block: clonedBlockData, - title: data, - view: "views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html", - size: "small", - submit: function(overlayModel) { - loadElementTypes()// lets load elementType again, to ensure we are up to date. - TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.) - overlayModel.close(); - }, - close: function() { - editorService.close(); - vm.openBlock = null; - } - }; + var clonedBlockData = Utilities.copy(block); + vm.openBlock = block; - // open property settings editor - editorService.open(overlayModel); + var overlayModel = { + block: clonedBlockData, + title: data, + view: "views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html", + size: "small", + submit: function(overlayModel) { + loadElementTypes()// lets load elementType again, to ensure we are up to date. + TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.) + overlayModel.close(); + }, + close: function() { + editorService.close(); + vm.openBlock = null; + } + }; - }); + // open property settings editor + editorService.open(overlayModel); + + }); + } else { + alert("Cannot be edited cause ElementType does not exist."); + } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js index bb0fefb558..dac8f2c6ff 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js @@ -35,17 +35,20 @@ }; vm.openElementType = function(elementTypeKey) { - var elementTypeId = vm.getElementTypeByKey(elementTypeKey).id; - const editor = { - id: elementTypeId, - submit: function (model) { - editorService.close(); - }, - close: function () { - editorService.close(); - } - }; - editorService.documentTypeEditor(editor); + var elementType = vm.getElementTypeByKey(elementTypeKey); + if (elementType) { + var elementTypeId = elementType.id; + const editor = { + id: elementTypeId, + submit: function (model) { + editorService.close(); + }, + close: function () { + editorService.close(); + } + }; + editorService.documentTypeEditor(editor); + } }; vm.createElementTypeAndCallback = function(callback) { @@ -110,7 +113,7 @@ overlayService.confirmRemove({ title: data[0], - content: localizationService.tokenReplace(data[1], [settingsElementType.name]), + content: localizationService.tokenReplace(data[1], [(settingsElementType ? settingsElementType.name : "(Unavailable ElementType)")]), close: function () { overlayService.close(); }, diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index 10070e8c6b..7c1c815ae6 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -1856,6 +1856,8 @@ Mange hilsner fra Umbraco robotten Du har lavet ændringer til dette indhold. Er du sikker på at du vil kassere dem? Annuller oprettelse? + Error! + The ElementType of this block does not exist anymore diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index a920e86775..bd8b2c48a0 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -2472,6 +2472,8 @@ To manage your website, simply open the Umbraco back office and start adding con You have made changes to this content. Are you sure you want to discard them? Discard creation? + Error! + The ElementType of this block does not exist anymore What are Content Templates? diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index edf644b760..70a1cce79b 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -2492,6 +2492,8 @@ To manage your website, simply open the Umbraco back office and start adding con You have made changes to this content. Are you sure you want to discard them? Discard creation? + Error! + The ElementType of this block does not exist anymore What are Content Templates? From 5c47edbcdfaef49528e851ccab1d4f9e3b11b4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 30 Sep 2020 15:02:15 +0200 Subject: [PATCH 14/19] lets clear both without description needed. + word-wrap for long words. --- src/Umbraco.Web.UI.Client/src/less/main.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less index 2354e96d38..20d1c52de0 100644 --- a/src/Umbraco.Web.UI.Client/src/less/main.less +++ b/src/Umbraco.Web.UI.Client/src/less/main.less @@ -208,6 +208,13 @@ umb-property:last-of-type .umb-control-group { .control-description { display: block; clear: both; + overflow-wrap: break-word; + } + + &::after { + content: ''; + display: block; + clear: both; } } From 20a5d1028b3c4fccffb9e10d28c718020b9b8ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 30 Sep 2020 15:43:12 +0200 Subject: [PATCH 15/19] we should continue no matter if the ElementType cant be found, this will result in the entry appearing as unsupported if it has data, but data properly has been removed already and therefor we will not see the entry at all. --- .../common/services/blockeditormodelobject.service.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js index c640bd8b43..77ed357c35 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js @@ -425,7 +425,11 @@ if (self.scaffolds) { self.scaffolds.push(formatScaffoldData(scaffold)); } - })); + }).catch( + () => { + // Do nothing if we get an error. + } + )); }); return $q.all(tasks); @@ -526,7 +530,7 @@ var dataModel = getDataByUdi(contentUdi, this.value.contentData); if (dataModel === null) { - console.error("Couldn't find content model of " + contentUdi) + console.error("Couldn't find content data of " + contentUdi) return null; } @@ -598,7 +602,7 @@ var settingsData = getDataByUdi(settingsUdi, this.value.settingsData); if (settingsData === null) { - console.error("Couldnt find content settings data of " + settingsUdi) + console.error("Couldnt find settings data of " + settingsUdi) return null; } From 365d3287f101600059b6011eeaba324d6915c05b Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Fri, 4 Sep 2020 10:07:28 +0200 Subject: [PATCH 16/19] Fix JS error preventing newly created dictionary items from opening automatically (cherry picked from commit 59f90bd08be677817133584fc877f4a53a349359) --- .../src/views/dictionary/dictionary.create.controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js index 2be4e522c3..66baab97d7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js @@ -16,7 +16,7 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig function createItem() { - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createDictionaryForm })) { + if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createDictionaryForm })) { var node = $scope.currentNode; @@ -28,14 +28,14 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig navigationService.syncTree({ tree: "dictionary", path: currPath + "," + data, forceReload: true, activate: true }); // reset form state - formHelper.resetForm({ scope: $scope, formCtrl: this.createDictionaryForm }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createDictionaryForm }); // navigate to edit view var currentSection = appState.getSectionState("currentSection"); $location.path("/" + currentSection + "/dictionary/edit/" + data); }, function (err) { - formHelper.resetForm({ scope: $scope, formCtrl: this.createDictionaryForm, hasErrors: true }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createDictionaryForm, hasErrors: true }); if (err.data && err.data.message) { notificationsService.error(err.data.message); navigationService.hideMenu(); From 0e11449fded60472af5444ddcd1f6a15c70c1c51 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Fri, 4 Sep 2020 10:46:56 +0200 Subject: [PATCH 17/19] Fix JS errors when creating folders in the settings section (cherry picked from commit 4ecbb7abe66b81e6f74a0c430caed45c3427deb0) --- .../src/views/datatypes/create.controller.js | 6 +++--- src/Umbraco.Web.UI.Client/src/views/datatypes/create.html | 4 ++-- .../src/views/documenttypes/create.controller.js | 6 +++--- .../src/views/documenttypes/create.html | 4 ++-- .../src/views/mediatypes/create.controller.js | 6 +++--- src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js index 9bc602678e..11c12392f6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js @@ -21,18 +21,18 @@ function DataTypeCreateController($scope, $location, navigationService, dataType } $scope.createContainer = function () { - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm })) { + if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createFolderForm })) { dataTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { navigationService.hideMenu(); var currPath = node.path ? node.path : "-1"; navigationService.syncTree({ tree: "datatypes", path: currPath + "," + folderId, forceReload: true, activate: true }); - formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderFor }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm }); }, function(err) { - formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderFor, hasErrors: true }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true }); // TODO: Handle errors }); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html index 55039831ac..81b70f49b9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html @@ -1,7 +1,7 @@
-
+
Create an item under {{currentNode.name}}
    @@ -24,7 +24,7 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js index 2348b43852..71eee085ee 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js @@ -32,7 +32,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con $scope.createContainer = function () { - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm })) { + if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createFolderForm })) { contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { @@ -47,13 +47,13 @@ function DocumentTypesCreateController($scope, $location, navigationService, con activate: true }); - formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm }); var section = appState.getSectionState("currentSection"); }, function (err) { - formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm, hasErrors: true }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true }); $scope.error = err; }); diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html index 1357965197..aa45e91118 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html @@ -2,7 +2,7 @@
-
+
Create an item under {{currentNode.name}}
    @@ -41,7 +41,7 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js index 3b7e163840..90b597b3c6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js @@ -22,7 +22,7 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT $scope.createContainer = function () { if (formHelper.submitForm({ scope: $scope, - formCtrl: this.createFolderForm + formCtrl: $scope.createFolderForm })) { mediaTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { @@ -30,12 +30,12 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT var currPath = node.path ? node.path : "-1"; navigationService.syncTree({ tree: "mediatypes", path: currPath + "," + folderId, forceReload: true, activate: true }); - formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm }); var section = appState.getSectionState("currentSection"); }, function (err) { - formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm, hasErrors: true }); + formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true }); $scope.error = err; }); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html index 4c0b8bb6ae..3a1a785dc1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html @@ -2,7 +2,7 @@
-
+
Create an item under {{currentNode.name}}
    @@ -24,7 +24,7 @@
-
+
From d55916e1b8538dca0adbff81bc6b9615793a3d30 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Fri, 4 Sep 2020 15:11:22 +0200 Subject: [PATCH 18/19] Use umb-code-snippet in unsupported block (cherry picked from commit dcc1fed75c157bf250554d0b3b12ea730b1d921e) --- .../unsupportedblock.editor.html | 2 +- .../unsupportedblock.editor.less | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html index 0317105a66..d5b0ddfd04 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html @@ -10,6 +10,6 @@ Learn more about this warning -->
Block data:
- 

+        {{block.data | json : 4 }}
     

 

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less
index aff741e278..d3eddd0815 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less
@@ -1,5 +1,4 @@
 .blockelement-unsupportedblock-editor {
-
     position: relative;
     display: block;
     box-sizing: border-box;
@@ -10,15 +9,12 @@
     border-radius: @baseBorderRadius;
 
     > .__header {
-
         display: flex;
         align-items: center;
-        
         padding-left: 20px;
         padding-bottom: 2px;
         min-height: 48px;
-        border-bottom: 1px solid @gray-9;
-        
+        border-bottom: 1px solid @gray-9;    
         background-color: @gray-11;
         color: @gray-6;
         
@@ -35,24 +31,16 @@
     }
 
     > .__body {
-
         padding: 20px;
-
         background-color: @gray-11;
 
         a {
             text-decoration: underline;
             color: @ui-action-type;
+
             &:hover {
-                color:@ui-action-type-hover;
+                color: @ui-action-type-hover;
             }
         }
-
-        pre {
-            border: none;
-            padding: 0;
-            background-color: transparent;
-        }
-
     }
 }

From f2ce837ca2f6287c20fa9d55c542a99fa0ddd339 Mon Sep 17 00:00:00 2001
From: BatJan <1932158+BatJan@users.noreply.github.com>
Date: Fri, 11 Sep 2020 22:39:04 +0200
Subject: [PATCH 19/19] Convert a to button and fix other oddities as well

(cherry picked from commit d323c7927a4d252f9042edc2c3a567d4575b8326)
---
 .../src/less/components/tree/umb-tree.less             |  4 +++-
 .../infiniteeditors/sectionpicker/sectionpicker.html   | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 839e61c5f9..49cba439bd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -156,7 +156,9 @@ body.touch .umb-tree {
 .umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class^="icon-"],
 .umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class*=" icon-"],
 .umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class^="icon-"],
-.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"] {
+.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"], 
+.umb-tree .umb-tree-node-checked > i[class^="icon-"],
+.umb-tree .umb-tree-node-checked > i[class*="icon-"] {
     font-family: 'icomoon' !important;
     color: @green !important;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
index 33906dcd75..feb3b9ab53 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
@@ -19,12 +19,12 @@