diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js index e662b1190e..2d0d9edf7b 100644 --- a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js +++ b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js @@ -17,6 +17,7 @@ jQuery(document).ready(function () { }); + function scaleScrollables(selector){ jQuery(".umb-scrollable").each(function () { var el = jQuery(this); diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less index 866dbb3b99..18ef0881e8 100644 --- a/src/Umbraco.Web.UI.Client/src/less/hacks.less +++ b/src/Umbraco.Web.UI.Client/src/less/hacks.less @@ -18,8 +18,8 @@ max-width: none !important; } -/* loading animation for iframes */ -iframe { +/* loading animation for iframes and content pages */ +iframe, .content-column-body { background: center center url(../img/loader.gif) no-repeat; } diff --git a/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js index 7c63f5260c..eb9dccf2d2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js @@ -1,146 +1,146 @@ -/** - * @ngdoc controller - * @name ContentEditController - * @function - * - * @description - * The controller for the content editor - */ -function ContentEditController($scope, $routeParams, contentResource, notificationsService, angularHelper, serverValidationService) { - - /** - * @ngdoc function - * @name handleSaveError - * @methodOf ContentEditController - * @function - * - * @description - * A function to handle what happens when we have validation issues from the server side - */ - - function handleSaveError(err) { - //When the status is a 403 status, we have validation errors. - //Otherwise the error is probably due to invalid data (i.e. someone mucking around with the ids or something). - //Or, some strange server error - if (err.status == 403) { - //now we need to look through all the validation errors - if (err.data && err.data.ModelState) { - - //get a list of properties since they are contained in tabs - var allProps = []; - for (var i = 0; i < $scope.content.tabs.length; i++) { - for (var p = 0; p < $scope.content.tabs[i].properties.length; p++) { - allProps.push($scope.content.tabs[i].properties[p]); - } - } - - for (var e in err.data.ModelState) { - //the alias in model state can be in dot notation which indicates - // * the first part is the content property alias - // * the second part is the field to which the valiation msg is associated with - var parts = e.split("."); - var propertyAlias = parts[0]; - - //find the content property for the current error - var contentProperty = _.find(allProps, function (item) { - return (item.alias === propertyAlias); - }); - if (contentProperty) { - //if it contains a '.' then we will wire it up to a property's field - if (parts.length > 1) { - //add an error with a reference to the field for which the validation belongs too - serverValidationService.addError(contentProperty, parts[1], err.data.ModelState[e][0]); - } - else { - //add a generic error for the property, no reference to a specific field - serverValidationService.addError(contentProperty, "", err.data.ModelState[e][0]); - } - - //add to notifications - notificationsService.error("Validation", err.data.ModelState[e][0]); - } - } - - } - } - else { - //TODO: Implement an overlay showing the full YSOD like we had in v5 - //alert("failed!"); - notificationsService.error("Validation failed", err); - } - } - - //get the data to show, scaffold for new or get existing - if ($routeParams.create) { - contentResource.getScaffold($routeParams.id, $routeParams.doctype) - .then(function(data) { - $scope.contentLoaded = true; - $scope.content = data; - }); - } - else { - contentResource.getById($routeParams.id) - .then(function(data) { - $scope.contentLoaded = true; - $scope.content = data; - }); - } - - $scope.files = []; - $scope.addFiles = function (propertyId, files) { - //this will clear the files for the current property and then add the new ones for the current property - $scope.files = _.reject($scope.files, function (item) { - return item.id == propertyId; - }); - for (var i = 0; i < files.length; i++) { - //save the file object to the scope's files collection - $scope.files.push({ id: propertyId, file: files[i] }); - } - }; - - //ensure there is a form object assigned. - var currentForm = angularHelper.getRequiredCurrentForm($scope); - - //TODO: Need to figure out a way to share the saving and event broadcasting with all editors! - - $scope.saveAndPublish = function (cnt) { - - $scope.$broadcast("saving", { scope: $scope }); - - //don't continue if the form is invalid - if (currentForm.$invalid) return; - - serverValidationService.reset(); - - contentResource.publishContent(cnt, $routeParams.create, $scope.files) - .then(function(data) { - $scope.content = data; - notificationsService.success("Published", "Content has been saved and published"); - $scope.$broadcast("saved", { scope: $scope }); - }, function(err) { - handleSaveError(err); - }); - }; - - $scope.save = function (cnt) { - - $scope.$broadcast("saving", { scope: $scope }); - - //don't continue if the form is invalid - if (currentForm.$invalid) return; - - serverValidationService.reset(); - - contentResource.saveContent(cnt, $routeParams.create, $scope.files) - .then(function (data) { - $scope.content = data; - notificationsService.success("Saved", "Content has been saved"); - $scope.$broadcast("saved", { scope: $scope }); - }, function(err) { - handleSaveError(err); - }); - - }; -} - -angular.module("umbraco").controller("Umbraco.Editors.ContentEditController", ContentEditController); \ No newline at end of file +/** + * @ngdoc controller + * @name ContentEditController + * @function + * + * @description + * The controller for the content editor + */ +function ContentEditController($scope, $routeParams, contentResource, notificationsService, angularHelper, serverValidationService) { + + /** + * @ngdoc function + * @name handleSaveError + * @methodOf ContentEditController + * @function + * + * @description + * A function to handle what happens when we have validation issues from the server side + */ + + function handleSaveError(err) { + //When the status is a 403 status, we have validation errors. + //Otherwise the error is probably due to invalid data (i.e. someone mucking around with the ids or something). + //Or, some strange server error + if (err.status == 403) { + //now we need to look through all the validation errors + if (err.data && err.data.ModelState) { + + //get a list of properties since they are contained in tabs + var allProps = []; + for (var i = 0; i < $scope.content.tabs.length; i++) { + for (var p = 0; p < $scope.content.tabs[i].properties.length; p++) { + allProps.push($scope.content.tabs[i].properties[p]); + } + } + + for (var e in err.data.ModelState) { + //the alias in model state can be in dot notation which indicates + // * the first part is the content property alias + // * the second part is the field to which the valiation msg is associated with + var parts = e.split("."); + var propertyAlias = parts[0]; + + //find the content property for the current error + var contentProperty = _.find(allProps, function (item) { + return (item.alias === propertyAlias); + }); + if (contentProperty) { + //if it contains a '.' then we will wire it up to a property's field + if (parts.length > 1) { + //add an error with a reference to the field for which the validation belongs too + serverValidationService.addError(contentProperty, parts[1], err.data.ModelState[e][0]); + } + else { + //add a generic error for the property, no reference to a specific field + serverValidationService.addError(contentProperty, "", err.data.ModelState[e][0]); + } + + //add to notifications + notificationsService.error("Validation", err.data.ModelState[e][0]); + } + } + + } + } + else { + //TODO: Implement an overlay showing the full YSOD like we had in v5 + //alert("failed!"); + notificationsService.error("Validation failed", err); + } + } + + //get the data to show, scaffold for new or get existing + if ($routeParams.create) { + contentResource.getScaffold($routeParams.id, $routeParams.doctype) + .then(function(data) { + $scope.contentLoaded = true; + $scope.content = data; + }); + } + else { + contentResource.getById($routeParams.id) + .then(function(data) { + $scope.contentLoaded = true; + $scope.content = data; + }); + } + + $scope.files = []; + $scope.addFiles = function (propertyId, files) { + //this will clear the files for the current property and then add the new ones for the current property + $scope.files = _.reject($scope.files, function (item) { + return item.id == propertyId; + }); + for (var i = 0; i < files.length; i++) { + //save the file object to the scope's files collection + $scope.files.push({ id: propertyId, file: files[i] }); + } + }; + + //ensure there is a form object assigned. + var currentForm = angularHelper.getRequiredCurrentForm($scope); + + //TODO: Need to figure out a way to share the saving and event broadcasting with all editors! + + $scope.saveAndPublish = function (cnt) { + + $scope.$broadcast("saving", { scope: $scope }); + + //don't continue if the form is invalid + if (currentForm.$invalid) return; + + serverValidationService.reset(); + + contentResource.publishContent(cnt, $routeParams.create, $scope.files) + .then(function(data) { + $scope.content = data; + notificationsService.success("Published", "Content has been saved and published"); + $scope.$broadcast("saved", { scope: $scope }); + }, function(err) { + handleSaveError(err); + }); + }; + + $scope.save = function (cnt) { + + $scope.$broadcast("saving", { scope: $scope }); + + //don't continue if the form is invalid + if (currentForm.$invalid) return; + + serverValidationService.reset(); + + contentResource.saveContent(cnt, $routeParams.create, $scope.files) + .then(function (data) { + $scope.content = data; + notificationsService.success("Saved", "Content has been saved"); + $scope.$broadcast("saved", { scope: $scope }); + }, function(err) { + handleSaveError(err); + }); + + }; +} + +angular.module("umbraco").controller("Umbraco.Editors.ContentEditController", ContentEditController); diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html index 142d3cedea..311c5bba1c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html @@ -1,4 +1,4 @@ - +
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html index 224cf16ecf..f6bdec4787 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html @@ -3,7 +3,7 @@
  • - +
    • diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml index fc3a58858f..2c68aa95c5 100644 --- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml +++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml @@ -53,7 +53,7 @@
    -
    +