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)) { 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..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); @@ -439,7 +443,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; + } + } + ); }, /** @@ -519,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; } @@ -591,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; } 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; } } 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 bf8e7fdb70..f967994c0f 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 @@ -168,7 +168,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/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less index cff9980483..9567840049 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 @@ -97,7 +97,8 @@ height: 20px; width: 20px; position: absolute; - top: -1px; + top: 0; + } &__check { diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less index 3bf00fb25c..e1e368f2e2 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; } } 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 @@
-
+
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/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 00a2bab648..9440d896a5 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/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js index 716d994809..03ffcfd09d 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 @@ -15,7 +15,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; @@ -27,14 +27,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(); 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 928431f7bd..4ebb96c09b 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 8e11762b9a..0fa5aa61c8 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 @@
-
+
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..613a47b926 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; + transition: border-color 120ms, background-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; 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;
-        }
-
     }
 }
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..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
@@ -54,7 +54,7 @@
                 var contentElementType = vm.getElementTypeByKey($scope.model.value[index].contentElementTypeKey);
                 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();
@@ -91,7 +91,7 @@
             if (vm.elementTypes) {
                 return vm.elementTypes.find(function (type) {
                     return type.key === key;
-                });
+                }) || null;
             }
         };
 
@@ -99,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()
@@ -178,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.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..9726daf5e6 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)">
-                    
+

+                    

+                        
+                    

                 
 
                 
         
 
-        

+        

             

                 Minimum %0% entries, needs %1% more.
             

             >
         

-        

+        

             

                 Maximum %0% entries, %1% too many.
             

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
index 5a8c21250b..e290c6e856 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
@@ -179,6 +179,8 @@ ng-form.ng-invalid-val-server-match-settings > .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);
+            
         }
     }
 }
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 0f4dcc180e..d04c5f722b 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
@@ -442,6 +442,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();
@@ -467,6 +487,15 @@
             // 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++) {
+                    extendPropertyWithNCData(tab.properties[p]);
+                }
+            }
+
             vm.nodes.push(newNode);
             setDirty();
             //updateModel();// done by setting current node...
@@ -577,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);
 
@@ -590,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];
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 52f4dc1392..597afadac4 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1861,6 +1861,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 07cec3dff7..87fd4f9b38 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2491,6 +2491,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 cdb2137e7b..43a359d857 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2513,6 +2513,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?