diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js index 7ade362473..bb45968d5b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js @@ -14,7 +14,10 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic //setup scope vars vm.page = {}; vm.page.loading = false; - + vm.page.menu = {}; + vm.page.menu.currentSection = appState.getSectionState("currentSection"); + vm.page.menu.currentNode = null; + //set up the standard data type props vm.properties = { selectedEditor: { @@ -51,7 +54,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic function setHeaderNameState(content) { if(content.isSystem == 1) { - $scope.page.nameLocked = true; + vm.page.nameLocked = true; } } @@ -88,6 +91,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic vm.page.loading = false; }); + } function saveDataType() { @@ -208,7 +212,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic var labelKeys = [ "general_settings", - "macro_parameters" + "editdatatype_relations" ]; localizationService.localizeMany(labelKeys).then(function (values) { @@ -224,7 +228,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic { "name": values[1], "alias": "parameters", - "icon": "icon-list", + "icon": "icon-molecular-network", "view": "views/datatypes/views/datatype.relations.html" } ]; diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.controller.js new file mode 100644 index 0000000000..6fdcaf9650 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.controller.js @@ -0,0 +1,39 @@ +/** + * @ngdoc controller + * @name Umbraco.Editors.DataType.RelationsController + * @function + * + * @description + * The controller for the relations view of the datatype editor + */ +function DataTypeRelationsController($scope, $routeParams, dataTypeResource) { + + var vm = this; + + vm.relations = {}; + vm.hasRelations = false; + + vm.view = {}; + vm.view.loading = true; + + //we are editing so get the content item from the server + dataTypeResource.getRelations($routeParams.id) + .then(function(data) { + + console.log("got: ", data); + + vm.view.loading = false; + vm.relations = data; + + vm.hasRelations = vm.relations.documentTypes.length > 0 || vm.relations.mediaTypes.length > 0 || vm.relations.memberTypes.length > 0; + + + console.log("vm: ", vm); + + }); + + + +} + +angular.module("umbraco").controller("Umbraco.Editors.DataType.RelationsController", DataTypeRelationsController); diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html index 43266ddafc..c2b8a305ff 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html @@ -1,34 +1,87 @@ - +
+ - + - -
{{vm.content.id}}
- {{vm.content.key}} -
+ - -
- - - Required - -
+ + This Data Type has no relations. + -
+ + - -
{{vm.content.selectedEditor}}
-
+
+ No relations for Document Types. +
+
+ + + + + + + + + + + + +
NameAlias
{{relation.name}}{{relation.alias}}Open
+
+ +
- - - + + -
+
+ No relations for Media Types. +
+
+ + + + + + + + + + + + +
NameAlias
{{relation.name}}{{relation.alias}}Open
+
+ + -
+ + + +
+ No relations for Member Types. +
+
+ + + + + + + + + + + + +
NameAlias
{{relation.name}}{{relation.alias}}Open
+
+ +
+ + + + +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.settings.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.settings.html index d5d49ca8fb..d37aa2fcd0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.settings.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.settings.html @@ -2,17 +2,17 @@ - -
{{content.id}}
- {{content.key}} + +
{{model.content.id}}
+ {{model.content.key}}
- +
+ ng-options="e.alias as e.name for e in model.content.availableEditors"> Required @@ -20,15 +20,15 @@ - -
{{content.selectedEditor}}
+ +
{{model.content.selectedEditor}}
+ ng-repeat="preValue in model.preValues"> - + \ No newline at end of file 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 96387b7d26..9d6f40ee4f 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -2165,4 +2165,14 @@ To manage your website, simply open the Umbraco back office and start adding con Open/Close backoffice help Open/Close your profile options + + Relations + This Data Type has no relations. + Relations to Document Types + No relations to Document Types. + Relations to Media Types + No relations to Media Types. + Relations to Member Types + No relations to Member Types. +