diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html index 7d435adc6d..5cd04bd834 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html @@ -1,4 +1,4 @@ - +
@@ -15,4 +15,9 @@
-
\ No newline at end of file +
+ + This is not applicable for an Element type + diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html index 0d74c655d7..e890921ad4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html @@ -3,7 +3,7 @@ -
+
@@ -19,7 +19,7 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js index 849b5ccd7b..1d825fdf26 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js @@ -19,13 +19,13 @@ vm.canCreateTemplate = false; vm.updateTemplatePlaceholder = false; vm.loadingTemplates = false; + vm.isElement = $scope.model.isElement; vm.createTemplate = createTemplate; /* ---------- INIT ---------- */ function onInit() { - vm.loadingTemplates = true; entityResource.getAll("Template").then(function (templates) { @@ -86,6 +86,15 @@ vm.canCreateTemplate = existingTemplate ? false : true; } + var unbindWatcher = $scope.$watch("model.isElement", + function(newValue, oldValue) { + vm.isElement = newValue; + } + ); + $scope.$on("$destroy", function () { + unbindWatcher(); + }); + onInit(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html index 8084497441..385979a572 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html @@ -1,5 +1,5 @@
- +
@@ -9,29 +9,34 @@
- - + + - - + +
+ + This is not applicable for an Element type +
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index 0742541484..61f1c5c16d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -1223,6 +1223,9 @@ Mange hilsner fra Umbraco robotten Medlem kan redigere Vis på medlemsprofil fane har ingen sorteringsrækkefølge + Er en Element-type + En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet + Dette benyttes ikke for en Element-type Tilføj sprog diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index a057bb060f..81b02c545e 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -1516,6 +1516,7 @@ To manage your website, simply open the Umbraco back office and start adding con Allow varying by culture Is an Element type An Element type is meant to be used for instance in Nested Content, and not in the tree + This is not applicable for an Element type Building models 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 8ee200ab2a..a76372b188 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -1556,6 +1556,7 @@ To manage your website, simply open the Umbraco back office and start adding con Allow varying by culture Is an Element type An Element type is meant to be used for instance in Nested Content, and not in the tree + This is not applicable for an Element type Add language