get the create date from the variant

# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/config/canvasdesigner.config.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/lib/spectrum.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js

src/Umbraco.Web.UI.Client/.eslintrc

@@ -3,37 +3,8 @@
         "browser": true
     },
 
-    "plugins": [
-        "angular"
-    ],
-
     "rules": {
-    	"eqeqeq": 2,
-        "curly": 2,
-
-        "no-unused-vars": 1,
-        "no-eval": 1,
-        "no-delete-var": 1,
-        "quotes": 1,
-        "dot-notation": 1,
-
-        "no-use-before-define": 0,
-        "angular/ng_controller_as": 1,    
-        "angular/ng_controller_as_vm": 1,   
-
-
-        "strict": 0,
-        "no-irregular-whitespace": 0,
-        "no-mixed-spaces-and-tabs": 0,
-        "no-multi-spaces": 0,
-        "key-spacing": 0,
-        "semi-spacing": 0,
-        "space-infix-ops": 0,
-        "comma-spacing": 0,
-        "no-trailing-spaces": 0,
-        "eol-last": 0,
-		"no-underscore-dangle": 0,
-		"camelcase": 0
+        "comma-dangle": ["error", "never"]
     },
 
     "globals": {

src/Umbraco.Web.UI.Client/gulpfile.js

@@ -12,6 +12,9 @@ const imagemin = require('gulp-imagemin');
 var _ = require('lodash');
 var MergeStream = require('merge-stream');
 
+// js
+const eslint = require('gulp-eslint');
+
 //Less + css
 var postcss = require('gulp-postcss');
 var less = require('gulp-less');
@@ -30,6 +33,11 @@ Helper functions
 function processJs(files, out) {
     
     return gulp.src(files)
+     // check for js errors
+     .pipe(eslint())
+     // outputs the lint results to the console
+     .pipe(eslint.format())
+     // sort files in stream by path or any custom sort comparator
      .pipe(sort())
      .pipe(concat(out))
      .pipe(wrap('(function(){\n%= body %\n})();'))

src/Umbraco.Web.UI.Client/package.json

@@ -27,6 +27,7 @@
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "5.0.0",
+    "gulp-eslint": "^5.0.0",
     "gulp-imagemin": "^4.1.0",
     "gulp-less": "^3.5.0",
     "gulp-ngdocs": "^0.3.0",

src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbbackdrop.directive.js

@@ -103,7 +103,7 @@
                 backdropOpacity: "=?",
                 highlightElement: "=?",
                 highlightPreventClick: "=?",
-                disableEventsOnClick: "=?",
+                disableEventsOnClick: "=?"
             }
         };
 

src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js

@@ -158,6 +158,10 @@
             });
             contentApp.viewModel = variant;
 
+            // emit variant change event so content apps can update content
+            var args = { "node": $scope.content, "variant": variant };
+            eventsService.emit("editors.content.changeVariant", args);
+
             return variant;
         }
 

src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js

@@ -6,7 +6,7 @@
         function link(scope, element, attrs, ctrl) {
 
             var evts = [];
-            var isInfoTab = false;
+            var isInfoApp = false;
             var labels = {};
             scope.publishStatus = [];
 
@@ -16,6 +16,11 @@
             
             function onInit() {
 
+                //get the current variant
+                scope.activeVariant = _.find(scope.node.variants, function (variant) {
+                    return variant.active;
+                });
+
                 userService.getCurrentUser().then(function(user){
                         // only allow change of media type if user has access to the settings sections
                         angular.forEach(user.sections, function(section){
@@ -42,7 +47,7 @@
                         labels.publishedPendingChanges = data[3];
                         labels.notCreated = data[4];
 
-                        setNodePublishStatus(scope.node);
+                        setPublishState(scope.node, scope.activeVariant);
 
                     });
 
@@ -172,49 +177,40 @@
                 });
             }
 
-            function setNodePublishStatus(node) {
+            function setPublishState(node, variant) {
 
-                // deleted node
-                if (node.trashed === true) {
-                    scope.publishStatus.push({
-                        label: labels.deleted,
-                        color: "danger"
-                    });
+                var state = {};
+
+                if (node.trashed) {
+                    // deleted node
+                    state.label = labels.deleted;
+                    state.color = "danger";
                     return;
                 }
 
-                if (node.variants) {
-                    for (var i = 0; i < node.variants.length; i++) {
-
-                        var variant = node.variants[i];
-
-                        var status = {
-                            culture: variant.language ? variant.language.culture : null
-                        };
-
-                        if (variant.state === "NotCreated") {
-                            status.label = labels.notCreated;
-                            status.color = "gray";
-                        }
-                        else if (variant.state === "Draft") {
-                            // draft node
-                            status.label = labels.unpublished;
-                            status.color = "gray";
-                        }
-                        else if (variant.state === "Published") {
-                            // published node
-                            status.label = labels.published;
-                            status.color = "success";
-                        }
-                        else if (variant.state === "PublishedPendingChanges") {
-                            // published node with pending changes
-                            status.label = labels.publishedPendingChanges;
-                            status.color = "success";
-                        }
-                        
-                        scope.publishStatus.push(status);
-                    }
+                if (variant.state === "NotCreated") {
+                    // not created variant
+                    state.label = labels.notCreated;
+                    state.color = "gray";
                 }
+                else if (variant.state === "Draft") {
+                    // draft variant
+                    state.label = labels.unpublished;
+                    state.color = "gray";
+                }
+                else if (variant.state === "Published") {
+                    // published variant
+                    state.label = labels.published;
+                    state.color = "success";
+                }
+                else if (variant.state === "PublishedPendingChanges") {
+                    // published variant with pending changes
+                    state.label = labels.publishedPendingChanges;
+                    state.color = "success";
+                }
+
+                scope.variantState = state;
+
             }
 
             function setPublishDate(date) {
@@ -292,7 +288,7 @@
             function formatDatesToLocal() {
                 // get current backoffice user and format dates
                 userService.getCurrentUser().then(function (currentUser) {
-                    scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
+                    scope.activeVariant.createDateFormatted = dateHelper.getLocalDate(scope.activeVariant.createDate, currentUser.locale, 'LLL');
                     
                     scope.node.releaseDateYear = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'YYYY')) : null;
                     scope.node.releaseDateMonth = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'MMMM')) : null;
@@ -312,24 +308,30 @@
             evts.push(eventsService.on("app.tabChange", function (event, args) {
                 $timeout(function(){
                     if (args.alias === "info") {
-                        isInfoTab = true;
+                        isInfoApp = true;
                         loadAuditTrail();
                     } else {
-                        isInfoTab = false;
+                        isInfoApp = false;
                     }
                 });
             }));
 
+            // listen for variant change so we can update the content
+            evts.push(eventsService.on("editors.content.changeVariant", function (event, args) {
+                setPublishState(args.node, args.variant);
+                formatDatesToLocal();
+            }));
+
             // watch for content updates - reload content when node is saved, published etc.
             scope.$watch('node.updateDate', function(newValue, oldValue){
 
                 if(!newValue) { return; }
-                if(newValue === oldValue) { return; }             
+                if(newValue === oldValue) { return; }
                 
                 if(isInfoTab) {
                     loadAuditTrail();
                     formatDatesToLocal();
-                    setNodePublishStatus(scope.node);
+                    setPublishState(scope.node);
                 }
             });
 

src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js

@@ -53,7 +53,7 @@ angular.module("umbraco.directives")
 					var $container = element.find(".crop-container");
 
 					//default constraints for drag n drop
-					var constraints = {left: {max: scope.dimensions.margin, min: scope.dimensions.margin}, top: {max: scope.dimensions.margin, min: scope.dimensions.margin}, };
+					var constraints = {left: {max: scope.dimensions.margin, min: scope.dimensions.margin}, top: {max: scope.dimensions.margin, min: scope.dimensions.margin} };
 					scope.constraints = constraints;
 
 

src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js

@@ -17,7 +17,7 @@
             restrict: 'E',
             replace: true,
             transclude: true,
-            templateUrl: 'views/components/umb-dropdown-item.html',
+            templateUrl: 'views/components/umb-dropdown-item.html'
         };
 
         return directive;

src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js

@@ -57,7 +57,7 @@
           },
           stop: function(e, ui) {
             updateTabsSortOrder();
-          },
+          }
         };
 
         scope.sortableOptionsProperty = {

src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js

@@ -333,6 +333,17 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                     notificationsService.error(value);
                 });
             });
+        },
+
+        import: function (file) {
+            if (!file) {
+                throw "file cannot be null";
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "Import", { file: file })),
+                "Failed to import document type " + file
+            );
         }
     };
 }

src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js

@@ -7,6 +7,6 @@
                     $http.get(url),
                     'Failed to retrieve content types'
                 );
-            },
+            }
         };
     });

src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js

@@ -329,7 +329,7 @@ angular.module('umbraco.services').factory("editorState", function() {
         },
         set: function (value) {
             throw "Use editorState.set to set the value of the current entity";
-        },
+        }
     });
 
     return state;

src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js

@@ -443,7 +443,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
                     "removeDateMonth",
                     "removeDateDayNumber",
                     "removeDateDay",
-                    "removeDateTime",
+                    "removeDateTime"
                 ], function (i) {
                     return i === propName;
                 });
@@ -519,25 +519,32 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
                 var allNewProps = this.getAllProps(savedVariant);
 
                 //check for changed properties of the content
-                for (var p in allOrigProps) {
-                    var alias = allOrigProps[p].alias;
+                for (var k = 0; k < allOrigProps.length; k++) {
+
+                    var origProp = allOrigProps[k];
+                    var alias = origProp.alias;
                     var newProp = getNewProp(alias, allNewProps);
-                    if (newProp && !_.isEqual(alias, newProp.value)) {
+                    if (newProp && !_.isEqual(origProp.value, newProp.value)) {
 
                         //they have changed so set the origContent prop to the new one
-                        var origVal = allOrigProps[p].value;
-                        allOrigProps[p].value = newProp.value;
+                        var origVal = origProp.value;
+                        
+                        origProp.value = newProp.value;
 
                         //instead of having a property editor $watch their expression to check if it has
                         // been updated, instead we'll check for the existence of a special method on their model
                         // and just call it.
-                        if (angular.isFunction(allOrigProps[p].onValueChanged)) {
+                        if (angular.isFunction(origProp.onValueChanged)) {
                             //send the newVal + oldVal
-                            allOrigProps[p].onValueChanged(allOrigProps[p].value, origVal);
+                            origProp.onValueChanged(origProp.value, origVal);
                         }
 
-                        changed.push(allOrigProps[p]);
+                        changed.push(origProp);                        
                     }
+
+                }
+                for (var p in allOrigProps) {
+                    
                 }
             }
 

src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js

@@ -159,10 +159,18 @@ function formHelper(angularHelper, serverValidationManager, $timeout, notificati
 
                 //Check if this is for content properties - specific to content/media/member editors because those are special 
                 // user defined properties with custom controls.
-                if (parts.length > 2 && parts[0] === "_Properties") {
+                if (parts.length > 1 && parts[0] === "_Properties") {
 
                     var propertyAlias = parts[1];
-                    var culture = parts[2];
+
+                    var culture = null;
+                    if (parts.length > 2) {
+                        culture = parts[2];
+                        //special check in case the string is formatted this way
+                        if (culture === "null") {
+                            culture = null;
+                        }
+                    }
 
                     //if it contains 3 '.' then we will wire it up to a property's html field
                     if (parts.length > 3) {

src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js

@@ -506,7 +506,7 @@
                 canDelete: _.contains(intersectPermissions, 'D'), //Magic Char = D
                 canMove: _.contains(intersectPermissions, 'M'), //Magic Char = M
                 canPublish: _.contains(intersectPermissions, 'U'), //Magic Char = U
-                canUnpublish: _.contains(intersectPermissions, 'U'), //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
+                canUnpublish: _.contains(intersectPermissions, 'U') //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
             };
         }
 

src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js

@@ -602,7 +602,7 @@ function navigationService($rootScope, $route, $routeParams, $log, $location, $q
 
                     //These will show up on the dialog controller's $scope under dialogOptions
                     currentNode: args.node,
-                    currentAction: args.action,
+                    currentAction: args.action
                 });
 
             //save the currently assigned dialog so it can be removed before a new one is created
@@ -623,7 +623,7 @@ function navigationService($rootScope, $route, $routeParams, $log, $location, $q
             setMode("default");
 
             if(showMenu){
-                this.showMenu(undefined, { skipDefault: true, node: appState.getMenuState("currentNode") });
+                this.showMenu({ skipDefault: true, node: appState.getMenuState("currentNode") });
             }
         },
         /**

src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js

@@ -140,8 +140,9 @@ function serverValidationManager($timeout) {
                 }
             }
             else if (propertyAlias !== undefined) {
+                //normalize culture to null
                 if (!culture) {
-                    culture = null; // if empty or null, always make null
+                    culture = null;
                 }
                 //don't add it if it already exists
                 var exists2 = _.find(callbacks, function (item) {
@@ -165,8 +166,9 @@ function serverValidationManager($timeout) {
             }
             else if (propertyAlias !== undefined) {
 
+                //normalize culture to null
                 if (!culture) {
-                    culture = null; // if empty or null, always make null
+                    culture = null;
                 }
 
                 //remove all callbacks for the content property
@@ -192,8 +194,9 @@ function serverValidationManager($timeout) {
          */
         getPropertyCallbacks: function (propertyAlias, culture, fieldName) {
 
+            //normalize culture to null
             if (!culture) {
-                culture = null; // if empty or null, always make null
+                culture = null;
             }
 
             var found = _.filter(callbacks, function (item) {
@@ -268,8 +271,9 @@ function serverValidationManager($timeout) {
                 return;
             }
 
+            //normalize culture to null
             if (!culture) {
-                culture = null; // if empty or null, always make null
+                culture = null;
             }
 
             //only add the item if it doesn't exist                
@@ -306,6 +310,12 @@ function serverValidationManager($timeout) {
             if (!propertyAlias) {
                 return;
             }
+
+            //normalize culture to null
+            if (!culture) {
+                culture = null;
+            }
+
             //remove the item
             this.items = _.reject(this.items, function (item) {
                 return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
@@ -354,6 +364,12 @@ function serverValidationManager($timeout) {
          * Gets the error message for the content property
          */
         getPropertyError: function (propertyAlias, culture, fieldName) {
+
+            //normalize culture to null
+            if (!culture) {
+                culture = null;
+            }
+
             var err = _.find(this.items, function (item) {
                 //return true if the property alias matches and if an empty field name is specified or the field name matches
                 return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
@@ -388,6 +404,12 @@ function serverValidationManager($timeout) {
          * Checks if the content property + culture + field name combo has an error
          */
         hasPropertyError: function (propertyAlias, culture, fieldName) {
+
+            //normalize culture to null
+            if (!culture) {
+                culture = null;
+            }
+
             var err = _.find(this.items, function (item) {
                 //return true if the property alias matches and if an empty field name is specified or the field name matches
                 return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));

src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js

@@ -181,7 +181,7 @@
                     modalClass: "login-overlay",
                     animation: "slide",
                     show: true,
-                    callback: callback,
+                    callback: callback
 
                 });
             }

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js

@@ -50,7 +50,7 @@ angular.module("umbraco")
                 pageSize: 100,
                 totalItems: 0,
                 totalPages: 0,
-                filter: '',
+                filter: ''
             };
 
             //preload selected item
@@ -435,4 +435,4 @@ angular.module("umbraco")
 
             onInit();
 
-        });
+        });

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.controller.js

@@ -58,7 +58,7 @@
                 sort: {
                     property: {
                         alias: "",
-                        name: "",
+                        name: ""
                     },
                     direction: "ascending", //This is the value for sorting sent to server
                     translation: {

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js

@@ -49,7 +49,7 @@ angular.module("umbraco")
                 pageSize: 100,
                 totalItems: 0,
                 totalPages: 0,
-                filter: '',
+                filter: ''
             };
 
             //preload selected item

src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html

@@ -169,16 +169,11 @@
             <umb-box-content class="block-form">
 
                 <umb-control-group data-element="node-info-status" label="@general_status">
-                    <div ng-repeat="status in publishStatus" style="margin-bottom: 5px;">
-                        <span ng-if="status.culture"><em>{{status.culture}}: </em></span>
-                        <umb-badge size="xs" color="{{status.color}}">
-                            {{status.label}}
-                        </umb-badge>
-                    </div>
+                    <umb-badge size="xs" color="{{variantState.color}}">{{variantState.label}}</umb-badge>
                 </umb-control-group>
 
                 <umb-control-group data-element="node-info-create-date" label="@template_createdDate">
-                    {{node.createDateFormatted}} <localize key="general_by">by</localize> {{ node.owner.name }}
+                    {{activeVariant.createDateFormatted}} <localize key="general_by">by</localize> {{ node.owner.name }}
                 </umb-control-group>
 
                 <umb-control-group data-element="node-info-document-type" label="@content_documentType">

src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js

@@ -28,7 +28,7 @@ function DataTypeEditController($scope, $routeParams, $location, appState, navig
                 label: preVals[i].label,
                 view: preVals[i].view,
                 value: preVals[i].value,
-                config: preVals[i].config,
+                config: preVals[i].config
             });
         }
     }

src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js

@@ -0,0 +1,71 @@
+angular.module("umbraco")
+    .controller("Umbraco.Editors.DocumentTypes.ImportController",
+    function ($scope, contentTypeResource, navigationService, Upload, umbRequestHelper) {
+            var vm = this;
+            vm.serverErrorMessage = "";
+            vm.state = "upload";
+            vm.model = {};
+            vm.uploadStatus = "";
+
+            $scope.handleFiles = function (files, event) {
+                if (files && files.length > 0) {
+                    $scope.upload(files[0]);
+                }
+            };
+
+            $scope.upload = function (file) {
+                Upload.upload({
+                    url: umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "Upload"),
+                    fields: {},
+                    file: file
+                }).success(function (data, status, headers, config) {
+                    if (data.notifications && data.notifications.length > 0) {
+
+                        // set error status on file
+                        vm.uploadStatus = "error";
+
+                        // Throw message back to user with the cause of the error
+                        vm.serverErrorMessage = data.notifications[0].message;
+                    } else {
+
+                        // set done status on file
+                        vm.uploadStatus = "done";
+                        vm.model = data;
+                        vm.state = "confirm";
+                    }
+                }).error(function (evt, status, headers, config) {
+
+                    // set status done
+                    $scope.uploadStatus = "error";
+
+                    // If file not found, server will return a 404 and display this message
+                    if (status === 404) {
+                        $scope.serverErrorMessage = "File not found";
+                    }
+                    else if (status == 400) {
+                        //it's a validation error
+                        $scope.serverErrorMessage = evt.message;
+                    }
+                    else {
+                        //it's an unhandled error
+                        //if the service returns a detailed error
+                        if (evt.InnerException) {
+                            $scope.serverErrorMessage = evt.InnerException.ExceptionMessage;
+
+                            //Check if its the common "too large file" exception
+                            if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
+                                $scope.serverErrorMessage = "File too large to upload";
+                            }
+
+                        } else if (evt.Message) {
+                            $scope.serverErrorMessage = evt.Message;
+                        }
+                    }
+                });
+            };
+
+            $scope.import = function () {
+                contentTypeResource.import(vm.model.tempFileName);
+                vm.state = "done";
+            }
+        });

src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html

@@ -0,0 +1,53 @@
+<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.ImportController as vm">
+    <div ng-if="vm.state === 'upload'">
+        <p>
+            <localize key="settings_importDocumentTypeHelp">
+                To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen)
+            </localize>
+        </p>
+
+        <form name="importDoctype">
+
+            <!-- Select files -->
+            <button class="btn"
+                name="file"
+                ngf-select
+                ng-model="filesHolder"
+                ngf-change="handleFiles($files, $event)"
+                ngf-multiple="true"
+                ngf-pattern="*.udt">
+                <localize key="general_import">Import</localize>
+            </button>
+
+            <localize key="general_or">or</localize>
+
+            <a class="btn-link" ng-click="nav.hideDialog()">
+                <localize key="cancel">Cancel</localize>
+            </a>
+        </form>        
+
+        <div ng-if="importDoctype.file.$error.pattern">Please choose a .udt file to import</div>
+        
+
+        
+    </div>
+    <div ng-if="vm.state === 'confirm'">
+        <strong>
+            <localize key="name">Name</localize>:
+        </strong>
+        {{vm.model.name}}
+        <br />
+        <strong>
+            <localize key="alias">Alias</localize>:
+        </strong>
+        {{vm.model.alias}}
+        <br />
+        <br />
+        <button class="btn btn-primary" ng-click="import()">
+            <localize key="actions_importDocumentType">Import</localize>
+        </button>
+    </div>
+    <div ng-if="vm.state === 'done'">
+        {{vm.model.name}} has been imported!
+    </div>
+</div>

src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js

@@ -21,7 +21,7 @@
             var labelKeys = [
                 "treeHeaders_languages",
                 "general_mandatory",
-                "general_default",
+                "general_default"
             ];
 
             localizationService.localizeMany(labelKeys).then(function (values) {

src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js

@@ -355,7 +355,7 @@
                                 });
                             },
                             readOnly: true
-                        },
+                        }
 
                     ]);
                     

src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js

@@ -143,7 +143,7 @@
             templateUrl: 'views/propertyeditors/fileupload/fileupload.directive.html',
             controller: 'Umbraco.PropertyEditors.FileUploadController',
             scope: {
-                model: "=",
+                model: "="
             },
             link: function (scope, element, attrs, ctrl) {
 

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js

@@ -28,7 +28,7 @@ angular.module("umbraco")
                     name: "1 column layout",
                     sections: [
                         {
-                            grid: 12,
+                            grid: 12
                         }
                     ]
                 },
@@ -36,7 +36,7 @@ angular.module("umbraco")
                     name: "2 column layout",
                     sections: [
                         {
-                            grid: 4,
+                            grid: 4
                         },
                         {
                             grid: 8

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js

@@ -76,7 +76,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
                "canDelete": _.contains(currentUserPermissions, 'D'), //Magic Char = D
                "canMove": _.contains(currentUserPermissions, 'M'), //Magic Char = M                
                "canPublish": _.contains(currentUserPermissions, 'U'), //Magic Char = U
-               "canUnpublish": _.contains(currentUserPermissions, 'U'), //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
+               "canUnpublish": _.contains(currentUserPermissions, 'U') //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
            };
        }
    }

src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js

@@ -183,7 +183,7 @@ angular.module("umbraco")
                         tagsHound.get(query, function (suggestions) {
                             cb(removeCurrentTagsFromSuggestions(suggestions));
                         });
-                    },
+                    }
                 }).bind("typeahead:selected", function (obj, datum, name) {
                     angularHelper.safeApply($scope, function () {
                         addTag(datum["value"]);

src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js

@@ -159,7 +159,7 @@
                                 });
                             },
                             readOnly: true
-                        },
+                        }
                     ]);
                     
                     // initial cursor placement

src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js

@@ -313,7 +313,7 @@
                                 });
                             },
                             readOnly: true
-                        },
+                        }
                         
                     ]);
                     

src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js

@@ -123,7 +123,8 @@ describe('contentEditingHelper tests', function () {
             var allProps = contentEditingHelper.getAllProps(content);
 
             //act
-            formHelper.handleServerValidation({ "_Properties.bodyText.value": ["Required"] });
+            //note the null, that's because culture is null
+            formHelper.handleServerValidation({ "_Properties.bodyText.null.value": ["Required"] });
 
             //assert
             expect(serverValidationManager.items.length).toBe(1);
@@ -143,7 +144,8 @@ describe('contentEditingHelper tests', function () {
                 {
                     "Name": ["Required"],
                     "UpdateDate": ["Invalid date"],
-                    "_Properties.bodyText.value": ["Required field"],
+                    //note the null, that's because culture is null
+                    "_Properties.bodyText.null.value": ["Required field"],
                     "_Properties.textarea": ["Invalid format"]
                 });
 
@@ -226,6 +228,7 @@ describe('contentEditingHelper tests', function () {
             //act
             var changed = contentEditingHelper.reBindChangedProperties(origContent, newContent);
 
+            
             //assert
             expect(changed.length).toBe(2);
             expect(changed[0].alias).toBe("grid");

src/Umbraco.Web.UI.Client/test/unit/common/services/file-manager.spec.js

@@ -10,24 +10,39 @@ describe('file manager tests', function () {
     describe('file management', function () {
 
         it('adding a file adds to the collection', function () {
-            fileManager.setFiles('testProp', ["testFile"]);
+            fileManager.setFiles({
+                propertyAlias: 'testProp',
+                files: ["testFile"]
+            });
             expect(fileManager.getFiles().length).toBe(1);
         });
 
         it('adding a file with the same property id replaces the existing one', function () {
-            fileManager.setFiles('testProp', ["testFile"]);
-            fileManager.setFiles('testProp', ["testFile2"]);
+            fileManager.setFiles({
+                propertyAlias: 'testProp',
+                files: ["testFile"]
+            });
+            fileManager.setFiles({
+                propertyAlias: 'testProp',
+                files: ["testFile2"]
+            });
             expect(fileManager.getFiles().length).toBe(1);
             expect(fileManager.getFiles()[0].file).toBe("testFile2");
         });
         
         it('clears all files', function () {
-            fileManager.setFiles('testProp1', ["testFile"]);
-            fileManager.setFiles('testProp2', ["testFile"]);
+            fileManager.setFiles({
+                propertyAlias: 'testProp',
+                files: ["testFile"]
+            });
+            fileManager.setFiles({
+                propertyAlias: 'testProp2',
+                files: ["testFile"]
+            });
             expect(fileManager.getFiles().length).toBe(2);
             fileManager.clearFiles();
             expect(fileManager.getFiles().length).toBe(0);
         });
 
     });
-});
+});

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -361,7 +361,6 @@
     <Content Include="Umbraco\Developer\Packages\directoryBrowser.aspx" />
     <Content Include="Umbraco\Developer\Packages\editPackage.aspx" />
     <Content Include="Umbraco\Dialogs\create.aspx" />
-    <Content Include="Umbraco\Dialogs\importDocumenttype.aspx" />
     <Content Include="Umbraco\Dialogs\notifications.aspx" />
     <Content Include="Umbraco\Dialogs\protectPage.aspx" />
     <Content Include="Umbraco\Dialogs\rollBack.aspx" />

src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml

@@ -1,19 +1,11 @@
-@using System.Collections
-@using System.Net.Http
-@using System.Web.Mvc.Html
-@using Umbraco.Core
+@using Umbraco.Core
 @using ClientDependency.Core
 @using ClientDependency.Core.Mvc
-@using Microsoft.Owin.Security
-@using Newtonsoft.Json
-@using Newtonsoft.Json.Linq
 @using Umbraco.Core.IO
 @using Umbraco.Web
-@using Umbraco.Web.Editors
-@using umbraco
 @using Umbraco.Core.Configuration
 
-@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
+@inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 
 @{
     var isDebug = false;
@@ -51,18 +43,25 @@
         new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)),
         new BasicPath("UmbracoClient", IOHelper.ResolveUrl(SystemDirectories.UmbracoClient)))
 </head>
-<noscript><h5><strong>&nbsp; JavaScript is disabled. Please enable to continue!</strong></h5></noscript>
 <body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
 
+    <noscript>
+        <div style="margin: 10px;">
+            <h3><img src="assets/img/application/logo.png" alt="Umbraco logo" style="vertical-align: text-bottom;" /> Umbraco</h3>
+            <p>For full functionality of Umbraco CMS it is necessary to enable JavaScript.</p>
+            <p>Here are the <a href="https://www.enable-javascript.com/" target="_blank" style="text-decoration: underline;">instructions how to enable JavaScript in your web browser</a>.</p>
+        </div>
+    </noscript>
+
     <div ng-hide="!authenticated" ng-cloak>
-        
-        <div id="mainwrapper" class="clearfix" ng-click="closeDialogs($event)">
+
+        <div style="display: none;" id="mainwrapper" class="clearfix" ng-click="closeDialogs($event)">
 
             <umb-app-header></umb-app-header>
 
             <div class="umb-app-content">
-            
-              <umb-navigation></umb-navigation>
+
+                <umb-navigation></umb-navigation>
 
                 <section id="contentwrapper">
 
@@ -70,18 +69,16 @@
 
                         <div class="umb-editor" ng-view></div>
                         <div class="umb-editor__overlay" ng-if="editors.length > 0"></div>
-                        
-                        <umb-editors></umb-editors>
 
+                        <umb-editors></umb-editors>
                     </div>
 
-              </section>
-                
+                </section>
+
             </div>
 
-            <umb-tour
-                ng-if="tour.show"
-                model="tour">
+            <umb-tour ng-if="tour.show"
+                      model="tour">
             </umb-tour>
 
             <umb-notifications></umb-notifications>
@@ -90,45 +87,42 @@
 
         <!-- help dialog controller by the help button - this also forces the backoffice UI to shift 400px  -->
         <umb-drawer data-element="drawer" ng-if="drawer.show" model="drawer.model" view="drawer.view"></umb-drawer>
-        
+
     </div>
 
-    <umb-backdrop
-        ng-if="backdrop.show"
-        backdrop-opacity="backdrop.opacity"
-        highlight-element="backdrop.element"
-        highlight-prevent-click="backdrop.elementPreventClick"
-        disable-events-on-click="backdrop.disableEventsOnClick">
+    <umb-backdrop ng-if="backdrop.show"
+                  backdrop-opacity="backdrop.opacity"
+                  highlight-element="backdrop.element"
+                  highlight-prevent-click="backdrop.elementPreventClick"
+                  disable-events-on-click="backdrop.disableEventsOnClick">
     </umb-backdrop>
 
-    <umb-overlay
-        ng-if="overlay.show"
-        model="overlay"
-        position="{{overlay.position}}"
-        view="overlay.view">
+    <umb-overlay ng-if="overlay.show"
+                 model="overlay"
+                 position="{{overlay.position}}"
+                 view="overlay.view">
     </umb-overlay>
 
-    <umb-overlay
-        ng-if="ysodOverlay.show"
-        model="ysodOverlay"
-        position="right"
-        view="ysodOverlay.view">
+    <umb-overlay ng-if="ysodOverlay.show"
+                 model="ysodOverlay"
+                 position="right"
+                 view="ysodOverlay.view">
     </umb-overlay>
 
     @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewBag.UmbracoPath }), Model.Features, UmbracoConfig.For.GlobalSettings())
 
-    <script type="text/javascript">
+    <script>
+        
         document.angularReady = function(app) {
-
             @Html.AngularValueExternalLoginInfoScript((IEnumerable<string>)ViewBag.ExternalSignInError)
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
+            //required for the noscript trick
+            document.getElementById("mainwrapper").style.display = "inherit";
         }
     </script>
 
-
-    @*And finally we can load in our angular app*@
-    <script type="text/javascript" src="lib/rgrove-lazyload/lazyload.js"></script>
-    <script type="text/javascript" src="@Url.GetUrlWithCacheBust("Application", "BackOffice")"></script>
+    <script src="lib/rgrove-lazyload/lazyload.js"></script>
+    <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice")"></script>
 
     @if (isDebug)
     {

src/Umbraco.Web.UI/Umbraco/dialogs/importDocumenttype.aspx

@@ -1,49 +0,0 @@
-<%@ Page MasterPageFile="../masterpages/umbracoDialog.Master" Language="c#" Codebehind="importDocumenttype.aspx.cs" AutoEventWireup="false"
-  Inherits="umbraco.presentation.umbraco.dialogs.importDocumentType" %>
-
-<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="body">
-    <input id="tempFile" type="hidden" name="tempFile" runat="server" />
-
-    <asp:Literal ID="FeedBackMessage" runat="server" />
-
-    <table class="propertyPane" id="Table1" cellspacing="0" cellpadding="4" width="360" border="0" runat="server">
-      <tr>
-        <td class="propertyContent" colspan="2">
-          <asp:Panel ID="Wizard" runat="server" Visible="True">
-            <p>
-            <span class="guiDialogNormal">
-              <%=Services.TextService.Localize("importDocumentTypeHelp")%>
-            </span>
-            </p>
-            
-            <p>
-            <input id="documentTypeFile" type="file" runat="server" />
-            </p>
-            
-            
-            <asp:Button ID="submit" runat="server"></asp:Button> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
-          </asp:Panel>
-          
-          
-          <asp:Panel ID="Confirm" runat="server" Visible="False">
-            <strong>
-              <%=Services.TextService.Localize("name")%>
-              :</strong>
-            <asp:Literal ID="dtName" runat="server"></asp:Literal>
-            <br />
-            <strong>
-              <%=Services.TextService.Localize("alias")%>
-              :</strong>
-            <asp:Literal ID="dtAlias" runat="server"></asp:Literal>
-            <br />
-            <br />
-            <asp:Button ID="import" runat="server"></asp:Button>
-          </asp:Panel>
-          <asp:Panel ID="done" runat="server" Visible="False">
-            <asp:Literal ID="dtNameConfirm" runat="server"></asp:Literal>
-            has been imported!
-          </asp:Panel>
-        </td>
-      </tr>
-    </table>
-    </asp:Content>

src/Umbraco.Web/Editors/ContentTypeController.cs

@@ -1,21 +1,29 @@
 using AutoMapper;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Threading.Tasks;
 using System.Web.Http;
+using System.Xml;
+using System.Xml.Linq;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
+using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.UI;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
+using Notification = Umbraco.Web.Models.ContentEditing.Notification;
 
 namespace Umbraco.Web.Editors
 {
@@ -454,5 +462,93 @@ namespace Umbraco.Web.Editors
 
             return response;
         }
+
+        [HttpPost]
+        public HttpResponseMessage Import(string file)
+        {
+            var filePath = Path.Combine(IOHelper.MapPath(SystemDirectories.Data), file);
+            if (string.IsNullOrEmpty(file) || !System.IO.File.Exists(filePath))
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            var xd = new XmlDocument();
+            xd.XmlResolver = null;
+            xd.Load(filePath);
+
+            var userId = Security.GetUserId();
+            var element = XElement.Parse(xd.InnerXml);
+            Current.Services.PackagingService.ImportContentTypes(element, userId);
+
+            // Try to clean up the temporary file.
+            try
+            {
+                System.IO.File.Delete(filePath);
+            }
+            catch (Exception ex)
+            {
+                Current.Logger.Error(typeof(ContentTypeController), "Error cleaning up temporary udt file in App_Data: " + ex.Message, ex);
+            }
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        [HttpPost]
+        [FileUploadCleanupFilter(false)]
+        public async Task<ContentTypeImportModel> Upload()
+        {
+            if (Request.Content.IsMimeMultipartContent() == false)
+            {
+                throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
+            }
+
+            var root = IOHelper.MapPath("~/App_Data/TEMP/FileUploads");
+            //ensure it exists
+            Directory.CreateDirectory(root);
+            var provider = new MultipartFormDataStreamProvider(root);
+            var result = await Request.Content.ReadAsMultipartAsync(provider);
+
+            //must have a file
+            if (result.FileData.Count == 0)
+            {
+                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            }
+
+            var model = new ContentTypeImportModel();
+            var file = result.FileData[0];
+            var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
+            var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
+            if (ext.InvariantEquals("udt"))
+            {
+                //TODO: Currently it has to be here, it's not ideal but that's the way it is right now
+                var tempDir = IOHelper.MapPath(SystemDirectories.Data);
+
+                //ensure it's there
+                Directory.CreateDirectory(tempDir);
+
+                model.TempFileName = "justDelete_" + Guid.NewGuid() + ".udt";
+                var tempFileLocation = Path.Combine(tempDir, model.TempFileName);
+                System.IO.File.Copy(file.LocalFileName, tempFileLocation, true);
+
+                var xd = new XmlDocument
+                {
+                    XmlResolver = null
+                };
+                xd.Load(tempFileLocation);
+
+                model.Alias = xd.DocumentElement?.SelectSingleNode("//DocumentType/Info/Alias")?.FirstChild.Value;
+                model.Name = xd.DocumentElement?.SelectSingleNode("//DocumentType/Info/Name")?.FirstChild.Value;
+            }
+            else
+            {
+                model.Notifications.Add(new Notification(
+                    Services.TextService.Localize("speechBubbles/operationFailedHeader"),
+                    Services.TextService.Localize("media/disallowedFileType"),
+                    SpeechBubbleIcon.Warning));
+            }
+
+            return model;
+
+        }
     }
 }

src/Umbraco.Web/Models/ContentTypeImportModel.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Models
+{
+    [DataContract(Name = "contentTypeImportModel")]
+    public class ContentTypeImportModel : INotificationModel
+    {
+        public ContentTypeImportModel()
+        {
+            Notifications = new List<Notification>();
+        }
+
+        [DataMember(Name = "alias")]
+        public string Alias { get; set; }
+
+        [DataMember(Name = "name")]
+        public string Name { get; set; }
+
+        [DataMember(Name = "notifications")]
+        public List<Notification> Notifications { get; }
+
+        [DataMember(Name = "tempFileName")]
+        public string TempFileName { get; set; }
+    }
+}

src/Umbraco.Web/Trees/ContentTypeTreeController.cs

@@ -6,7 +6,6 @@ using System.Net.Http.Formatting;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Services;
 using Umbraco.Web._Legacy.Actions;
 using Umbraco.Web.Models.ContentEditing;
@@ -74,13 +73,7 @@ namespace Umbraco.Web.Trees
 
                 // root actions
                 menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
-                menu.Items.Add<ActionImport>(Services.TextService.Localize(string.Format("actions/{0}", ActionImport.Instance.Alias)), true).ConvertLegacyMenuItem(new EntitySlim
-                {
-                    Id = int.Parse(id),
-                    Level = 1,
-                    ParentId = Constants.System.Root,
-                    Name = ""
-                }, "documenttypes", "settings");
+                menu.Items.Add<ActionImport>(Services.TextService.Localize(string.Format("actions/{0}", ActionImport.Instance.Alias)), true);
                 menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
                 return menu;
             }

src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs

@@ -257,12 +257,6 @@ namespace Umbraco.Web.Trees
                             "dialogs/sendToTranslation.aspx?id=" + nodeId + "&rnd=" + DateTime.UtcNow.Ticks,
                             Current.Services.TextService.Localize("actions/sendToTranslate")));
 
-                case "UmbClientMgr.appActions().actionImport()":
-                    return Attempt.Succeed(
-                        new LegacyUrlAction(
-                            "dialogs/importDocumentType.aspx",
-                            Current.Services.TextService.Localize("actions/importDocumentType")));
-
             }
             return Attempt<LegacyUrlAction>.Fail();
         }

src/Umbraco.Web/Umbraco.Web.csproj

@@ -246,6 +246,7 @@
     <Compile Include="Models\ContentEditing\UserProfile.cs" />
     <Compile Include="Models\ContentEditing\UserSave.cs" />
     <Compile Include="Models\ContentEditing\Language.cs" />
+    <Compile Include="Models\ContentTypeImportModel.cs" />
     <Compile Include="Models\Mapping\ActionButtonsResolver.cs" />
     <Compile Include="Models\Mapping\AuditMapperProfile.cs" />
     <Compile Include="Models\Mapping\ContentAppResolver.cs" />
@@ -1295,10 +1296,6 @@
     <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.designer.cs">
       <DependentUpon>editPackage.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx.cs">
-      <DependentUpon>importDocumenttype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx.cs">
       <DependentUpon>rollBack.aspx</DependentUpon>
     </Compile>
@@ -1449,7 +1446,6 @@
     <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>

src/Umbraco.Web/_Legacy/Actions/ActionImport.cs

@@ -1,7 +1,4 @@
-using System;
-using Umbraco.Web.UI.Pages;
-
-namespace Umbraco.Web._Legacy.Actions
+namespace Umbraco.Web._Legacy.Actions
 {
     /// <summary>
     /// This action is invoked when importing a document type
@@ -32,7 +29,7 @@ namespace Umbraco.Web._Legacy.Actions
         {
             get
             {
-                return string.Format("{0}.actionImport()", ClientTools.Scripts.GetAppActions);
+                return "";
             }
         }
 

src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx

@@ -1,49 +0,0 @@
-<%@ Page MasterPageFile="../masterpages/umbracoDialog.Master" Language="c#" Codebehind="importDocumenttype.aspx.cs" AutoEventWireup="false"
-  Inherits="umbraco.presentation.umbraco.dialogs.importDocumentType" %>
-
-<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="body">
-    <input id="tempFile" type="hidden" name="tempFile" runat="server" />
-
-    <asp:Literal ID="FeedBackMessage" runat="server" />
-
-    <table class="propertyPane" id="Table1" cellspacing="0" cellpadding="4" width="360" border="0" runat="server">
-      <tr>
-        <td class="propertyContent" colspan="2">
-          <asp:Panel ID="Wizard" runat="server" Visible="True">
-            <p>
-            <span class="guiDialogNormal">
-              <%=Services.TextService.Localize("importDocumentTypeHelp")%>
-            </span>
-            </p>
-            
-            <p>
-            <input id="documentTypeFile" type="file" runat="server" />
-            </p>
-            
-            
-            <asp:Button ID="submit" runat="server"></asp:Button> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
-          </asp:Panel>
-          
-          
-          <asp:Panel ID="Confirm" runat="server" Visible="False">
-            <strong>
-              <%=Services.TextService.Localize("name")%>
-              :</strong>
-            <asp:Literal ID="dtName" runat="server"></asp:Literal>
-            <br />
-            <strong>
-              <%=Services.TextService.Localize("alias")%>
-              :</strong>
-            <asp:Literal ID="dtAlias" runat="server"></asp:Literal>
-            <br />
-            <br />
-            <asp:Button ID="import" runat="server"></asp:Button>
-          </asp:Panel>
-          <asp:Panel ID="done" runat="server" Visible="False">
-            <asp:Literal ID="dtNameConfirm" runat="server"></asp:Literal>
-            has been imported!
-          </asp:Panel>
-        </td>
-      </tr>
-    </table>
-    </asp:Content>

src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs

@@ -1,121 +0,0 @@
-using Umbraco.Core.Services;
-using System;
-using System.Linq;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Web;
-using Umbraco.Web.Composing;
-
-namespace umbraco.presentation.umbraco.dialogs
-{
-    /// <summary>
-    /// Summary description for importDocumentType.
-    /// </summary>
-    public class importDocumentType : Umbraco.Web.UI.Pages.UmbracoEnsuredPage
-    {
-        public importDocumentType()
-        {
-
-            CurrentApp = Constants.Applications.Settings.ToString();
-
-        }
-        protected Literal FeedBackMessage;
-        protected Literal jsShowWindow;
-        protected Panel Wizard;
-        protected HtmlTable Table1;
-        protected HtmlInputHidden tempFile;
-        protected HtmlInputFile documentTypeFile;
-        protected Button submit;
-        protected Panel Confirm;
-        protected Literal dtName;
-        protected Literal dtAlias;
-        protected Button import;
-        protected Literal dtNameConfirm;
-        protected Panel done;
-        private string tempFileName = "";
-
-        private void Page_Load(object sender, EventArgs e)
-        {
-            if (!IsPostBack)
-            {
-                submit.Text = Services.TextService.Localize("import");
-                import.Text = Services.TextService.Localize("import");
-            }
-        }
-
-        #region Web Form Designer generated code
-        override protected void OnInit(EventArgs e)
-        {
-            //
-            // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-            //
-            InitializeComponent();
-            base.OnInit(e);
-        }
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.submit.Click += new System.EventHandler(this.submit_Click);
-            this.import.Click += new System.EventHandler(this.import_Click);
-            this.Load += new System.EventHandler(this.Page_Load);
-
-        }
-        #endregion
-
-        private void import_Click(object sender, EventArgs e)
-        {
-            var xd = new XmlDocument();
-		    xd.XmlResolver = null;
-            xd.Load(tempFile.Value);
-
-            var userId = Security.GetUserId();
-
-            var element = XElement.Parse(xd.InnerXml);
-            var importContentTypes = Current.Services.PackagingService.ImportContentTypes(element, userId);
-            var contentType = importContentTypes.FirstOrDefault();
-            if (contentType != null)
-                dtNameConfirm.Text = contentType.Name;
-
-            // Try to clean up the temporary file.
-            try
-            {
-                System.IO.File.Delete(tempFile.Value);
-            }
-            catch(Exception ex)
-            {
-                Current.Logger.Error(typeof(importDocumentType), "Error cleaning up temporary udt file in App_Data: " + ex.Message, ex);
-            }
-
-            Wizard.Visible = false;
-            Confirm.Visible = false;
-            done.Visible = true;
-        }
-
-        private void submit_Click(object sender, EventArgs e)
-        {
-            tempFileName = "justDelete_" + Guid.NewGuid().ToString() + ".udt";
-            var fileName = IOHelper.MapPath(SystemDirectories.Data + "/" + tempFileName);
-            tempFile.Value = fileName;
-
-            documentTypeFile.PostedFile.SaveAs(fileName);
-
-            var xd = new XmlDocument();
-		    xd.XmlResolver = null;
-            xd.Load(fileName);
-            dtName.Text = xd.DocumentElement.SelectSingleNode("//DocumentType/Info/Name").FirstChild.Value;
-            dtAlias.Text = xd.DocumentElement.SelectSingleNode("//DocumentType/Info/Alias").FirstChild.Value;
-
-            Wizard.Visible = false;
-            done.Visible = false;
-            Confirm.Visible = true;
-        }
-    }
-}