{{errorMsg}}
",
-
+ scope: {},
link: function (scope, element, attrs, ctrl) {
//the property form controller api
var formCtrl = ctrl[0];
-
//the valFormManager controller api
var valFormManager = ctrl[1];
+ //the property controller api
+ var umbPropCtrl = ctrl[2];
+
+ scope.currentProperty = umbPropCtrl.property;
+ var currentCulture = scope.currentProperty.culture;
var watcher = null;
// Gets the error message to display
function getErrorMsg() {
//this can be null if no property was assigned
- if (scope.property) {
+ if (scope.currentProperty) {
//first try to get the error msg from the server collection
- var err = serverValidationManager.getPropertyError(scope.property.alias, "");
+ var err = serverValidationManager.getPropertyError(scope.currentProperty.alias, null, "");
//if there's an error message use it
if (err && err.errorMsg) {
return err.errorMsg;
}
else {
//TODO: localize
- return scope.property.propertyErrorMessage ? scope.property.propertyErrorMessage : "Property has errors";
+ return scope.currentProperty.propertyErrorMessage ? scope.currentProperty.propertyErrorMessage : "Property has errors";
}
}
@@ -59,29 +60,30 @@ function valPropertyMsg(serverValidationManager) {
function startWatch() {
//if there's not already a watch
if (!watcher) {
- watcher = scope.$watch("property.value", function (newValue, oldValue) {
-
- if (!newValue || angular.equals(newValue, oldValue)) {
- return;
- }
+ watcher = scope.$watch("currentProperty.value",
+ function (newValue, oldValue) {
- var errCount = 0;
- for (var e in formCtrl.$error) {
- if (angular.isArray(formCtrl.$error[e])) {
- errCount++;
+ if (!newValue || angular.equals(newValue, oldValue)) {
+ return;
}
- }
- //we are explicitly checking for valServer errors here, since we shouldn't auto clear
- // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
- // is the only one, then we'll clear.
+ var errCount = 0;
+ for (var e in formCtrl.$error) {
+ if (angular.isArray(formCtrl.$error[e])) {
+ errCount++;
+ }
+ }
- if ((errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
- scope.errorMsg = "";
- formCtrl.$setValidity('valPropertyMsg', true);
- stopWatch();
- }
- }, true);
+ //we are explicitly checking for valServer errors here, since we shouldn't auto clear
+ // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
+ // is the only one, then we'll clear.
+
+ if ((errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+ scope.errorMsg = "";
+ formCtrl.$setValidity('valPropertyMsg', true);
+ stopWatch();
+ }
+ }, true);
}
}
@@ -93,19 +95,7 @@ function valPropertyMsg(serverValidationManager) {
}
}
- //if there's any remaining errors in the server validation service then we should show them.
- var showValidation = serverValidationManager.items.length > 0;
- var hasError = false;
-
- //create properties on our custom scope so we can use it in our template
- scope.errorMsg = "";
-
- var unsubscribe = [];
-
- //listen for form validation changes.
- //The alternative is to add a watch to formCtrl.$invalid but that would lead to many more watches then
- // subscribing to this single watch.
- valFormManager.onValidationStatusChanged(function (evt, args) {
+ function checkValidationStatus() {
if (formCtrl.$invalid) {
//first we need to check if the valPropertyMsg validity is invalid
if (formCtrl.$error.valPropertyMsg && formCtrl.$error.valPropertyMsg.length > 0) {
@@ -130,10 +120,35 @@ function valPropertyMsg(serverValidationManager) {
hasError = false;
scope.errorMsg = "";
}
+ }
+
+ //if there's any remaining errors in the server validation service then we should show them.
+ var showValidation = serverValidationManager.items.length > 0;
+ if (!showValidation) {
+ //We can either get the form submitted status by the parent directive valFormManager (if we add a property to it)
+ //or we can just check upwards in the DOM for the css class (easier for now).
+ //The initial hidden state can't always be hidden because when we switch variants in the content editor we cannot
+ //reset the status.
+ showValidation = element.closest(".show-validation").length > 0;
+ }
+
+
+ var hasError = false;
+
+ //create properties on our custom scope so we can use it in our template
+ scope.errorMsg = "";
+
+ var unsubscribe = [];
+
+ //listen for form validation changes.
+ //The alternative is to add a watch to formCtrl.$invalid but that would lead to many more watches then
+ // subscribing to this single watch.
+ valFormManager.onValidationStatusChanged(function (evt, args) {
+ checkValidationStatus();
});
//listen for the forms saving event
- unsubscribe.push(scope.$on("formSubmitting", function(ev, args) {
+ unsubscribe.push(scope.$on("formSubmitting", function (ev, args) {
showValidation = true;
if (hasError && scope.errorMsg === "") {
scope.errorMsg = getErrorMsg();
@@ -145,7 +160,7 @@ function valPropertyMsg(serverValidationManager) {
}));
//listen for the forms saved event
- unsubscribe.push(scope.$on("formSubmitted", function(ev, args) {
+ unsubscribe.push(scope.$on("formSubmitted", function (ev, args) {
showValidation = false;
scope.errorMsg = "";
formCtrl.$setValidity('valPropertyMsg', true);
@@ -160,35 +175,32 @@ function valPropertyMsg(serverValidationManager) {
// indicate that a content property is invalid at the property level since developers may not actually implement
// the correct field validation in their property editors.
- if (scope.property) { //this can be null if no property was assigned
- serverValidationManager.subscribe(scope.property.alias, "", function (isValid, propertyErrors, allErrors) {
- hasError = !isValid;
- if (hasError) {
- //set the error message to the server message
- scope.errorMsg = propertyErrors[0].errorMsg;
- //flag that the current validator is invalid
- formCtrl.$setValidity('valPropertyMsg', false);
- startWatch();
- }
- else {
- scope.errorMsg = "";
- //flag that the current validator is valid
- formCtrl.$setValidity('valPropertyMsg', true);
- stopWatch();
- }
- });
+ if (scope.currentProperty) { //this can be null if no property was assigned
+ unsubscribe.push(serverValidationManager.subscribe(scope.currentProperty.alias,
+ currentCulture,
+ "",
+ function(isValid, propertyErrors, allErrors) {
+ hasError = !isValid;
+ if (hasError) {
+ //set the error message to the server message
+ scope.errorMsg = propertyErrors[0].errorMsg;
+ //flag that the current validator is invalid
+ formCtrl.$setValidity('valPropertyMsg', false);
+ startWatch();
+ }
+ else {
+ scope.errorMsg = "";
+ //flag that the current validator is valid
+ formCtrl.$setValidity('valPropertyMsg', true);
+ stopWatch();
+ }
+ }));
- //when the element is disposed we need to unsubscribe!
- // NOTE: this is very important otherwise when this controller re-binds the previous subscriptsion will remain
- // but they are a different callback instance than the above.
- element.bind('$destroy', function () {
- stopWatch();
- serverValidationManager.unsubscribe(scope.property.alias, "");
- });
}
//when the scope is disposed we need to unsubscribe
scope.$on('$destroy', function () {
+ stopWatch();
for (var u in unsubscribe) {
unsubscribe[u]();
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
index 53a1ea67b2..c1a2999017 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
@@ -33,11 +33,9 @@ function valPropertyValidator(serverValidationManager) {
if (!scope.valPropertyValidator || !angular.isFunction(scope.valPropertyValidator)) {
throw new Error('val-property-validator directive must specify a function to call');
}
-
- var initResult = scope.valPropertyValidator();
-
+
// Validation method
- var validate = function (viewValue) {
+ function validate (viewValue) {
// Calls the validition method
var result = scope.valPropertyValidator();
if (!result.errorKey || result.isValid === undefined || !result.errorMsg) {
@@ -62,6 +60,9 @@ function valPropertyValidator(serverValidationManager) {
// Parsers are called as soon as the value in the form input is modified
modelCtrl.$parsers.push(validate);
+ //call on init
+ validate();
+
}
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
index 6406583e77..123962c32c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
@@ -14,8 +14,7 @@ function valRegex() {
var flags = "";
var regex;
- var eventBindings = [];
-
+
attrs.$observe("valRegexFlags", function (newVal) {
if (newVal) {
flags = newVal;
@@ -39,11 +38,15 @@ function valRegex() {
}
});
- eventBindings.push(scope.$watch('ngModel', function(newValue, oldValue){
- if(newValue && newValue !== oldValue) {
- patternValidator(newValue);
+ //An ngModel is supplied, assign a render function which is called when the model is changed
+ var oldRender = ctrl.$render;
+ ctrl.$render = function () {
+ patternValidator(ctrl.$viewValue);
+ //call any previously set render method
+ if (oldRender) {
+ oldRender();
}
- }));
+ };
var patternValidator = function (viewValue) {
if (regex) {
@@ -65,13 +68,6 @@ function valRegex() {
}
};
- scope.$on('$destroy', function(){
- // unbind watchers
- for(var e in eventBindings) {
- eventBindings[e]();
- }
- });
-
}
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
index 1432a713c0..eb522fe783 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
@@ -7,8 +7,9 @@
**/
function valServer(serverValidationManager) {
return {
- require: ['ngModel', '?^umbProperty'],
+ require: ['ngModel', '?^^umbProperty'],
restrict: "A",
+ scope: {},
link: function (scope, element, attr, ctrls) {
var modelCtrl = ctrls[0];
@@ -18,7 +19,20 @@ function valServer(serverValidationManager) {
return;
}
+ var currentProperty = umbPropCtrl.property;
+ var currentCulture = currentProperty.culture;
var watcher = null;
+ var unsubscribe = [];
+
+ //default to 'value' if nothing is set
+ var fieldName = "value";
+ if (attr.valServer) {
+ fieldName = scope.$eval(attr.valServer);
+ if (!fieldName) {
+ //eval returned nothing so just use the string
+ fieldName = attr.valServer;
+ }
+ }
//Need to watch the value model for it to change, previously we had subscribed to
//modelCtrl.$viewChangeListeners but this is not good enough if you have an editor that
@@ -40,6 +54,8 @@ function valServer(serverValidationManager) {
if (modelCtrl.$invalid) {
modelCtrl.$setValidity('valServer', true);
+ //clear the server validation entry
+ serverValidationManager.removePropertyError(currentProperty.alias, currentCulture, fieldName);
stopWatch();
}
}, true);
@@ -52,43 +68,33 @@ function valServer(serverValidationManager) {
watcher = null;
}
}
-
- var currentProperty = umbPropCtrl.property;
-
- //default to 'value' if nothing is set
- var fieldName = "value";
- if (attr.valServer) {
- fieldName = scope.$eval(attr.valServer);
- if (!fieldName) {
- //eval returned nothing so just use the string
- fieldName = attr.valServer;
- }
- }
//subscribe to the server validation changes
- serverValidationManager.subscribe(currentProperty.alias, fieldName, function (isValid, propertyErrors, allErrors) {
- if (!isValid) {
- modelCtrl.$setValidity('valServer', false);
- //assign an error msg property to the current validator
- modelCtrl.errorMsg = propertyErrors[0].errorMsg;
- startWatch();
- }
- else {
- modelCtrl.$setValidity('valServer', true);
- //reset the error message
- modelCtrl.errorMsg = "";
- stopWatch();
- }
- });
-
- //when the element is disposed we need to unsubscribe!
- // NOTE: this is very important otherwise when this controller re-binds the previous subscriptsion will remain
- // but they are a different callback instance than the above.
- element.bind('$destroy', function () {
+ unsubscribe.push(serverValidationManager.subscribe(currentProperty.alias,
+ currentCulture,
+ fieldName,
+ function(isValid, propertyErrors, allErrors) {
+ if (!isValid) {
+ modelCtrl.$setValidity('valServer', false);
+ //assign an error msg property to the current validator
+ modelCtrl.errorMsg = propertyErrors[0].errorMsg;
+ startWatch();
+ }
+ else {
+ modelCtrl.$setValidity('valServer', true);
+ //reset the error message
+ modelCtrl.errorMsg = "";
+ stopWatch();
+ }
+ }));
+
+ scope.$on('$destroy', function () {
stopWatch();
- serverValidationManager.unsubscribe(currentProperty.alias, fieldName);
+ for (var u in unsubscribe) {
+ unsubscribe[u]();
+ }
});
}
};
}
-angular.module('umbraco.directives.validation').directive("valServer", valServer);
\ No newline at end of file
+angular.module('umbraco.directives.validation').directive("valServer", valServer);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserverfield.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserverfield.directive.js
index 29fd94ff5b..7f5427da8b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserverfield.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserverfield.directive.js
@@ -10,10 +10,11 @@ function valServerField(serverValidationManager) {
return {
require: 'ngModel',
restrict: "A",
+ scope: {},
link: function (scope, element, attr, ngModel) {
var fieldName = null;
- var eventBindings = [];
+ var unsubscribe = [];
attr.$observe("valServerField", function (newVal) {
if (newVal && fieldName === null) {
@@ -24,7 +25,7 @@ function valServerField(serverValidationManager) {
// resubmitted. So once a field is changed that has a server error assigned to it
// we need to re-validate it for the server side validator so the user can resubmit
// the form. Of course normal client-side validators will continue to execute.
- eventBindings.push(scope.$watch(function() {
+ unsubscribe.push(scope.$watch(function() {
return ngModel.$modelValue;
}, function(newValue){
if (ngModel.$invalid) {
@@ -33,32 +34,28 @@ function valServerField(serverValidationManager) {
}));
//subscribe to the server validation changes
- serverValidationManager.subscribe(null, fieldName, function (isValid, fieldErrors, allErrors) {
- if (!isValid) {
- ngModel.$setValidity('valServerField', false);
- //assign an error msg property to the current validator
- ngModel.errorMsg = fieldErrors[0].errorMsg;
- }
- else {
- ngModel.$setValidity('valServerField', true);
- //reset the error message
- ngModel.errorMsg = "";
- }
- });
-
- //when the element is disposed we need to unsubscribe!
- // NOTE: this is very important otherwise when this controller re-binds the previous subscriptsion will remain
- // but they are a different callback instance than the above.
- element.bind('$destroy', function () {
- serverValidationManager.unsubscribe(null, fieldName);
- });
+ unsubscribe.push(serverValidationManager.subscribe(null,
+ null,
+ fieldName,
+ function(isValid, fieldErrors, allErrors) {
+ if (!isValid) {
+ ngModel.$setValidity('valServerField', false);
+ //assign an error msg property to the current validator
+ ngModel.errorMsg = fieldErrors[0].errorMsg;
+ }
+ else {
+ ngModel.$setValidity('valServerField', true);
+ //reset the error message
+ ngModel.errorMsg = "";
+ }
+ }));
}
});
scope.$on('$destroy', function(){
// unbind watchers
- for(var e in eventBindings) {
- eventBindings[e]();
+ for(var e in unsubscribe) {
+ unsubscribe[e]();
}
});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
index ca571d3954..a65a08d17e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
@@ -18,7 +18,7 @@
}
var valFormManager = ctrl[1];
- scope.subView.hasError = false;
+ scope.model.hasError = false;
//listen for form validation changes
valFormManager.onValidationStatusChanged(function (evt, args) {
@@ -27,14 +27,14 @@
var subViewContent = el.find(".ng-invalid");
if (subViewContent.length > 0) {
- scope.subView.hasError = true;
+ scope.model.hasError = true;
} else {
- scope.subView.hasError = false;
+ scope.model.hasError = false;
}
}
else {
- scope.subView.hasError = false;
+ scope.model.hasError = false;
}
});
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
index 221e71eb8c..b636a0a51c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
@@ -48,11 +48,14 @@
//exit/ignore
return $q.reject(rejection);
}
- var filtered = _.find(requestInterceptorFilter(), function (val) {
- return config.url.indexOf(val) > 0;
- });
- if (filtered) {
- return $q.reject(rejection);
+
+ if (config.url) {
+ var filtered = _.find(requestInterceptorFilter(), function (val) {
+ return config.url.indexOf(val) > 0;
+ });
+ if (filtered) {
+ return $q.reject(rejection);
+ }
}
//A 401 means that the user is not logged in
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
index a23fc86210..3b58c127a7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
@@ -52,6 +52,20 @@ angular.module('umbraco.mocks').
{ alias: "umbracoFile", label: "File", description:"Some file", view: "rte", value: "/media/1234/random.jpg" }
]
}
+ ],
+ apps: [
+ {
+ alias: "content",
+ name: "Content",
+ icon: "icon-document",
+ view: "views/media/apps/content/content.html"
+ },
+ {
+ alias: "info",
+ name: "Info",
+ icon: "icon-info",
+ view: "views/media/apps/info/info.html"
+ }
]
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
index 651c54bfeb..615a7aeec9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
@@ -367,7 +367,7 @@ angular.module('umbraco.mocks').
"installer_databaseHeader": "Database configuration",
"installer_databaseInstall": " Press the install button to install the Umbraco %0% database ",
"installer_databaseInstallDone": "Umbraco %0% has now been copied to your database. Press Next to proceed.",
- "installer_databaseNotFound": "Database not found! Please check that the information in the 'connection string' of the \"web.config\" file is correct.
To proceed, please edit the 'web.config' file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named 'UmbracoDbDSN' and save the file.
Click the retry button when done.
More information on editing web.config here.
Database not found! Please check that the information in the 'connection string' of the \"web.config\" file is correct.
To proceed, please edit the 'web.config' file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named 'UmbracoDbDSN' and save the file.
Click the retry button when done.
More information on editing web.config here.
Please contact your ISP if necessary. If you're installing on a local machine or server you might need information from your system administrator.", "installer_databaseUpgrade": "
Press the upgrade button to upgrade your database to Umbraco %0%
Don't worry - no content will be deleted and everything will continue working afterwards!
", "installer_databaseUpgradeDone": "Your database has been upgraded to the final version %0%.Press Next to proceed. ", @@ -395,7 +395,7 @@ angular.module('umbraco.mocks'). "installer_permissionsSettingUpPermissions": "Setting up folder permissions", "installer_permissionsText": " Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's. It also stores temporary data (aka: cache) for enhancing the performance of your website. ", "installer_runwayFromScratch": "I want to start from scratch", - "installer_runwayFromScratchText": " Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates. (learn how) You can still choose to install Runway later on. Please go to the Developer section and choose Packages. ", + "installer_runwayFromScratchText": " Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates. (learn how) You can still choose to install Runway later on. Please go to the Developer section and choose Packages. ", "installer_runwayHeader": "You've just set up a clean Umbraco platform. What do you want to do next?", "installer_runwayInstalled": "Runway is installed", "installer_runwayInstalledText": " You have the foundation in place. Select what modules you wish to install on top of it.
This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules ", @@ -432,7 +432,7 @@ angular.module('umbraco.mocks'). "login_greeting6": "Happy friendly Friday", "login_greeting7": "Happy shiny Saturday", "login_instruction": "Log in below:", - "login_bottomText": "
© 2001 - %0%
Umbraco.org
© 2001 - %0%
Umbraco.org
- * contentResource.hasPermission('p',1234)
- * .then(function() {
- * alert('You are allowed to publish this item');
- * });
- *
- *
- * @param {String} permission char representing the permission to check
- * @param {Int} id id of content item to delete
- * @returns {Promise} resourcePromise object.
- *
- */
- checkPermission: function (permission, id) {
- return umbRequestHelper.resourcePromise(
- $http.get(
- umbRequestHelper.getApiUrl(
- "contentApiBaseUrl",
- "HasPermission",
- [{ permissionToCheck: permission }, { nodeId: id }])),
- 'Failed to check permission for item ' + id);
- },
-
getDetailedPermissions: function (contentId) {
return umbRequestHelper.resourcePromise(
$http.get(
@@ -597,16 +608,6 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
'Failed to retrieve permissions for content item ' + contentId);
},
- getPermissions: function (nodeIds) {
- return umbRequestHelper.resourcePromise(
- $http.post(
- umbRequestHelper.getApiUrl(
- "contentApiBaseUrl",
- "GetPermissions"),
- nodeIds),
- 'Failed to get permissions');
- },
-
/**
* @ngdoc method
* @name umbraco.resources.contentResource#save
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
index cec9cf191e..56dff12985 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
@@ -266,7 +266,7 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
{
parentId: args.parentId,
id: args.id
- }),
+ }, { responseType: 'text' }),
'Failed to move content');
},
@@ -286,14 +286,14 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
{
parentId: args.parentId,
id: args.id
- }),
+ }, { responseType: 'text' }),
'Failed to copy content');
},
createContainer: function (parentId, name) {
return umbRequestHelper.resourcePromise(
- $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateContainer", { parentId: parentId, name: name })),
+ $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateContainer", { parentId: parentId, name: encodeURIComponent(name) })),
'Failed to create a folder under parent id ' + parentId);
},
@@ -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
+ );
}
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
index 32e9683dd8..e10837ceca 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
@@ -10,6 +10,48 @@ function currentUserResource($q, $http, umbRequestHelper, umbDataFormatter) {
//the factory object returned
return {
+ getPermissions: function (nodeIds) {
+ return umbRequestHelper.resourcePromise(
+ $http.post(
+ umbRequestHelper.getApiUrl(
+ "currentUserApiBaseUrl",
+ "GetPermissions"),
+ nodeIds),
+ 'Failed to get permissions');
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.currentUserResource#hasPermission
+ * @methodOf umbraco.resources.currentUserResource
+ *
+ * @description
+ * Returns true/false given a permission char to check against a nodeID
+ * for the current user
+ *
+ * ##usage
+ *
+ * contentResource.hasPermission('p',1234)
+ * .then(function() {
+ * alert('You are allowed to publish this item');
+ * });
+ *
+ *
+ * @param {String} permission char representing the permission to check
+ * @param {Int} id id of content item to delete
+ * @returns {Promise} resourcePromise object.
+ *
+ */
+ checkPermission: function (permission, id) {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl(
+ "currentUserApiBaseUrl",
+ "HasPermission",
+ [{ permissionToCheck: permission }, { nodeId: id }])),
+ 'Failed to check permission for item ' + id);
+ },
+
saveTourStatus: function (tourStatus) {
if (!tourStatus) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
index 7c18e91364..7c4daedd38 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
@@ -344,7 +344,7 @@ function dataTypeResource($q, $http, umbDataFormatter, umbRequestHelper) {
{
parentId: args.parentId,
id: args.id
- }),
+ }, { responseType: 'text' }),
'Failed to move content');
},
@@ -355,7 +355,7 @@ function dataTypeResource($q, $http, umbDataFormatter, umbRequestHelper) {
umbRequestHelper.getApiUrl(
"dataTypeApiBaseUrl",
"PostCreateContainer",
- { parentId: parentId, name: name })),
+ { parentId: parentId, name: encodeURIComponent(name) })),
'Failed to create a folder under parent id ' + parentId);
},
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index e3af5124f8..6647c6fb7f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -46,7 +46,7 @@ function entityResource($q, $http, umbRequestHelper) {
$http.get(
umbRequestHelper.getApiUrl(
"entityApiBaseUrl",
- "GetSafeAlias", { value: value, camelCase: camelCase })),
+ "GetSafeAlias", { value: encodeURIComponent(value), camelCase: camelCase })),
'Failed to retrieve content type scaffold');
},
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
index 74c2718bad..5d2ac1e8b9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
@@ -112,7 +112,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
{
parentId: args.parentId,
id: args.id
- }),
+ }, {responseType: 'text'}),
'Failed to move media');
},
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
index a98398f3ab..8dc64e4cac 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
@@ -213,7 +213,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
{
parentId: args.parentId,
id: args.id
- }),
+ }, { responseType: 'text' }),
'Failed to move content');
},
@@ -233,7 +233,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
{
parentId: args.parentId,
id: args.id
- }),
+ }, { responseType: 'text' }),
'Failed to copy content');
},
@@ -244,7 +244,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
umbRequestHelper.getApiUrl(
"mediaTypeApiBaseUrl",
"PostCreateContainer",
- { parentId: parentId, name: name })),
+ { parentId: parentId, name: encodeURIComponent(name) })),
'Failed to create a folder under parent id ' + parentId);
},
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js
index b3488fdff4..4f71c1d1b4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js
@@ -7,6 +7,6 @@
$http.get(url),
'Failed to retrieve content types'
);
- },
+ }
};
});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
index d04cfb1911..34dde7eb4b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
@@ -9,6 +9,20 @@
function angularHelper($log, $q) {
return {
+ /**
+ * Method used to re-run the $parsers for a given ngModel
+ * @param {} scope
+ * @param {} ngModel
+ * @returns {}
+ */
+ revalidateNgModel: function (scope, ngModel) {
+ this.safeApply(scope, function() {
+ angular.forEach(ngModel.$parsers, function (parser) {
+ parser(ngModel.$viewValue);
+ });
+ });
+ },
+
/**
* Execute a list of promises sequentially. Unlike $q.all which executes all promises at once, this will execute them in sequence.
* @param {} promises
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js b/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
index 2369af54b5..085ba52b7e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
+++ b/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;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index 8c1e42b0b6..16d6cc20c9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -7,19 +7,25 @@
**/
function contentEditingHelper(fileManager, $q, $location, $routeParams, notificationsService, navigationService, localizationService, serverValidationManager, dialogService, formHelper, appState) {
- function isValidIdentifier(id){
+ function isValidIdentifier(id) {
+
//empty id <= 0
- if(angular.isNumber(id) && id > 0){
- return true;
+ if (angular.isNumber(id)) {
+ if (id === 0) {
+ return false;
+ }
+ if (id > 0) {
+ return true;
+ }
}
//empty guid
- if(id === "00000000-0000-0000-0000-000000000000"){
+ if (id === "00000000-0000-0000-0000-000000000000") {
return false;
}
//empty string / alias
- if(id === ""){
+ if (id === "") {
return false;
}
@@ -44,6 +50,9 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
if (!args.saveMethod) {
throw "args.saveMethod is not defined";
}
+ if (args.showNotifications === undefined) {
+ args.showNotifications = true;
+ }
var redirectOnSuccess = args.redirectOnSuccess !== undefined ? args.redirectOnSuccess : true;
var redirectOnFailure = args.redirectOnFailure !== undefined ? args.redirectOnFailure : true;
@@ -66,7 +75,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
scope: args.scope,
savedContent: data,
redirectOnSuccess: redirectOnSuccess,
- rebindCallback: function() {
+ rebindCallback: function () {
rebindCallback.apply(self, [args.content, data]);
}
});
@@ -76,13 +85,14 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}, function (err) {
self.handleSaveError({
+ showNotifications: args.showNotifications,
redirectOnFailure: redirectOnFailure,
err: err,
- rebindCallback: function() {
+ rebindCallback: function () {
rebindCallback.apply(self, [args.content, err.data]);
}
});
-
+
args.scope.busy = false;
return $q.reject(err);
});
@@ -90,9 +100,9 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
else {
return $q.reject();
}
-
+
},
-
+
/** Used by the content editor and media editor to add an info tab to the tabs array (normally known as the properties tab) */
addInfoTab: function (tabs) {
@@ -165,7 +175,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
handler: args.methods.sendToPublish,
hotKey: "ctrl+p",
hotKeyWhenHidden: true,
- alias: "sendToPublish"
+ alias: "sendToPublish"
};
case "A":
//save
@@ -175,7 +185,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
handler: args.methods.save,
hotKey: "ctrl+s",
hotKeyWhenHidden: true,
- alias: "save"
+ alias: "save"
};
case "Z":
//unpublish
@@ -185,7 +195,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
handler: args.methods.unPublish,
hotKey: "ctrl+u",
hotKeyWhenHidden: true,
- alias: "unpublish"
+ alias: "unpublish"
};
default:
return null;
@@ -247,15 +257,15 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
// If we have a scheduled publish or unpublish date change the default button to
// "save" and update the label to "save and schedule
- if(args.content.releaseDate || args.content.removeDate) {
+ if (args.content.releaseDate || args.content.removeDate) {
// if save button is alread the default don't change it just update the label
if (buttons.defaultButton && buttons.defaultButton.letter === "A") {
buttons.defaultButton.labelKey = "buttons_saveAndSchedule";
return;
}
-
- if(buttons.defaultButton && buttons.subButtons && buttons.subButtons.length > 0) {
+
+ if (buttons.defaultButton && buttons.subButtons && buttons.subButtons.length > 0) {
// save a copy of the default so we can push it to the sub buttons later
var defaultButtonCopy = angular.copy(buttons.defaultButton);
var newSubButtons = [];
@@ -289,7 +299,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
* @function
*
* @description
- * Returns all propertes contained for the content item (since the normal model has properties contained inside of tabs)
+ * Returns all propertes contained for the tabbed content item
*/
getAllProps: function (content) {
var allProps = [];
@@ -313,66 +323,66 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
* @description
* Returns a letter array for buttons, with the primary one first based on content model, permissions and editor state
*/
- getAllowedActions : function(content, creating){
+ getAllowedActions: function (content, creating) {
- //This is the ideal button order but depends on circumstance, we'll use this array to create the button list
- // Publish, SendToPublish, Save
- var actionOrder = ["U", "H", "A"];
- var defaultActions;
- var actions = [];
+ //This is the ideal button order but depends on circumstance, we'll use this array to create the button list
+ // Publish, SendToPublish, Save
+ var actionOrder = ["U", "H", "A"];
+ var defaultActions;
+ var actions = [];
- //Create the first button (primary button)
- //We cannot have the Save or SaveAndPublish buttons if they don't have create permissions when we are creating a new item.
- if (!creating || _.contains(content.allowedActions, "C")) {
- for (var b in actionOrder) {
- if (_.contains(content.allowedActions, actionOrder[b])) {
- defaultAction = actionOrder[b];
- break;
- }
+ //Create the first button (primary button)
+ //We cannot have the Save or SaveAndPublish buttons if they don't have create permissions when we are creating a new item.
+ if (!creating || _.contains(content.allowedActions, "C")) {
+ for (var b in actionOrder) {
+ if (_.contains(content.allowedActions, actionOrder[b])) {
+ defaultAction = actionOrder[b];
+ break;
+ }
+ }
+ }
+
+ actions.push(defaultAction);
+
+ //Now we need to make the drop down button list, this is also slightly tricky because:
+ //We cannot have any buttons if there's no default button above.
+ //We cannot have the unpublish button (Z) when there's no publish permission.
+ //We cannot have the unpublish button (Z) when the item is not published.
+ if (defaultAction) {
+ //get the last index of the button order
+ var lastIndex = _.indexOf(actionOrder, defaultAction);
+
+ //add the remaining
+ for (var i = lastIndex + 1; i < actionOrder.length; i++) {
+ if (_.contains(content.allowedActions, actionOrder[i])) {
+ actions.push(actionOrder[i]);
}
}
- actions.push(defaultAction);
-
- //Now we need to make the drop down button list, this is also slightly tricky because:
- //We cannot have any buttons if there's no default button above.
- //We cannot have the unpublish button (Z) when there's no publish permission.
- //We cannot have the unpublish button (Z) when the item is not published.
- if (defaultAction) {
- //get the last index of the button order
- var lastIndex = _.indexOf(actionOrder, defaultAction);
-
- //add the remaining
- for (var i = lastIndex + 1; i < actionOrder.length; i++) {
- if (_.contains(content.allowedActions, actionOrder[i])) {
- actions.push(actionOrder[i]);
- }
- }
-
- //if we are not creating, then we should add unpublish too,
- // so long as it's already published and if the user has access to publish
- if (!creating) {
- if (content.publishDate && _.contains(content.allowedActions,"U")) {
- actions.push("Z");
- }
+ //if we are not creating, then we should add unpublish too,
+ // so long as it's already published and if the user has access to publish
+ if (!creating) {
+ if (content.publishDate && _.contains(content.allowedActions, "U")) {
+ actions.push("Z");
}
}
+ }
- return actions;
- },
+ return actions;
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.contentEditingHelper#getButtonFromAction
- * @methodOf umbraco.services.contentEditingHelper
- * @function
- *
- * @description
- * Returns a button object to render a button for the tabbed editor
- * currently only returns built in system buttons for content and media actions
- * returns label, alias, action char and hot-key
- */
- getButtonFromAction : function(ch){
+ /**
+ * @ngdoc method
+ * @name umbraco.services.contentEditingHelper#getButtonFromAction
+ * @methodOf umbraco.services.contentEditingHelper
+ * @function
+ *
+ * @description
+ * Returns a button object to render a button for the tabbed editor
+ * currently only returns built in system buttons for content and media actions
+ * returns label, alias, action char and hot-key
+ */
+ getButtonFromAction: function (ch) {
switch (ch) {
case "U":
return {
@@ -407,7 +417,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
return null;
}
- },
+ },
+
/**
* @ngdoc method
* @name umbraco.services.contentEditingHelper#reBindChangedProperties
@@ -415,26 +426,19 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
* @function
*
* @description
- * re-binds all changed property values to the origContent object from the savedContent object and returns an array of changed properties.
+ * Re-binds all changed property values to the origContent object from the savedContent object and returns an array of changed properties.
+ * This re-binds both normal object property values along with content property values and works for content, media and members.
+ * For variant content, this detects if the object contains the 'variants' property (i.e. for content) and re-binds all variant content properties.
+ * This returns the list of changed content properties (does not include standard object property changes).
*/
reBindChangedProperties: function (origContent, savedContent) {
- var changed = [];
-
- //get a list of properties since they are contained in tabs
- var allOrigProps = this.getAllProps(origContent);
- var allNewProps = this.getAllProps(savedContent);
-
- function getNewProp(alias) {
- return _.find(allNewProps, function (item) {
- return item.alias === alias;
- });
- }
+ //TODO: We should probably split out this logic to deal with media/members seperately to content
//a method to ignore built-in prop changes
- var shouldIgnore = function(propName) {
+ var shouldIgnore = function (propName) {
return _.some([
- "tabs",
+ "variants",
"notifications",
"ModelState",
"tabs",
@@ -450,13 +454,14 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
"removeDateMonth",
"removeDateDayNumber",
"removeDateDay",
- "removeDateTime",
+ "removeDateTime"
], function (i) {
return i === propName;
});
};
- //check for changed built-in properties of the content
- for (var o in origContent) {
+
+ //check for changed built-in properties of the content based on the server response object
+ for (var o in savedContent) {
//ignore the ones listed in the array
if (shouldIgnore(o)) {
@@ -468,24 +473,95 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}
}
- //check for changed properties of the content
- for (var p in allOrigProps) {
- var newProp = getNewProp(allOrigProps[p].alias);
- if (newProp && !_.isEqual(allOrigProps[p].value, newProp.value)) {
+ //Now re-bind content properties. Since content has variants and media/members doesn't,
+ //we'll detect the variants property for content to distinguish if it's content vs media/members.
- //they have changed so set the origContent prop to the new one
- var origVal = allOrigProps[p].value;
- allOrigProps[p].value = newProp.value;
+ var isContent = false;
- //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)) {
- //send the newVal + oldVal
- allOrigProps[p].onValueChanged(allOrigProps[p].value, origVal);
+ var origVariants = [];
+ var savedVariants = [];
+ if (origContent.variants) {
+ isContent = true;
+ //it's contnet so assign the variants as they exist
+ origVariants = origContent.variants;
+ savedVariants = savedContent.variants;
+ }
+ else {
+ //it's media/member, so just add the object as-is to the variants collection
+ origVariants.push(origContent);
+ savedVariants.push(savedContent);
+ }
+
+ var changed = [];
+
+ function getNewProp(alias, allNewProps) {
+ return _.find(allNewProps, function (item) {
+ return item.alias === alias;
+ });
+ }
+
+ //loop through each variant (i.e. tabbed content)
+ for (var j = 0; j < origVariants.length; j++) {
+
+ var origVariant = origVariants[j];
+ var savedVariant = savedVariants[j];
+
+ //special case for content, don't sync this variant if it wasn't tagged
+ //for saving in the first place
+ if (!origVariant.save) {
+ continue;
+ }
+
+ //if it's content (not media/members), then we need to sync the variant specific data
+ if (origContent.variants) {
+
+ //the variant property names we need to sync
+ var variantPropertiesSync = ["state"];
+
+ //loop through the properties returned on the server object
+ for (var b in savedVariant) {
+
+ var shouldCompare = _.some(variantPropertiesSync, function (e) {
+ return e === b;
+ });
+
+ //only compare the explicit ones or ones we don't ignore
+ if (shouldCompare || !shouldIgnore(b)) {
+ if (!_.isEqual(origVariant[b], savedVariant[b])) {
+ origVariant[b] = savedVariant[b];
+ }
+ }
+ }
+ }
+
+ //get a list of properties since they are contained in tabs
+ var allOrigProps = this.getAllProps(origVariant);
+ var allNewProps = this.getAllProps(savedVariant);
+
+ //check for changed properties of the content
+ for (var k = 0; k < allOrigProps.length; k++) {
+
+ var origProp = allOrigProps[k];
+ var alias = origProp.alias;
+ var newProp = getNewProp(alias, allNewProps);
+ if (newProp && !_.isEqual(origProp.value, newProp.value)) {
+
+ //they have changed so set the origContent prop to the new one
+ 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(origProp.onValueChanged)) {
+ //send the newVal + oldVal
+ origProp.onValueChanged(origProp.value, origVal);
+ }
+
+ changed.push(origProp);
}
- changed.push(allOrigProps[p]);
}
}
@@ -521,6 +597,13 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
//wire up the server validation errs
formHelper.handleServerValidation(args.err.data.ModelState);
+ //add model state errors to notifications
+ if (args.showNotifications) {
+ for (var e in modelState) {
+ notificationsService.error("Validation", modelState[e][0]);
+ }
+ }
+
if (!args.redirectOnFailure || !this.redirectToCreatedContent(args.err.data.id, args.err.data.ModelState)) {
//we are not redirecting because this is not new content, it is existing content. In this case
// we need to detect what properties have changed and re-bind them with the server data. Then we need
@@ -530,7 +613,10 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
args.rebindCallback();
}
- serverValidationManager.executeAndClearAllSubscriptions();
+ //notify all validators (don't clear the server validations though since we need to maintain their state because of
+ // how the variant switcher works in content). server validation state is always cleared when an editor first loads
+ // and in theory when an editor is destroyed.
+ serverValidationManager.notify();
}
//indicates we've handled the server result
@@ -562,7 +648,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
// the default behaviour is to redirect on success. This adds option to prevent when false
args.redirectOnSuccess = args.redirectOnSuccess !== undefined ? args.redirectOnSuccess : true;
-
+
if (!args.redirectOnSuccess || !this.redirectToCreatedContent(args.redirectId ? args.redirectId : args.savedContent.id)) {
//we are not redirecting because this is not new content, it is existing content. In this case
@@ -587,9 +673,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
*/
redirectToCreatedContent: function (id, modelState) {
- //only continue if we are currently in create mode and not in infinite mode and if there is no 'Name' modelstate errors
- // since we need at least a name to create content.
- if ($routeParams.create && (isValidIdentifier(id) && (!modelState || !modelState["Name"]))) {
+ //only continue if we are currently in create mode and not in infinite mode and if the resulting ID is valid
+ if ($routeParams.create && (isValidIdentifier(id))) {
//need to change the location to not be in 'create' mode. Currently the route will be something like:
// /belle/#/content/edit/1234?doctype=newsArticle&create=true
@@ -600,7 +685,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
navigationService.clearSearch();
//change to new path
- $location.path("/" + $routeParams.section + "/" + $routeParams.tree + "/" + $routeParams.method + "/" + id);
+ $location.path("/" + $routeParams.section + "/" + $routeParams.tree + "/" + $routeParams.method + "/" + id);
//don't add a browser history for this
$location.replace();
return true;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 0bbfe34fe1..453785f537 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -102,6 +102,82 @@
open(editor);
}
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#copy
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens a copy editor in infinite editing, the submit callback returns an array of selected items
+ * @param {String} editor.section The node entity type
+ * @param {String} editor.currentNode The current node id
+ * @param {Callback} editor.submit Saves, submits, and closes the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+
+ function copy(editor) {
+ editor.view = "views/common/infiniteeditors/copy/copy.html";
+ editor.size = "small";
+ open(editor);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#move
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens a move editor in infinite editing.
+ * @param {String} editor.section The node entity type
+ * @param {String} editor.currentNode The current node id
+ * @param {Callback} editor.submit Saves, submits, and closes the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+
+ function move(editor) {
+ editor.view = "views/common/infiniteeditors/move/move.html";
+ editor.size = "small";
+ open(editor);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#embed
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens an embed editor in infinite editing.
+ * @param {Callback} editor.submit Saves, submits, and closes the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+
+ function embed(editor) {
+ editor.view = "views/common/infiniteeditors/embed/embed.html";
+ editor.size = "small";
+ open(editor);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#linkPicker
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens an embed editor in infinite editing.
+ * @param {Callback} editor.submit Saves, submits, and closes the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+
+ function linkPicker(editor) {
+ editor.view = "views/common/infiniteeditors/linkpicker/linkpicker.html";
+ editor.size = "small";
+ open(editor);
+ }
+
/**
* @ngdoc method
* @name umbraco.services.editorService#mediaEditor
@@ -232,6 +308,23 @@
open(editor);
}
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#templateEditor
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens the user group picker in infinite editing, the submit callback returns the saved template
+ * @param {String} editor.id The template id
+ * @param {Callback} editor.submit Submits the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+ function templateEditor(editor) {
+ editor.view = "views/templates/edit.html";
+ open(editor);
+ }
+
/**
* @ngdoc method
* @name umbraco.services.editorService#sectionPicker
@@ -249,6 +342,40 @@
open(editor);
}
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#insertField
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens the insert field editor in infinite editing, the submit callback returns the code snippet
+ * @param {Callback} editor.submit Submits the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+ function insertField(editor) {
+ editor.view = "views/common/infiniteeditors/insertfield/insertfield.html";
+ editor.size = "small";
+ open(editor);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#templateSections
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens the template sections editor in infinite editing, the submit callback returns the type to insert
+ * @param {Callback} editor.submit Submits the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+ function templateSections(editor) {
+ editor.view = "views/common/infiniteeditors/templatesections/templatesections.html";
+ editor.size = "small";
+ open(editor);
+ }
+
/**
* @ngdoc method
* @name umbraco.services.editorService#sectionPicker
@@ -266,6 +393,63 @@
open(editor);
}
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#itemPicker
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens the section picker in infinite editing, the submit callback returns an array of the selected items
+ *
+ * @param {Array} editor.availableItems Array of available items.
+ * @param {Array} editor.selectedItems Array of selected items. When passed in the selected items will be filtered from the available items.
+ * @param {Boolean} editor.filter Set to false to hide the filter.
+ * @param {Callback} editor.submit Submits the editor.
+ * @param {Callback} editor.close Closes the editor.
+ * @returns {Object} editor object
+ */
+ function itemPicker(editor) {
+ editor.view = "views/common/infiniteeditors/itempicker/itempicker.html";
+ editor.size = "small";
+ open(editor);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#macroPicker
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens a macro picker in infinite editing, the submit callback returns an array of the selected items
+ *
+ * @param {Callback} editor.submit Submits the editor.
+ * @param {Callback} editor.close Closes the editor.
+ * @returns {Object} editor object
+ */
+ function macroPicker(editor) {
+ editor.view = "views/common/infiniteeditors/macropicker/macropicker.html";
+ editor.size = "small";
+ open(editor);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#macroPicker
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens a member group picker in infinite editing.
+ *
+ * @param {Callback} editor.submit Submits the editor.
+ * @param {Callback} editor.close Closes the editor.
+ * @returns {Object} editor object
+ */
+ function memberGroupPicker(editor) {
+ editor.view = "views/common/infiniteeditors/membergrouppicker/membergrouppicker.html";
+ editor.size = "small";
+ open(editor);
+ }
+
var service = {
getEditors: getEditors,
open: open,
@@ -273,6 +457,10 @@
mediaEditor: mediaEditor,
contentEditor: contentEditor,
contentPicker: contentPicker,
+ copy: copy,
+ move: move,
+ embed: embed,
+ linkPicker: linkPicker,
mediaPicker: mediaPicker,
iconPicker: iconPicker,
documentTypeEditor: documentTypeEditor,
@@ -282,8 +470,14 @@
nodePermissions: nodePermissions,
insertCodeSnippet: insertCodeSnippet,
userGroupPicker: userGroupPicker,
+ templateEditor: templateEditor,
sectionPicker: sectionPicker,
- userPicker: userPicker
+ insertField: insertField,
+ templateSections: templateSections,
+ userPicker: userPicker,
+ itemPicker: itemPicker,
+ macroPicker: macroPicker,
+ memberGroupPicker: memberGroupPicker
};
return service;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js b/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
index 5983f82e0f..6d319ad90a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
@@ -23,14 +23,33 @@ function fileManager() {
* Attaches files to the current manager for the current editor for a particular property, if an empty array is set
* for the files collection that effectively clears the files for the specified editor.
*/
- setFiles: function(propertyAlias, files) {
- //this will clear the files for the current property and then add the new ones for the current property
+ setFiles: function (args) {
+
+ //propertyAlias, files
+ if (!angular.isString(args.propertyAlias)) {
+ throw "args.propertyAlias must be a non empty string";
+ }
+ if (!angular.isObject(args.files)) {
+ throw "args.files must be an object";
+ }
+
+ //normalize to null
+ if (!args.culture) {
+ args.culture = null;
+ }
+
+ var metaData = [];
+ if (angular.isArray(args.metaData)) {
+ metaData = args.metaData;
+ }
+
+ //this will clear the files for the current property/culture and then add the new ones for the current property
fileCollection = _.reject(fileCollection, function (item) {
- return item.alias === propertyAlias;
+ return item.alias === args.propertyAlias && (!args.culture || args.culture === item.culture);
});
- for (var i = 0; i < files.length; i++) {
+ for (var i = 0; i < args.files.length; i++) {
//save the file object to the files collection
- fileCollection.push({ alias: propertyAlias, file: files[i] });
+ fileCollection.push({ alias: args.propertyAlias, file: args.files[i], culture: args.culture, metaData: metaData });
}
},
@@ -62,4 +81,4 @@ function fileManager() {
};
}
-angular.module('umbraco.services').factory('fileManager', fileManager);
\ No newline at end of file
+angular.module('umbraco.services').factory('fileManager', fileManager);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
index ac90a0d333..c019258a02 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
@@ -116,7 +116,7 @@ function formHelper(angularHelper, serverValidationManager, $timeout, notificati
this.handleServerValidation(err.data.ModelState);
//execute all server validation events and subscribers
- serverValidationManager.executeAndClearAllSubscriptions();
+ serverValidationManager.notifyAndClearAllSubscriptions();
}
else {
dialogService.ysodDialog(err);
@@ -145,15 +145,15 @@ function formHelper(angularHelper, serverValidationManager, $timeout, notificati
// that each property is a User Developer property editor.
// The way that Content Type Editor ModelState is created is simply based on the ASP.Net validation data-annotations
// system.
- // So, to do this (since we need to support backwards compat), we need to hack a little bit. For Content Properties,
- // which are user defined, we know that they will exist with a prefixed ModelState of "_Properties.", so if we detect
- // this, then we know it's a Property.
+ // So, to do this there's some special ModelState syntax we need to know about.
+ // For Content Properties, which are user defined, we know that they will exist with a prefixed
+ // ModelState of "_Properties.", so if we detect this, then we know it's for a content Property.
//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
- //There will always be at least 2 parts for properties since all model errors for properties are prefixed with "Properties"
- //If it is not prefixed with "Properties" that means the error is for a field of the object directly.
+ //There will always be at least 3 parts for content properties since all model errors for properties are prefixed with "_Properties"
+ //If it is not prefixed with "_Properties" that means the error is for a field of the object directly.
var parts = e.split(".");
@@ -163,14 +163,23 @@ function formHelper(angularHelper, serverValidationManager, $timeout, notificati
var propertyAlias = parts[1];
- //if it contains 2 '.' then we will wire it up to a property's field
+ 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) {
//add an error with a reference to the field for which the validation belongs too
- serverValidationManager.addPropertyError(propertyAlias, parts[2], modelState[e][0]);
+ serverValidationManager.addPropertyError(propertyAlias, culture, parts[3], modelState[e][0]);
}
else {
- //add a generic error for the property, no reference to a specific field
- serverValidationManager.addPropertyError(propertyAlias, "", modelState[e][0]);
+ //add a generic error for the property, no reference to a specific html field
+ serverValidationManager.addPropertyError(propertyAlias, culture, "", modelState[e][0]);
}
}
@@ -181,9 +190,6 @@ function formHelper(angularHelper, serverValidationManager, $timeout, notificati
serverValidationManager.addFieldError(e, modelState[e][0]);
}
- //add to notifications
- notificationsService.error("Validation", modelState[e][0]);
-
}
}
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
index 1de992d9db..ff8d487bb7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
@@ -3,7 +3,7 @@ angular.module('umbraco.services')
var helpTopics = {};
var defaultUrl = "https://our.umbraco.com/rss/help";
- var tvUrl = "http://umbraco.tv/feeds/help";
+ var tvUrl = "https://umbraco.tv/feeds/help";
function getCachedHelp(url){
if(helpTopics[url]){
@@ -85,4 +85,4 @@ angular.module('umbraco.services')
return service;
- });
\ No newline at end of file
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index 42b739fe61..6862b11565 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -497,7 +497,7 @@
});
//we need to use 'apply' to call intersection with an array of arrays,
- //see: http://stackoverflow.com/a/16229480/694494
+ //see: https://stackoverflow.com/a/16229480/694494
var intersectPermissions = _.intersection.apply(_, arr);
return {
@@ -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)
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 636437e387..5db9e9c77e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -4,7 +4,7 @@
* @description A helper object used for dealing with media items
**/
function mediaHelper(umbRequestHelper) {
-
+
//container of fileresolvers
var _mediaFileResolvers = {};
@@ -45,7 +45,7 @@ function mediaHelper(umbRequestHelper) {
//this performs a simple check to see if we have a media file as value
//it doesnt catch everything, but better then nothing
- if (angular.isString(item.value) && item.value.indexOf(mediaRoot) === 0) {
+ if (angular.isString(item.value) && item.value.indexOf(mediaRoot) === 0) {
return true;
}
@@ -75,7 +75,7 @@ function mediaHelper(umbRequestHelper) {
return "";
},
-
+
/**
* @ngdoc function
* @name umbraco.services.mediaHelper#getImagePropertyValue
@@ -125,7 +125,7 @@ function mediaHelper(umbRequestHelper) {
return "";
},
- registerFileResolver: function(propertyEditorAlias, func){
+ registerFileResolver: function (propertyEditorAlias, func) {
_mediaFileResolvers[propertyEditorAlias] = func;
},
@@ -141,8 +141,8 @@ function mediaHelper(umbRequestHelper) {
* @param {object} mediaEntity A media Entity returned from the entityResource
* @param {boolean} thumbnail Whether to return the thumbnail url or normal url
*/
- resolveFileFromEntity : function(mediaEntity, thumbnail) {
-
+ resolveFileFromEntity: function (mediaEntity, thumbnail) {
+
if (!angular.isObject(mediaEntity.metaData)) {
throw "Cannot resolve the file url from the mediaEntity, it does not contain the required metaData";
}
@@ -179,67 +179,67 @@ function mediaHelper(umbRequestHelper) {
* @param {boolean} thumbnail Whether to return the thumbnail url or normal url
*/
/*jshint loopfunc: true */
- resolveFile : function(mediaItem, thumbnail){
-
- function iterateProps(props){
+ resolveFile: function (mediaItem, thumbnail) {
+
+ function iterateProps(props) {
var res = null;
- for(var resolver in _mediaFileResolvers) {
- var property = _.find(props, function(prop){ return prop.editor === resolver; });
- if(property){
+ for (var resolver in _mediaFileResolvers) {
+ var property = _.find(props, function (prop) { return prop.editor === resolver; });
+ if (property) {
res = _mediaFileResolvers[resolver](property, mediaItem, thumbnail);
break;
}
}
- return res;
+ return res;
}
//we either have properties raw on the object, or spread out on tabs
var result = "";
- if(mediaItem.properties){
+ if (mediaItem.properties) {
result = iterateProps(mediaItem.properties);
- }else if(mediaItem.tabs){
- for(var tab in mediaItem.tabs) {
- if(mediaItem.tabs[tab].properties){
+ } else if (mediaItem.tabs) {
+ for (var tab in mediaItem.tabs) {
+ if (mediaItem.tabs[tab].properties) {
result = iterateProps(mediaItem.tabs[tab].properties);
- if(result){
+ if (result) {
break;
}
}
}
}
- return result;
+ return result;
},
/*jshint loopfunc: true */
- hasFilePropertyType : function(mediaItem){
- function iterateProps(props){
- var res = false;
- for(var resolver in _mediaFileResolvers) {
- var property = _.find(props, function(prop){ return prop.editor === resolver; });
- if(property){
- res = true;
- break;
- }
- }
- return res;
- }
+ hasFilePropertyType: function (mediaItem) {
+ function iterateProps(props) {
+ var res = false;
+ for (var resolver in _mediaFileResolvers) {
+ var property = _.find(props, function (prop) { return prop.editor === resolver; });
+ if (property) {
+ res = true;
+ break;
+ }
+ }
+ return res;
+ }
- //we either have properties raw on the object, or spread out on tabs
- var result = false;
- if(mediaItem.properties){
- result = iterateProps(mediaItem.properties);
- }else if(mediaItem.tabs){
- for(var tab in mediaItem.tabs) {
- if(mediaItem.tabs[tab].properties){
- result = iterateProps(mediaItem.tabs[tab].properties);
- if(result){
- break;
- }
- }
- }
- }
- return result;
+ //we either have properties raw on the object, or spread out on tabs
+ var result = false;
+ if (mediaItem.properties) {
+ result = iterateProps(mediaItem.properties);
+ } else if (mediaItem.tabs) {
+ for (var tab in mediaItem.tabs) {
+ if (mediaItem.tabs[tab].properties) {
+ result = iterateProps(mediaItem.tabs[tab].properties);
+ if (result) {
+ break;
+ }
+ }
+ }
+ }
+ return result;
},
/**
@@ -307,10 +307,7 @@ function mediaHelper(umbRequestHelper) {
var thumbnailUrl = umbRequestHelper.getApiUrl(
"imagesApiBaseUrl",
"GetBigThumbnail",
- [{ originalImagePath: imagePath }]);
-
- //var ext = imagePath.substr(imagePath.lastIndexOf('.'));
- //return imagePath.substr(0, imagePath.lastIndexOf('.')) + "_big-thumb" + ".jpg";
+ [{ originalImagePath: imagePath }]) + '&rnd=' + Math.random();
return thumbnailUrl;
},
@@ -331,7 +328,7 @@ function mediaHelper(umbRequestHelper) {
if (!imagePath) {
return false;
}
-
+
var lowered = imagePath.toLowerCase();
var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
return ("," + Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes + ",").indexOf("," + ext + ",") !== -1;
@@ -348,22 +345,26 @@ function mediaHelper(umbRequestHelper) {
*
* @param {string} file types, ex: jpg,png,tiff
*/
- formatFileTypes: function(fileTypes) {
+ formatFileTypes: function (fileTypes) {
- var fileTypesArray = fileTypes.split(',');
- var newFileTypesArray = [];
+ var fileTypesArray = fileTypes.split(',');
+ var newFileTypesArray = [];
- for (var i = 0; i < fileTypesArray.length; i++) {
- var fileType = fileTypesArray[i];
+ for (var i = 0; i < fileTypesArray.length; i++) {
+ var fileType = fileTypesArray[i].trim();
- if (fileType.indexOf(".") !== 0) {
- fileType = ".".concat(fileType);
- }
+ if (!fileType) {
+ continue;
+ }
- newFileTypesArray.push(fileType);
- }
+ if (fileType.indexOf(".") !== 0) {
+ fileType = ".".concat(fileType);
+ }
- return newFileTypesArray.join(",");
+ newFileTypesArray.push(fileType);
+ }
+
+ return newFileTypesArray.join(",");
},
@@ -378,7 +379,7 @@ function mediaHelper(umbRequestHelper) {
*
* @param {string} filePath File path, ex /media/1234/my-image.jpg
*/
- getFileExtension: function(filePath) {
+ getFileExtension: function (filePath) {
if (!filePath) {
return false;
@@ -388,6 +389,6 @@ function mediaHelper(umbRequestHelper) {
var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
return ext;
}
-
+
};
-}angular.module('umbraco.services').factory('mediaHelper', mediaHelper);
+} angular.module('umbraco.services').factory('mediaHelper', mediaHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 5cc0b9bb1e..13940b5124 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -28,6 +28,8 @@ function navigationService($rootScope, $route, $routeParams, $log, $location, $q
navReadyPromise.resolve(mainTreeApi);
});
+ //A list of query strings defined that when changed will not cause a reload of the route
+ var nonRoutingQueryStrings = ["mculture", "cculture"];
//used to track the current dialog object
var currentDialog = null;
@@ -91,8 +93,85 @@ function navigationService($rootScope, $route, $routeParams, $log, $location, $q
}
}
+ /**
+ * Converts a string request path to a dictionary of route params
+ * @param {any} requestPath
+ */
+ function pathToRouteParts(requestPath) {
+ if (!angular.isString(requestPath)) {
+ throw "The value for requestPath is not a string";
+ }
+ var pathAndQuery = requestPath.split("#")[1];
+ if (pathAndQuery) {
+ if (pathAndQuery.indexOf("%253") || pathAndQuery.indexOf("%252")) {
+ pathAndQuery = decodeURIComponent(pathAndQuery);
+ }
+ var pathParts = pathAndQuery.split("?");
+ var path = pathParts[0];
+ var qry = pathParts.length === 1 ? "" : pathParts[1];
+ var qryParts = qry.split("&");
+ var result = {
+ path: path
+ };
+ for (var i = 0; i < qryParts.length; i++) {
+ var keyVal = qryParts[i].split("=");
+ if (keyVal.length == 2) {
+ result[keyVal[0]] = keyVal[1];
+ }
+ }
+ return result;
+ }
+ }
+
var service = {
+ /**
+ * @ngdoc method
+ * @name umbraco.services.navigationService#isRouteChangingNavigation
+ * @methodOf umbraco.services.navigationService
+ *
+ * @description
+ * Detects if the route param differences will cause a navigation change or if the route param differences are
+ * only tracking state changes.
+ * This is used for routing operations where reloadOnSearch is false and when detecting form dirty changes when navigating to a different page.
+ * @param {object} currUrlParams Either a string path or a dictionary of route parameters
+ * @param {object} nextUrlParams Either a string path or a dictionary of route parameters
+ */
+ isRouteChangingNavigation: function (currUrlParams, nextUrlParams) {
+
+ if (angular.isString(currUrlParams)) {
+ currUrlParams = pathToRouteParts(currUrlParams);
+ }
+
+ if (angular.isString(nextUrlParams)) {
+ nextUrlParams = pathToRouteParts(nextUrlParams);
+ }
+
+ var allowRoute = true;
+
+ //The only time that we want to not route is if only any of the nonRoutingQueryStrings have changed/added.
+ //If any of the other parts have changed we do not cancel
+ var currRoutingKeys = _.difference(_.keys(currUrlParams), nonRoutingQueryStrings);
+ var nextRoutingKeys = _.difference(_.keys(nextUrlParams), nonRoutingQueryStrings);
+ var diff1 = _.difference(currRoutingKeys, nextRoutingKeys);
+ var diff2 = _.difference(nextRoutingKeys, currRoutingKeys);
+
+ //if the routing parameter keys are the same, we'll compare their values to see if any have changed and if so then the routing will be allowed.
+ if (diff1.length === 0 && diff2.length === 0) {
+ var partsChanged = 0;
+ _.each(currRoutingKeys, function (k) {
+ if (currUrlParams[k] != nextUrlParams[k]) {
+ partsChanged++;
+ }
+ });
+ if (partsChanged === 0) {
+ allowRoute = false; //nothing except our query strings changed, so don't continue routing
+ }
+ }
+
+ return allowRoute;
+ },
+
/**
* @ngdoc method
* @name umbraco.services.navigationService#waitForNavReady
@@ -523,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
@@ -544,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") });
}
},
/**
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
index d7e34d0f1c..11e54c0fdb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
@@ -28,11 +28,11 @@ function serverValidationManager($timeout) {
//find errors for this field name
return _.filter(self.items, function (item) {
- return (item.propertyAlias === null && item.fieldName === fieldName);
+ return (item.propertyAlias === null && item.culture === null && item.fieldName === fieldName);
});
}
- function getPropertyErrors(self, propertyAlias, fieldName) {
+ function getPropertyErrors(self, propertyAlias, culture, fieldName) {
if (!angular.isString(propertyAlias)) {
throw "propertyAlias must be a string";
}
@@ -42,15 +42,34 @@ function serverValidationManager($timeout) {
//find all errors for this property
return _.filter(self.items, function (item) {
- return (item.propertyAlias === propertyAlias && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
}
+ function notifyCallbacks(self) {
+ for (var cb in callbacks) {
+ if (callbacks[cb].propertyAlias === null) {
+ //its a field error callback
+ var fieldErrors = getFieldErrors(self, callbacks[cb].fieldName);
+ if (fieldErrors.length > 0) {
+ executeCallback(self, fieldErrors, callbacks[cb].callback);
+ }
+ }
+ else {
+ //its a property error
+ var propErrors = getPropertyErrors(self, callbacks[cb].propertyAlias, callbacks[cb].culture, callbacks[cb].fieldName);
+ if (propErrors.length > 0) {
+ executeCallback(self, propErrors, callbacks[cb].callback);
+ }
+ }
+ }
+ }
+
return {
/**
* @ngdoc function
- * @name umbraco.services.serverValidationManager#subscribe
+ * @name notifyAndClearAllSubscriptions
* @methodOf umbraco.services.serverValidationManager
* @function
*
@@ -63,28 +82,12 @@ function serverValidationManager($timeout) {
* so that any persisted validation errors are re-bound to their controls. Once they are re-binded this then clears the validation
* colleciton so that if another route change occurs, the previously persisted validation errors are not re-bound to the new item.
*/
- executeAndClearAllSubscriptions: function() {
+ notifyAndClearAllSubscriptions: function() {
var self = this;
$timeout(function () {
-
- for (var cb in callbacks) {
- if (callbacks[cb].propertyAlias === null) {
- //its a field error callback
- var fieldErrors = getFieldErrors(self, callbacks[cb].fieldName);
- if (fieldErrors.length > 0) {
- executeCallback(self, fieldErrors, callbacks[cb].callback);
- }
- }
- else {
- //its a property error
- var propErrors = getPropertyErrors(self, callbacks[cb].propertyAlias, callbacks[cb].fieldName);
- if (propErrors.length > 0) {
- executeCallback(self, propErrors, callbacks[cb].callback);
- }
- }
- }
+ notifyCallbacks(self);
//now that they are all executed, we're gonna clear all of the errors we have
self.clear();
});
@@ -92,11 +95,29 @@ function serverValidationManager($timeout) {
/**
* @ngdoc function
- * @name umbraco.services.serverValidationManager#subscribe
+ * @name notify
* @methodOf umbraco.services.serverValidationManager
* @function
*
* @description
+ * This method isn't used very often but can be used if all subscriptions need to be notified again. This can be
+ * handy if a view needs to be reloaded/rebuild like when switching variants in the content editor.
+ */
+ notify: function() {
+ var self = this;
+
+ $timeout(function () {
+ notifyCallbacks(self);
+ });
+ },
+
+ /**
+ * @ngdoc function
+ * @name subscribe
+ * @methodOf umbraco.services.serverValidationManager
+ * @function
+ * @returns {} a method to unsubscribe this callback
+ * @description
* Adds a callback method that is executed whenever validation changes for the field name + property specified.
* This is generally used for server side validation in order to match up a server side validation error with
* a particular field, otherwise we can only pinpoint that there is an error for a content property, not the
@@ -104,52 +125,77 @@ function serverValidationManager($timeout) {
* field alias to listen for.
* If propertyAlias is null, then this subscription is for a field property (not a user defined property).
*/
- subscribe: function (propertyAlias, fieldName, callback) {
+ subscribe: function (propertyAlias, culture, fieldName, callback) {
if (!callback) {
return;
}
-
+
+ var id = String.CreateGuid();
+
if (propertyAlias === null) {
- //don't add it if it already exists
- var exists1 = _.find(callbacks, function (item) {
- return item.propertyAlias === null && item.fieldName === fieldName;
+ callbacks.push({
+ propertyAlias: null,
+ culture: null,
+ fieldName: fieldName,
+ callback: callback,
+ id: id
});
- if (!exists1) {
- callbacks.push({ propertyAlias: null, fieldName: fieldName, callback: callback });
- }
}
else if (propertyAlias !== undefined) {
- //don't add it if it already exists
- var exists2 = _.find(callbacks, function (item) {
- return item.propertyAlias === propertyAlias && item.fieldName === fieldName;
- });
- if (!exists2) {
- callbacks.push({ propertyAlias: propertyAlias, fieldName: fieldName, callback: callback });
+ //normalize culture to null
+ if (!culture) {
+ culture = null;
}
+ callbacks.push({
+ propertyAlias: propertyAlias,
+ culture: culture, fieldName: fieldName,
+ callback: callback,
+ id: id
+ });
}
+
+ function unsubscribeId() {
+ //remove all callbacks for the content field
+ callbacks = _.reject(callbacks, function (item) {
+ return item.id === id;
+ });
+ }
+
+ //return a function to unsubscribe this subscription by uniqueId
+ return unsubscribeId;
},
-
- unsubscribe: function (propertyAlias, fieldName) {
+
+ /**
+ * Removes all callbacks registered for the propertyALias, culture and fieldName combination
+ * @param {} propertyAlias
+ * @param {} culture
+ * @param {} fieldName
+ * @returns {}
+ */
+ unsubscribe: function (propertyAlias, culture, fieldName) {
if (propertyAlias === null) {
//remove all callbacks for the content field
callbacks = _.reject(callbacks, function (item) {
- return item.propertyAlias === null && item.fieldName === fieldName;
+ return item.propertyAlias === null && item.culture === null && item.fieldName === fieldName;
});
}
else if (propertyAlias !== undefined) {
-
+
+ //normalize culture to null
+ if (!culture) {
+ culture = null;
+ }
+
//remove all callbacks for the content property
callbacks = _.reject(callbacks, function (item) {
- return item.propertyAlias === propertyAlias &&
+ return item.propertyAlias === propertyAlias && item.culture === culture &&
(item.fieldName === fieldName ||
((item.fieldName === undefined || item.fieldName === "") && (fieldName === undefined || fieldName === "")));
});
}
-
-
},
@@ -164,10 +210,16 @@ function serverValidationManager($timeout) {
* This will always return any callbacks registered for just the property (i.e. field name is empty) and for ones with an
* explicit field name set.
*/
- getPropertyCallbacks: function (propertyAlias, fieldName) {
+ getPropertyCallbacks: function (propertyAlias, culture, fieldName) {
+
+ //normalize culture to null
+ if (!culture) {
+ culture = null;
+ }
+
var found = _.filter(callbacks, function (item) {
//returns any callback that have been registered directly against the field and for only the property
- return (item.propertyAlias === propertyAlias && (item.fieldName === fieldName || (item.fieldName === undefined || item.fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (item.fieldName === undefined || item.fieldName === "")));
});
return found;
},
@@ -184,7 +236,7 @@ function serverValidationManager($timeout) {
getFieldCallbacks: function (fieldName) {
var found = _.filter(callbacks, function (item) {
//returns any callback that have been registered directly against the field
- return (item.propertyAlias === null && item.fieldName === fieldName);
+ return (item.propertyAlias === null && item.culture === null && item.fieldName === fieldName);
});
return found;
},
@@ -207,6 +259,7 @@ function serverValidationManager($timeout) {
if (!this.hasFieldError(fieldName)) {
this.items.push({
propertyAlias: null,
+ culture: null,
fieldName: fieldName,
errorMsg: errorMsg
});
@@ -231,24 +284,30 @@ function serverValidationManager($timeout) {
* @description
* Adds an error message for the content property
*/
- addPropertyError: function (propertyAlias, fieldName, errorMsg) {
+ addPropertyError: function (propertyAlias, culture, fieldName, errorMsg) {
if (!propertyAlias) {
return;
}
-
+
+ //normalize culture to null
+ if (!culture) {
+ culture = null;
+ }
+
//only add the item if it doesn't exist
- if (!this.hasPropertyError(propertyAlias, fieldName)) {
+ if (!this.hasPropertyError(propertyAlias, culture, fieldName)) {
this.items.push({
propertyAlias: propertyAlias,
+ culture: culture,
fieldName: fieldName,
errorMsg: errorMsg
});
}
//find all errors for this item
- var errorsForCallback = getPropertyErrors(this, propertyAlias, fieldName);
+ var errorsForCallback = getPropertyErrors(this, propertyAlias, culture, fieldName);
//we should now call all of the call backs registered for this error
- var cbs = this.getPropertyCallbacks(propertyAlias, fieldName);
+ var cbs = this.getPropertyCallbacks(propertyAlias, culture, fieldName);
//call each callback for this error
for (var cb in cbs) {
executeCallback(this, errorsForCallback, cbs[cb].callback);
@@ -264,14 +323,20 @@ function serverValidationManager($timeout) {
* @description
* Removes an error message for the content property
*/
- removePropertyError: function (propertyAlias, fieldName) {
+ removePropertyError: function (propertyAlias, culture, fieldName) {
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.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
},
@@ -316,10 +381,16 @@ function serverValidationManager($timeout) {
* @description
* Gets the error message for the content property
*/
- getPropertyError: function (propertyAlias, fieldName) {
+ 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.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
return err;
},
@@ -336,7 +407,7 @@ function serverValidationManager($timeout) {
getFieldError: function (fieldName) {
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 === null && item.fieldName === fieldName);
+ return (item.propertyAlias === null && item.culture === null && item.fieldName === fieldName);
});
return err;
},
@@ -348,12 +419,18 @@ function serverValidationManager($timeout) {
* @function
*
* @description
- * Checks if the content property + field name combo has an error
+ * Checks if the content property + culture + field name combo has an error
*/
- hasPropertyError: function (propertyAlias, fieldName) {
+ 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.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
return err ? true : false;
},
@@ -370,7 +447,7 @@ function serverValidationManager($timeout) {
hasFieldError: function (fieldName) {
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 === null && item.fieldName === fieldName);
+ return (item.propertyAlias === null && item.culture === null && item.fieldName === fieldName);
});
return err ? true : false;
},
@@ -380,4 +457,4 @@ function serverValidationManager($timeout) {
};
}
-angular.module('umbraco.services').factory('serverValidationManager', serverValidationManager);
\ No newline at end of file
+angular.module('umbraco.services').factory('serverValidationManager', serverValidationManager);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index 18d37ea5b2..b18cb73eae 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -7,7 +7,34 @@
* @description A helper object used to format/transform JSON Umbraco data, mostly used for persisting data to the server
**/
function umbDataFormatter() {
-
+
+ /**
+ * maps the display properties to a property collection for persisting/POSTing
+ * @param {any} tabs
+ */
+ function getContentProperties(tabs) {
+
+ var properties = [];
+
+ _.each(tabs, function (tab) {
+
+ _.each(tab.properties, function (prop) {
+
+ //don't include the custom generic tab properties
+ //don't include a property that is marked readonly
+ if (!prop.alias.startsWith("_umb_") && !prop.readonly) {
+ properties.push({
+ id: prop.id,
+ alias: prop.alias,
+ value: prop.value
+ });
+ }
+ });
+ });
+
+ return properties;
+ }
+
return {
formatChangePasswordModel: function(model) {
@@ -289,10 +316,10 @@
// by looking at the key
switch (foundAlias[0]) {
case "umbracoMemberLockedOut":
- saveModel.isLockedOut = prop.value ? (prop.value.toString() === "1" ? true : false) : false;
+ saveModel.isLockedOut = Object.toBoolean(prop.value);
break;
case "umbracoMemberApproved":
- saveModel.isApproved = prop.value ? (prop.value.toString() === "1" ? true : false) : true;
+ saveModel.isApproved = Object.toBoolean(prop.value);
break;
case "umbracoMemberComments":
saveModel.comments = prop.value;
@@ -313,7 +340,7 @@
// we don't want to post all of the data as it is unecessary.
var saveModel = {
id: displayModel.id,
- properties: [],
+ properties: getContentProperties(displayModel.tabs),
name: displayModel.name,
contentTypeAlias: displayModel.contentTypeAlias,
parentId: displayModel.parentId,
@@ -321,50 +348,31 @@
action: action
};
- _.each(displayModel.tabs, function (tab) {
-
- _.each(tab.properties, function (prop) {
-
- //don't include the custom generic tab properties
- //don't include a property that is marked readonly
- if (!prop.alias.startsWith("_umb_") && !prop.readonly) {
- saveModel.properties.push({
- id: prop.id,
- alias: prop.alias,
- value: prop.value
- });
- }
- });
- });
-
return saveModel;
},
/** formats the display model used to display the content to the model used to save the content */
formatContentPostData: function (displayModel, action) {
- //this is basically the same as for media but we need to explicitly add some extra properties
- var saveModel = this.formatMediaPostData(displayModel, action);
-
- //get the selected variant and build the additional published variants
- saveModel.publishVariations = [];
-
- //if there's any variants than we need to set the language and include the variants to publish
- if (displayModel.variants.length > 0) {
- _.each(displayModel.variants,
- function (d) {
- //set the selected variant if this is current
- if (d.current === true) {
- saveModel.culture = d.language.culture;
- }
- if (d.publish === true) {
- saveModel.publishVariations.push({
- culture: d.language.culture,
- segment: d.segment
- });
- }
- });
- }
+ //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
+ // we don't want to post all of the data as it is unecessary.
+ var saveModel = {
+ id: displayModel.id,
+ name: displayModel.name,
+ contentTypeAlias: displayModel.contentTypeAlias,
+ parentId: displayModel.parentId,
+ //set the action on the save model
+ action: action,
+ variants: _.map(displayModel.variants, function(v) {
+ return {
+ name: v.name,
+ properties: getContentProperties(v.tabs),
+ culture: v.language ? v.language.culture : null,
+ publish: v.publish,
+ save: v.save
+ };
+ })
+ };
var propExpireDate = displayModel.removeDate;
var propReleaseDate = displayModel.releaseDate;
@@ -375,6 +383,52 @@
saveModel.templateAlias = propTemplate ? propTemplate : null;
return saveModel;
+ },
+
+ /**
+ * This formats the server GET response for a content display item
+ * @param {} displayModel
+ * @returns {}
+ */
+ formatContentGetData: function(displayModel) {
+
+ //We need to check for invariant properties among the variant variants.
+ //When we detect this, we want to make sure that the property object instance is the
+ //same reference object between all variants instead of a copy (which it will be when
+ //return from the JSON structure).
+
+ if (displayModel.variants && displayModel.variants.length > 1) {
+
+ var invariantProperties = [];
+
+ //collect all invariant properties on the first first variant
+ var firstVariant = displayModel.variants[0];
+ _.each(firstVariant.tabs, function(tab, tabIndex) {
+ _.each(tab.properties, function (property, propIndex) {
+ //in theory if there's more than 1 variant, that means they would all have a language
+ //but we'll do our safety checks anyways here
+ if (firstVariant.language && !property.culture) {
+ invariantProperties.push({
+ tabIndex: tabIndex,
+ propIndex: propIndex,
+ property: property
+ });
+ }
+ });
+ });
+
+
+ //now assign this same invariant property instance to the same index of the other variants property array
+ for (var j = 1; j < displayModel.variants.length; j++) {
+ var variant = displayModel.variants[j];
+
+ _.each(invariantProperties, function (invProp) {
+ variant.tabs[invProp.tabIndex].properties[invProp.propIndex] = invProp.property;
+ });
+ }
+ }
+
+ return displayModel;
}
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index 9eeadf7154..228c885529 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -152,6 +152,13 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
}, function (response) {
+ if (!response.status && response.message && response.stack) {
+ //this is a JS/angular error that we should deal with
+ return $q.reject({
+ errorMsg: response.message
+ })
+ }
+
//invoke the callback
var result = callbacks.error.apply(this, [response.data, response.status, response.headers, response.config]);
@@ -221,7 +228,12 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
for (var f in args.files) {
//each item has a property alias and the file object, we'll ensure that the alias is suffixed to the key
// so we know which property it belongs to on the server side
- formData.append("file_" + args.files[f].alias, args.files[f].file);
+ var fileKey = "file_" + args.files[f].alias + "_" + (args.files[f].culture ? args.files[f].culture : "");
+
+ if (angular.isArray(args.files[f].metaData) && args.files[f].metaData.length > 0) {
+ fileKey += ("_" + args.files[f].metaData.join("_"));
+ }
+ formData.append(fileKey, args.files[f].file);
}
}).then(function (response) {
//success callback
@@ -236,6 +248,8 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
formHelper.showNotifications(response.data);
+ //TODO: Do we need to pass the result through umbDataFormatter.formatContentGetData? Right now things work so not sure but we should check
+
//the data returned is the up-to-date data so the UI will refresh
return $q.resolve(response.data);
}, function (response) {
diff --git a/src/Umbraco.Web.UI.Client/src/init.js b/src/Umbraco.Web.UI.Client/src/init.js
index 6e444cbf84..50e5c21203 100644
--- a/src/Umbraco.Web.UI.Client/src/init.js
+++ b/src/Umbraco.Web.UI.Client/src/init.js
@@ -43,8 +43,7 @@ app.run(['userService', '$q', '$log', '$rootScope', '$route', '$location', 'urlH
}
var currentRouteParams = null;
- var globalQueryStrings = ["mculture"];
-
+
/** execute code on each successful route */
$rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
@@ -126,28 +125,7 @@ app.run(['userService', '$q', '$log', '$rootScope', '$route', '$location', 'urlH
//check if the location being changed is only the mculture query string, if so, cancel the routing since this is just
//used as a global persistent query string that does not change routes.
- var currUrlParts = currentRouteParams;
- var nextUrlParts = next.params;
-
- var allowRoute = true;
-
- //the only time that we want to cancel is if any of the globalQueryStrings have changed
- //in which case the number of parts need to be equal before comparing values
- if (_.keys(currUrlParts).length == _.keys(nextUrlParts).length) {
- var partsChanged = 0;
- _.each(currUrlParts, function (value, key) {
- if (globalQueryStrings.indexOf(key) === -1) {
- if (value.toLowerCase() !== nextUrlParts[key].toLowerCase()) {
- partsChanged++;
- }
- }
- });
- if (partsChanged === 0) {
- allowRoute = false; //nothing except our query strings chagned, so don't continue routing
- }
- }
-
- if (allowRoute) {
+ if (navigationService.isRouteChangingNavigation(currentRouteParams, next.params)) {
//continue the route
$route.reload();
}
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
index ff0ec56620..5fb9d9bda8 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
@@ -25,21 +25,21 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/application/animations.less b/src/Umbraco.Web.UI.Client/src/less/application/animations.less
index 53793b5616..0f2dcb7a7e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/animations.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/animations.less
@@ -1,8 +1,8 @@
// Animations
// -------------------------
-//Animate.css - http://daneden.me/animate
-//Licensed under the MIT license - http://opensource.org/licenses/MIT
+//Animate.css - https://daneden.github.io/animate.css/
+//Licensed under the MIT license - https://opensource.org/licenses/MIT
//Copyright (c) 2013 Daniel Eden
.animated{-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-fill-mode:both;animation-fill-mode:both}.animated.infinite{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.animated.hinge{-webkit-animation-duration:2s;animation-duration:2s}@-webkit-keyframes bounce{0%,100%,20%,53%,80%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1);-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}40%,43%{-webkit-transition-timing-function:cubic-bezier(0.755,.050,.855,.060);transition-timing-function:cubic-bezier(0.755,.050,.855,.060);-webkit-transform:translate3d(0,-30px,0);transform:translate3d(0,-30px,0)}70%{-webkit-transition-timing-function:cubic-bezier(0.755,.050,.855,.060);transition-timing-function:cubic-bezier(0.755,.050,.855,.060);-webkit-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0)}90%{-webkit-transform:translate3d(0,-4px,0);transform:translate3d(0,-4px,0)}}@keyframes bounce{0%,100%,20%,53%,80%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1);-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}40%,43%{-webkit-transition-timing-function:cubic-bezier(0.755,.050,.855,.060);transition-timing-function:cubic-bezier(0.755,.050,.855,.060);-webkit-transform:translate3d(0,-30px,0);-ms-transform:translate3d(0,-30px,0);transform:translate3d(0,-30px,0)}70%{-webkit-transition-timing-function:cubic-bezier(0.755,.050,.855,.060);transition-timing-function:cubic-bezier(0.755,.050,.855,.060);-webkit-transform:translate3d(0,-15px,0);-ms-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0)}90%{-webkit-transform:translate3d(0,-4px,0);-ms-transform:translate3d(0,-4px,0);transform:translate3d(0,-4px,0)}}.bounce{-webkit-animation-name:bounce;animation-name:bounce;-webkit-transform-origin:center bottom;-ms-transform-origin:center bottom;transform-origin:center bottom}@-webkit-keyframes flash{0%,100%,50%{opacity:1}25%,75%{opacity:0}}@keyframes flash{0%,100%,50%{opacity:1}25%,75%{opacity:0}}.flash{-webkit-animation-name:flash;animation-name:flash}@-webkit-keyframes pulse{0%{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}50%{-webkit-transform:scale3d(1.05,1.05,1.05);transform:scale3d(1.05,1.05,1.05)}100%{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}@keyframes pulse{0%{-webkit-transform:scale3d(1,1,1);-ms-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}50%{-webkit-transform:scale3d(1.05,1.05,1.05);-ms-transform:scale3d(1.05,1.05,1.05);transform:scale3d(1.05,1.05,1.05)}100%{-webkit-transform:scale3d(1,1,1);-ms-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}.pulse{-webkit-animation-name:pulse;animation-name:pulse}@-webkit-keyframes rubberBand{0%{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}30%{-webkit-transform:scale3d(1.25,.75,1);transform:scale3d(1.25,.75,1)}40%{-webkit-transform:scale3d(0.75,1.25,1);transform:scale3d(0.75,1.25,1)}50%{-webkit-transform:scale3d(1.15,.85,1);transform:scale3d(1.15,.85,1)}65%{-webkit-transform:scale3d(.95,1.05,1);transform:scale3d(.95,1.05,1)}75%{-webkit-transform:scale3d(1.05,.95,1);transform:scale3d(1.05,.95,1)}100%{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}@keyframes rubberBand{0%{-webkit-transform:scale3d(1,1,1);-ms-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}30%{-webkit-transform:scale3d(1.25,.75,1);-ms-transform:scale3d(1.25,.75,1);transform:scale3d(1.25,.75,1)}40%{-webkit-transform:scale3d(0.75,1.25,1);-ms-transform:scale3d(0.75,1.25,1);transform:scale3d(0.75,1.25,1)}50%{-webkit-transform:scale3d(1.15,.85,1);-ms-transform:scale3d(1.15,.85,1);transform:scale3d(1.15,.85,1)}65%{-webkit-transform:scale3d(.95,1.05,1);-ms-transform:scale3d(.95,1.05,1);transform:scale3d(.95,1.05,1)}75%{-webkit-transform:scale3d(1.05,.95,1);-ms-transform:scale3d(1.05,.95,1);transform:scale3d(1.05,.95,1)}100%{-webkit-transform:scale3d(1,1,1);-ms-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}.rubberBand{-webkit-animation-name:rubberBand;animation-name:rubberBand}@-webkit-keyframes shake{0%,100%{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}@keyframes shake{0%,100%{-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);-ms-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);-ms-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}.shake{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes swing{20%{-webkit-transform:rotate3d(0,0,1,15deg);transform:rotate3d(0,0,1,15deg)}40%{-webkit-transform:rotate3d(0,0,1,-10deg);transform:rotate3d(0,0,1,-10deg)}60%{-webkit-transform:rotate3d(0,0,1,5deg);transform:rotate3d(0,0,1,5deg)}80%{-webkit-transform:rotate3d(0,0,1,-5deg);transform:rotate3d(0,0,1,-5deg)}100%{-webkit-transform:rotate3d(0,0,1,0deg);transform:rotate3d(0,0,1,0deg)}}@keyframes swing{20%{-webkit-transform:rotate3d(0,0,1,15deg);-ms-transform:rotate3d(0,0,1,15deg);transform:rotate3d(0,0,1,15deg)}40%{-webkit-transform:rotate3d(0,0,1,-10deg);-ms-transform:rotate3d(0,0,1,-10deg);transform:rotate3d(0,0,1,-10deg)}60%{-webkit-transform:rotate3d(0,0,1,5deg);-ms-transform:rotate3d(0,0,1,5deg);transform:rotate3d(0,0,1,5deg)}80%{-webkit-transform:rotate3d(0,0,1,-5deg);-ms-transform:rotate3d(0,0,1,-5deg);transform:rotate3d(0,0,1,-5deg)}100%{-webkit-transform:rotate3d(0,0,1,0deg);-ms-transform:rotate3d(0,0,1,0deg);transform:rotate3d(0,0,1,0deg)}}.swing{-webkit-transform-origin:top center;-ms-transform-origin:top center;transform-origin:top center;-webkit-animation-name:swing;animation-name:swing}@-webkit-keyframes tada{0%{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}10%,20%{-webkit-transform:scale3d(.9,.9,.9) rotate3d(0,0,1,-3deg);transform:scale3d(.9,.9,.9) rotate3d(0,0,1,-3deg)}30%,50%,70%,90%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,3deg);transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,3deg)}40%,60%,80%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,-3deg);transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,-3deg)}100%{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}@keyframes tada{0%{-webkit-transform:scale3d(1,1,1);-ms-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}10%,20%{-webkit-transform:scale3d(.9,.9,.9) rotate3d(0,0,1,-3deg);-ms-transform:scale3d(.9,.9,.9) rotate3d(0,0,1,-3deg);transform:scale3d(.9,.9,.9) rotate3d(0,0,1,-3deg)}30%,50%,70%,90%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,3deg);-ms-transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,3deg);transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,3deg)}40%,60%,80%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,-3deg);-ms-transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,-3deg);transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,-3deg)}100%{-webkit-transform:scale3d(1,1,1);-ms-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}.tada{-webkit-animation-name:tada;animation-name:tada}@-webkit-keyframes wobble{0%{-webkit-transform:none;transform:none}15%{-webkit-transform:translate3d(-25%,0,0) rotate3d(0,0,1,-5deg);transform:translate3d(-25%,0,0) rotate3d(0,0,1,-5deg)}30%{-webkit-transform:translate3d(20%,0,0) rotate3d(0,0,1,3deg);transform:translate3d(20%,0,0) rotate3d(0,0,1,3deg)}45%{-webkit-transform:translate3d(-15%,0,0) rotate3d(0,0,1,-3deg);transform:translate3d(-15%,0,0) rotate3d(0,0,1,-3deg)}60%{-webkit-transform:translate3d(10%,0,0) rotate3d(0,0,1,2deg);transform:translate3d(10%,0,0) rotate3d(0,0,1,2deg)}75%{-webkit-transform:translate3d(-5%,0,0) rotate3d(0,0,1,-1deg);transform:translate3d(-5%,0,0) rotate3d(0,0,1,-1deg)}100%{-webkit-transform:none;transform:none}}@keyframes wobble{0%{-webkit-transform:none;-ms-transform:none;transform:none}15%{-webkit-transform:translate3d(-25%,0,0) rotate3d(0,0,1,-5deg);-ms-transform:translate3d(-25%,0,0) rotate3d(0,0,1,-5deg);transform:translate3d(-25%,0,0) rotate3d(0,0,1,-5deg)}30%{-webkit-transform:translate3d(20%,0,0) rotate3d(0,0,1,3deg);-ms-transform:translate3d(20%,0,0) rotate3d(0,0,1,3deg);transform:translate3d(20%,0,0) rotate3d(0,0,1,3deg)}45%{-webkit-transform:translate3d(-15%,0,0) rotate3d(0,0,1,-3deg);-ms-transform:translate3d(-15%,0,0) rotate3d(0,0,1,-3deg);transform:translate3d(-15%,0,0) rotate3d(0,0,1,-3deg)}60%{-webkit-transform:translate3d(10%,0,0) rotate3d(0,0,1,2deg);-ms-transform:translate3d(10%,0,0) rotate3d(0,0,1,2deg);transform:translate3d(10%,0,0) rotate3d(0,0,1,2deg)}75%{-webkit-transform:translate3d(-5%,0,0) rotate3d(0,0,1,-1deg);-ms-transform:translate3d(-5%,0,0) rotate3d(0,0,1,-1deg);transform:translate3d(-5%,0,0) rotate3d(0,0,1,-1deg)}100%{-webkit-transform:none;-ms-transform:none;transform:none}}.wobble{-webkit-animation-name:wobble;animation-name:wobble}@-webkit-keyframes bounceIn{0%,100%,20%,40%,60%,80%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}20%{-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}40%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}60%{opacity:1;-webkit-transform:scale3d(1.03,1.03,1.03);transform:scale3d(1.03,1.03,1.03)}80%{-webkit-transform:scale3d(.97,.97,.97);transform:scale3d(.97,.97,.97)}100%{opacity:1;-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}@keyframes bounceIn{0%,100%,20%,40%,60%,80%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);-ms-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}20%{-webkit-transform:scale3d(1.1,1.1,1.1);-ms-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}40%{-webkit-transform:scale3d(.9,.9,.9);-ms-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}60%{opacity:1;-webkit-transform:scale3d(1.03,1.03,1.03);-ms-transform:scale3d(1.03,1.03,1.03);transform:scale3d(1.03,1.03,1.03)}80%{-webkit-transform:scale3d(.97,.97,.97);-ms-transform:scale3d(.97,.97,.97);transform:scale3d(.97,.97,.97)}100%{opacity:1;-webkit-transform:scale3d(1,1,1);-ms-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}}.bounceIn{-webkit-animation-name:bounceIn;animation-name:bounceIn;-webkit-animation-duration:.75s;animation-duration:.75s}@-webkit-keyframes bounceInDown{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,-3000px,0);transform:translate3d(0,-3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,25px,0);transform:translate3d(0,25px,0)}75%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}90%{-webkit-transform:translate3d(0,5px,0);transform:translate3d(0,5px,0)}100%{-webkit-transform:none;transform:none}}@keyframes bounceInDown{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,-3000px,0);-ms-transform:translate3d(0,-3000px,0);transform:translate3d(0,-3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,25px,0);-ms-transform:translate3d(0,25px,0);transform:translate3d(0,25px,0)}75%{-webkit-transform:translate3d(0,-10px,0);-ms-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}90%{-webkit-transform:translate3d(0,5px,0);-ms-transform:translate3d(0,5px,0);transform:translate3d(0,5px,0)}100%{-webkit-transform:none;-ms-transform:none;transform:none}}.bounceInDown{-webkit-animation-name:bounceInDown;animation-name:bounceInDown}@-webkit-keyframes bounceInLeft{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(-3000px,0,0);transform:translate3d(-3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(25px,0,0);transform:translate3d(25px,0,0)}75%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}90%{-webkit-transform:translate3d(5px,0,0);transform:translate3d(5px,0,0)}100%{-webkit-transform:none;transform:none}}@keyframes bounceInLeft{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(-3000px,0,0);-ms-transform:translate3d(-3000px,0,0);transform:translate3d(-3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(25px,0,0);-ms-transform:translate3d(25px,0,0);transform:translate3d(25px,0,0)}75%{-webkit-transform:translate3d(-10px,0,0);-ms-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}90%{-webkit-transform:translate3d(5px,0,0);-ms-transform:translate3d(5px,0,0);transform:translate3d(5px,0,0)}100%{-webkit-transform:none;-ms-transform:none;transform:none}}.bounceInLeft{-webkit-animation-name:bounceInLeft;animation-name:bounceInLeft}@-webkit-keyframes bounceInRight{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(3000px,0,0);transform:translate3d(3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(-25px,0,0);transform:translate3d(-25px,0,0)}75%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}90%{-webkit-transform:translate3d(-5px,0,0);transform:translate3d(-5px,0,0)}100%{-webkit-transform:none;transform:none}}@keyframes bounceInRight{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(3000px,0,0);-ms-transform:translate3d(3000px,0,0);transform:translate3d(3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(-25px,0,0);-ms-transform:translate3d(-25px,0,0);transform:translate3d(-25px,0,0)}75%{-webkit-transform:translate3d(10px,0,0);-ms-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}90%{-webkit-transform:translate3d(-5px,0,0);-ms-transform:translate3d(-5px,0,0);transform:translate3d(-5px,0,0)}100%{-webkit-transform:none;-ms-transform:none;transform:none}}.bounceInRight{-webkit-animation-name:bounceInRight;animation-name:bounceInRight}@-webkit-keyframes bounceInUp{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,3000px,0);transform:translate3d(0,3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}75%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}90%{-webkit-transform:translate3d(0,-5px,0);transform:translate3d(0,-5px,0)}100%{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@keyframes bounceInUp{0%,100%,60%,75%,90%{-webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1);transition-timing-function:cubic-bezier(0.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,3000px,0);-ms-transform:translate3d(0,3000px,0);transform:translate3d(0,3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,-20px,0);-ms-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}75%{-webkit-transform:translate3d(0,10px,0);-ms-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}90%{-webkit-transform:translate3d(0,-5px,0);-ms-transform:translate3d(0,-5px,0);transform:translate3d(0,-5px,0)}100%{-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.bounceInUp{-webkit-animation-name:bounceInUp;animation-name:bounceInUp}@-webkit-keyframes bounceOut{20%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}50%,55%{opacity:1;-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}100%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}}@keyframes bounceOut{20%{-webkit-transform:scale3d(.9,.9,.9);-ms-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}50%,55%{opacity:1;-webkit-transform:scale3d(1.1,1.1,1.1);-ms-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}100%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);-ms-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}}.bounceOut{-webkit-animation-name:bounceOut;animation-name:bounceOut;-webkit-animation-duration:.75s;animation-duration:.75s}@-webkit-keyframes bounceOutDown{20%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}100%{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}@keyframes bounceOutDown{20%{-webkit-transform:translate3d(0,10px,0);-ms-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,-20px,0);-ms-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}100%{opacity:0;-webkit-transform:translate3d(0,2000px,0);-ms-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}.bounceOutDown{-webkit-animation-name:bounceOutDown;animation-name:bounceOutDown}@-webkit-keyframes bounceOutLeft{20%{opacity:1;-webkit-transform:translate3d(20px,0,0);transform:translate3d(20px,0,0)}100%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}@keyframes bounceOutLeft{20%{opacity:1;-webkit-transform:translate3d(20px,0,0);-ms-transform:translate3d(20px,0,0);transform:translate3d(20px,0,0)}100%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);-ms-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}.bounceOutLeft{-webkit-animation-name:bounceOutLeft;animation-name:bounceOutLeft}@-webkit-keyframes bounceOutRight{20%{opacity:1;-webkit-transform:translate3d(-20px,0,0);transform:translate3d(-20px,0,0)}100%{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}@keyframes bounceOutRight{20%{opacity:1;-webkit-transform:translate3d(-20px,0,0);-ms-transform:translate3d(-20px,0,0);transform:translate3d(-20px,0,0)}100%{opacity:0;-webkit-transform:translate3d(2000px,0,0);-ms-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}.bounceOutRight{-webkit-animation-name:bounceOutRight;animation-name:bounceOutRight}@-webkit-keyframes bounceOutUp{20%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,20px,0);transform:translate3d(0,20px,0)}100%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}@keyframes bounceOutUp{20%{-webkit-transform:translate3d(0,-10px,0);-ms-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,20px,0);-ms-transform:translate3d(0,20px,0);transform:translate3d(0,20px,0)}100%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);-ms-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}.bounceOutUp{-webkit-animation-name:bounceOutUp;animation-name:bounceOutUp}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.fadeIn{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes fadeInDown{0%{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInDown{0%{opacity:0;-webkit-transform:translate3d(0,-100%,0);-ms-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInDown{-webkit-animation-name:fadeInDown;animation-name:fadeInDown}@-webkit-keyframes fadeInDownBig{0%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInDownBig{0%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);-ms-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInDownBig{-webkit-animation-name:fadeInDownBig;animation-name:fadeInDownBig}@-webkit-keyframes fadeInLeft{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInLeft{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0);-ms-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInLeft{-webkit-animation-name:fadeInLeft;animation-name:fadeInLeft}@-webkit-keyframes fadeInLeftBig{0%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInLeftBig{0%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);-ms-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInLeftBig{-webkit-animation-name:fadeInLeftBig;animation-name:fadeInLeftBig}@-webkit-keyframes fadeInRight{0%{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInRight{0%{opacity:0;-webkit-transform:translate3d(100%,0,0);-ms-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInRight{-webkit-animation-name:fadeInRight;animation-name:fadeInRight}@-webkit-keyframes fadeInRightBig{0%{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInRightBig{0%{opacity:0;-webkit-transform:translate3d(2000px,0,0);-ms-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInRightBig{-webkit-animation-name:fadeInRightBig;animation-name:fadeInRightBig}@-webkit-keyframes fadeInUp{0%{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInUp{0%{opacity:0;-webkit-transform:translate3d(0,100%,0);-ms-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInUp{-webkit-animation-name:fadeInUp;animation-name:fadeInUp}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translate3d(0,2000px,0);-ms-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.fadeInUpBig{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes fadeOut{0%{opacity:1}100%{opacity:0}}@keyframes fadeOut{0%{opacity:1}100%{opacity:0}}.fadeOut{-webkit-animation-name:fadeOut;animation-name:fadeOut}@-webkit-keyframes fadeOutDown{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}@keyframes fadeOutDown{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,100%,0);-ms-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}.fadeOutDown{-webkit-animation-name:fadeOutDown;animation-name:fadeOutDown}@-webkit-keyframes fadeOutDownBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}@keyframes fadeOutDownBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,2000px,0);-ms-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}.fadeOutDownBig{-webkit-animation-name:fadeOutDownBig;animation-name:fadeOutDownBig}@-webkit-keyframes fadeOutLeft{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}@keyframes fadeOutLeft{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(-100%,0,0);-ms-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.fadeOutLeft{-webkit-animation-name:fadeOutLeft;animation-name:fadeOutLeft}@-webkit-keyframes fadeOutLeftBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}@keyframes fadeOutLeftBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);-ms-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}.fadeOutLeftBig{-webkit-animation-name:fadeOutLeftBig;animation-name:fadeOutLeftBig}@-webkit-keyframes fadeOutRight{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}@keyframes fadeOutRight{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(100%,0,0);-ms-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.fadeOutRight{-webkit-animation-name:fadeOutRight;animation-name:fadeOutRight}@-webkit-keyframes fadeOutRightBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}@keyframes fadeOutRightBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(2000px,0,0);-ms-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}.fadeOutRightBig{-webkit-animation-name:fadeOutRightBig;animation-name:fadeOutRightBig}@-webkit-keyframes fadeOutUp{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}@keyframes fadeOutUp{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,-100%,0);-ms-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}.fadeOutUp{-webkit-animation-name:fadeOutUp;animation-name:fadeOutUp}@-webkit-keyframes fadeOutUpBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}@keyframes fadeOutUpBig{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);-ms-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}.fadeOutUpBig{-webkit-animation-name:fadeOutUpBig;animation-name:fadeOutUpBig}@-webkit-keyframes flip{0%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-360deg);transform:perspective(400px) rotate3d(0,1,0,-360deg);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}40%{-webkit-transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-190deg);transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-190deg);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}50%{-webkit-transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-170deg);transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-170deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}80%{-webkit-transform:perspective(400px) scale3d(.95,.95,.95);transform:perspective(400px) scale3d(.95,.95,.95);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}100%{-webkit-transform:perspective(400px);transform:perspective(400px);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}}@keyframes flip{0%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-360deg);-ms-transform:perspective(400px) rotate3d(0,1,0,-360deg);transform:perspective(400px) rotate3d(0,1,0,-360deg);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}40%{-webkit-transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-190deg);-ms-transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-190deg);transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-190deg);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}50%{-webkit-transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-170deg);-ms-transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-170deg);transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-170deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}80%{-webkit-transform:perspective(400px) scale3d(.95,.95,.95);-ms-transform:perspective(400px) scale3d(.95,.95,.95);transform:perspective(400px) scale3d(.95,.95,.95);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}100%{-webkit-transform:perspective(400px);-ms-transform:perspective(400px);transform:perspective(400px);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}}.animated.flip{-webkit-backface-visibility:visible;-ms-backface-visibility:visible;backface-visibility:visible;-webkit-animation-name:flip;animation-name:flip}@-webkit-keyframes flipInX{0%{-webkit-transform:perspective(400px) rotate3d(1,0,0,90deg);transform:perspective(400px) rotate3d(1,0,0,90deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotate3d(1,0,0,-20deg);transform:perspective(400px) rotate3d(1,0,0,-20deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotate3d(1,0,0,10deg);transform:perspective(400px) rotate3d(1,0,0,10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotate3d(1,0,0,-5deg);transform:perspective(400px) rotate3d(1,0,0,-5deg)}100%{-webkit-transform:perspective(400px);transform:perspective(400px)}}@keyframes flipInX{0%{-webkit-transform:perspective(400px) rotate3d(1,0,0,90deg);-ms-transform:perspective(400px) rotate3d(1,0,0,90deg);transform:perspective(400px) rotate3d(1,0,0,90deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotate3d(1,0,0,-20deg);-ms-transform:perspective(400px) rotate3d(1,0,0,-20deg);transform:perspective(400px) rotate3d(1,0,0,-20deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotate3d(1,0,0,10deg);-ms-transform:perspective(400px) rotate3d(1,0,0,10deg);transform:perspective(400px) rotate3d(1,0,0,10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotate3d(1,0,0,-5deg);-ms-transform:perspective(400px) rotate3d(1,0,0,-5deg);transform:perspective(400px) rotate3d(1,0,0,-5deg)}100%{-webkit-transform:perspective(400px);-ms-transform:perspective(400px);transform:perspective(400px)}}.flipInX{-webkit-backface-visibility:visible!important;-ms-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipInX;animation-name:flipInX}@-webkit-keyframes flipInY{0%{-webkit-transform:perspective(400px) rotate3d(0,1,0,90deg);transform:perspective(400px) rotate3d(0,1,0,90deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-20deg);transform:perspective(400px) rotate3d(0,1,0,-20deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotate3d(0,1,0,10deg);transform:perspective(400px) rotate3d(0,1,0,10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-5deg);transform:perspective(400px) rotate3d(0,1,0,-5deg)}100%{-webkit-transform:perspective(400px);transform:perspective(400px)}}@keyframes flipInY{0%{-webkit-transform:perspective(400px) rotate3d(0,1,0,90deg);-ms-transform:perspective(400px) rotate3d(0,1,0,90deg);transform:perspective(400px) rotate3d(0,1,0,90deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-20deg);-ms-transform:perspective(400px) rotate3d(0,1,0,-20deg);transform:perspective(400px) rotate3d(0,1,0,-20deg);-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotate3d(0,1,0,10deg);-ms-transform:perspective(400px) rotate3d(0,1,0,10deg);transform:perspective(400px) rotate3d(0,1,0,10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-5deg);-ms-transform:perspective(400px) rotate3d(0,1,0,-5deg);transform:perspective(400px) rotate3d(0,1,0,-5deg)}100%{-webkit-transform:perspective(400px);-ms-transform:perspective(400px);transform:perspective(400px)}}.flipInY{-webkit-backface-visibility:visible!important;-ms-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipInY;animation-name:flipInY}@-webkit-keyframes flipOutX{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotate3d(1,0,0,-20deg);transform:perspective(400px) rotate3d(1,0,0,-20deg);opacity:1}100%{-webkit-transform:perspective(400px) rotate3d(1,0,0,90deg);transform:perspective(400px) rotate3d(1,0,0,90deg);opacity:0}}@keyframes flipOutX{0%{-webkit-transform:perspective(400px);-ms-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotate3d(1,0,0,-20deg);-ms-transform:perspective(400px) rotate3d(1,0,0,-20deg);transform:perspective(400px) rotate3d(1,0,0,-20deg);opacity:1}100%{-webkit-transform:perspective(400px) rotate3d(1,0,0,90deg);-ms-transform:perspective(400px) rotate3d(1,0,0,90deg);transform:perspective(400px) rotate3d(1,0,0,90deg);opacity:0}}.flipOutX{-webkit-animation-name:flipOutX;animation-name:flipOutX;-webkit-animation-duration:.75s;animation-duration:.75s;-webkit-backface-visibility:visible!important;-ms-backface-visibility:visible!important;backface-visibility:visible!important}@-webkit-keyframes flipOutY{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-15deg);transform:perspective(400px) rotate3d(0,1,0,-15deg);opacity:1}100%{-webkit-transform:perspective(400px) rotate3d(0,1,0,90deg);transform:perspective(400px) rotate3d(0,1,0,90deg);opacity:0}}@keyframes flipOutY{0%{-webkit-transform:perspective(400px);-ms-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotate3d(0,1,0,-15deg);-ms-transform:perspective(400px) rotate3d(0,1,0,-15deg);transform:perspective(400px) rotate3d(0,1,0,-15deg);opacity:1}100%{-webkit-transform:perspective(400px) rotate3d(0,1,0,90deg);-ms-transform:perspective(400px) rotate3d(0,1,0,90deg);transform:perspective(400px) rotate3d(0,1,0,90deg);opacity:0}}.flipOutY{-webkit-backface-visibility:visible!important;-ms-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipOutY;animation-name:flipOutY;-webkit-animation-duration:.75s;animation-duration:.75s}@-webkit-keyframes lightSpeedIn{0%{-webkit-transform:translate3d(100%,0,0) skewX(-30deg);transform:translate3d(100%,0,0) skewX(-30deg);opacity:0}60%{-webkit-transform:skewX(20deg);transform:skewX(20deg);opacity:1}80%{-webkit-transform:skewX(-5deg);transform:skewX(-5deg);opacity:1}100%{-webkit-transform:none;transform:none;opacity:1}}@keyframes lightSpeedIn{0%{-webkit-transform:translate3d(100%,0,0) skewX(-30deg);-ms-transform:translate3d(100%,0,0) skewX(-30deg);transform:translate3d(100%,0,0) skewX(-30deg);opacity:0}60%{-webkit-transform:skewX(20deg);-ms-transform:skewX(20deg);transform:skewX(20deg);opacity:1}80%{-webkit-transform:skewX(-5deg);-ms-transform:skewX(-5deg);transform:skewX(-5deg);opacity:1}100%{-webkit-transform:none;-ms-transform:none;transform:none;opacity:1}}.lightSpeedIn{-webkit-animation-name:lightSpeedIn;animation-name:lightSpeedIn;-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}@-webkit-keyframes lightSpeedOut{0%{opacity:1}100%{-webkit-transform:translate3d(100%,0,0) skewX(30deg);transform:translate3d(100%,0,0) skewX(30deg);opacity:0}}@keyframes lightSpeedOut{0%{opacity:1}100%{-webkit-transform:translate3d(100%,0,0) skewX(30deg);-ms-transform:translate3d(100%,0,0) skewX(30deg);transform:translate3d(100%,0,0) skewX(30deg);opacity:0}}.lightSpeedOut{-webkit-animation-name:lightSpeedOut;animation-name:lightSpeedOut;-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}@-webkit-keyframes rotateIn{0%{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:rotate3d(0,0,1,-200deg);transform:rotate3d(0,0,1,-200deg);opacity:0}100%{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateIn{0%{-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center;-webkit-transform:rotate3d(0,0,1,-200deg);-ms-transform:rotate3d(0,0,1,-200deg);transform:rotate3d(0,0,1,-200deg);opacity:0}100%{-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center;-webkit-transform:none;-ms-transform:none;transform:none;opacity:1}}.rotateIn{-webkit-animation-name:rotateIn;animation-name:rotateIn}@-webkit-keyframes rotateInDownLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate3d(0,0,1,-45deg);transform:rotate3d(0,0,1,-45deg);opacity:0}100%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInDownLeft{0%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate3d(0,0,1,-45deg);-ms-transform:rotate3d(0,0,1,-45deg);transform:rotate3d(0,0,1,-45deg);opacity:0}100%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:none;-ms-transform:none;transform:none;opacity:1}}.rotateInDownLeft{-webkit-animation-name:rotateInDownLeft;animation-name:rotateInDownLeft}@-webkit-keyframes rotateInDownRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,45deg);transform:rotate3d(0,0,1,45deg);opacity:0}100%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInDownRight{0%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,45deg);-ms-transform:rotate3d(0,0,1,45deg);transform:rotate3d(0,0,1,45deg);opacity:0}100%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:none;-ms-transform:none;transform:none;opacity:1}}.rotateInDownRight{-webkit-animation-name:rotateInDownRight;animation-name:rotateInDownRight}@-webkit-keyframes rotateInUpLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate3d(0,0,1,45deg);transform:rotate3d(0,0,1,45deg);opacity:0}100%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInUpLeft{0%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate3d(0,0,1,45deg);-ms-transform:rotate3d(0,0,1,45deg);transform:rotate3d(0,0,1,45deg);opacity:0}100%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:none;-ms-transform:none;transform:none;opacity:1}}.rotateInUpLeft{-webkit-animation-name:rotateInUpLeft;animation-name:rotateInUpLeft}@-webkit-keyframes rotateInUpRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,-90deg);transform:rotate3d(0,0,1,-90deg);opacity:0}100%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInUpRight{0%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,-90deg);-ms-transform:rotate3d(0,0,1,-90deg);transform:rotate3d(0,0,1,-90deg);opacity:0}100%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:none;-ms-transform:none;transform:none;opacity:1}}.rotateInUpRight{-webkit-animation-name:rotateInUpRight;animation-name:rotateInUpRight}@-webkit-keyframes rotateOut{0%{-webkit-transform-origin:center;transform-origin:center;opacity:1}100%{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:rotate3d(0,0,1,200deg);transform:rotate3d(0,0,1,200deg);opacity:0}}@keyframes rotateOut{0%{-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center;opacity:1}100%{-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center;-webkit-transform:rotate3d(0,0,1,200deg);-ms-transform:rotate3d(0,0,1,200deg);transform:rotate3d(0,0,1,200deg);opacity:0}}.rotateOut{-webkit-animation-name:rotateOut;animation-name:rotateOut}@-webkit-keyframes rotateOutDownLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;opacity:1}100%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(0,0,1,45deg);transform:rotate(0,0,1,45deg);opacity:0}}@keyframes rotateOutDownLeft{0%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;opacity:1}100%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(0,0,1,45deg);-ms-transform:rotate(0,0,1,45deg);transform:rotate(0,0,1,45deg);opacity:0}}.rotateOutDownLeft{-webkit-animation-name:rotateOutDownLeft;animation-name:rotateOutDownLeft}@-webkit-keyframes rotateOutDownRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;opacity:1}100%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,-45deg);transform:rotate3d(0,0,1,-45deg);opacity:0}}@keyframes rotateOutDownRight{0%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;opacity:1}100%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,-45deg);-ms-transform:rotate3d(0,0,1,-45deg);transform:rotate3d(0,0,1,-45deg);opacity:0}}.rotateOutDownRight{-webkit-animation-name:rotateOutDownRight;animation-name:rotateOutDownRight}@-webkit-keyframes rotateOutUpLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;opacity:1}100%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate3d(0,0,1,-45deg);transform:rotate3d(0,0,1,-45deg);opacity:0}}@keyframes rotateOutUpLeft{0%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;opacity:1}100%{-webkit-transform-origin:left bottom;-ms-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate3d(0,0,1,-45deg);-ms-transform:rotate3d(0,0,1,-45deg);transform:rotate3d(0,0,1,-45deg);opacity:0}}.rotateOutUpLeft{-webkit-animation-name:rotateOutUpLeft;animation-name:rotateOutUpLeft}@-webkit-keyframes rotateOutUpRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;opacity:1}100%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,90deg);transform:rotate3d(0,0,1,90deg);opacity:0}}@keyframes rotateOutUpRight{0%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;opacity:1}100%{-webkit-transform-origin:right bottom;-ms-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate3d(0,0,1,90deg);-ms-transform:rotate3d(0,0,1,90deg);transform:rotate3d(0,0,1,90deg);opacity:0}}.rotateOutUpRight{-webkit-animation-name:rotateOutUpRight;animation-name:rotateOutUpRight}@-webkit-keyframes hinge{0%{-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}20%,60%{-webkit-transform:rotate3d(0,0,1,80deg);transform:rotate3d(0,0,1,80deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}40%,80%{-webkit-transform:rotate3d(0,0,1,60deg);transform:rotate3d(0,0,1,60deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;opacity:1}100%{-webkit-transform:translate3d(0,700px,0);transform:translate3d(0,700px,0);opacity:0}}@keyframes hinge{0%{-webkit-transform-origin:top left;-ms-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}20%,60%{-webkit-transform:rotate3d(0,0,1,80deg);-ms-transform:rotate3d(0,0,1,80deg);transform:rotate3d(0,0,1,80deg);-webkit-transform-origin:top left;-ms-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}40%,80%{-webkit-transform:rotate3d(0,0,1,60deg);-ms-transform:rotate3d(0,0,1,60deg);transform:rotate3d(0,0,1,60deg);-webkit-transform-origin:top left;-ms-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;opacity:1}100%{-webkit-transform:translate3d(0,700px,0);-ms-transform:translate3d(0,700px,0);transform:translate3d(0,700px,0);opacity:0}}.hinge{-webkit-animation-name:hinge;animation-name:hinge}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0) rotate3d(0,0,1,-120deg);transform:translate3d(-100%,0,0) rotate3d(0,0,1,-120deg)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0) rotate3d(0,0,1,-120deg);-ms-transform:translate3d(-100%,0,0) rotate3d(0,0,1,-120deg);transform:translate3d(-100%,0,0) rotate3d(0,0,1,-120deg)}100%{opacity:1;-webkit-transform:none;-ms-transform:none;transform:none}}.rollIn{-webkit-animation-name:rollIn;animation-name:rollIn}@-webkit-keyframes rollOut{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(100%,0,0) rotate3d(0,0,1,120deg);transform:translate3d(100%,0,0) rotate3d(0,0,1,120deg)}}@keyframes rollOut{0%{opacity:1}100%{opacity:0;-webkit-transform:translate3d(100%,0,0) rotate3d(0,0,1,120deg);-ms-transform:translate3d(100%,0,0) rotate3d(0,0,1,120deg);transform:translate3d(100%,0,0) rotate3d(0,0,1,120deg)}}.rollOut{-webkit-animation-name:rollOut;animation-name:rollOut}@-webkit-keyframes zoomIn{0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%{opacity:1}}@keyframes zoomIn{0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);-ms-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%{opacity:1}}.zoomIn{-webkit-animation-name:zoomIn;animation-name:zoomIn}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);-ms-transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-ms-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}.zoomInDown{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(10px,0,0);transform:scale3d(.475,.475,.475) translate3d(10px,0,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);-ms-transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(10px,0,0);-ms-transform:scale3d(.475,.475,.475) translate3d(10px,0,0);transform:scale3d(.475,.475,.475) translate3d(10px,0,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}.zoomInLeft{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes zoomInRight{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}@keyframes zoomInRight{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);-ms-transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);-ms-transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}.zoomInRight{-webkit-animation-name:zoomInRight;animation-name:zoomInRight}@-webkit-keyframes zoomInUp{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}@keyframes zoomInUp{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);-ms-transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-ms-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}.zoomInUp{-webkit-animation-name:zoomInUp;animation-name:zoomInUp}@-webkit-keyframes zoomOut{0%{opacity:1}50%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}100%{opacity:0}}@keyframes zoomOut{0%{opacity:1}50%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);-ms-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}100%{opacity:0}}.zoomOut{-webkit-animation-name:zoomOut;animation-name:zoomOut}@-webkit-keyframes zoomOutDown{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}100%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}@keyframes zoomOutDown{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-ms-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}100%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);-ms-transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);-webkit-transform-origin:center bottom;-ms-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}.zoomOutDown{-webkit-animation-name:zoomOutDown;animation-name:zoomOutDown}@-webkit-keyframes zoomOutLeft{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(42px,0,0);transform:scale3d(.475,.475,.475) translate3d(42px,0,0)}100%{opacity:0;-webkit-transform:scale(.1) translate3d(-2000px,0,0);transform:scale(.1) translate3d(-2000px,0,0);-webkit-transform-origin:left center;transform-origin:left center}}@keyframes zoomOutLeft{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(42px,0,0);-ms-transform:scale3d(.475,.475,.475) translate3d(42px,0,0);transform:scale3d(.475,.475,.475) translate3d(42px,0,0)}100%{opacity:0;-webkit-transform:scale(.1) translate3d(-2000px,0,0);-ms-transform:scale(.1) translate3d(-2000px,0,0);transform:scale(.1) translate3d(-2000px,0,0);-webkit-transform-origin:left center;-ms-transform-origin:left center;transform-origin:left center}}.zoomOutLeft{-webkit-animation-name:zoomOutLeft;animation-name:zoomOutLeft}@-webkit-keyframes zoomOutRight{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-42px,0,0);transform:scale3d(.475,.475,.475) translate3d(-42px,0,0)}100%{opacity:0;-webkit-transform:scale(.1) translate3d(2000px,0,0);transform:scale(.1) translate3d(2000px,0,0);-webkit-transform-origin:right center;transform-origin:right center}}@keyframes zoomOutRight{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-42px,0,0);-ms-transform:scale3d(.475,.475,.475) translate3d(-42px,0,0);transform:scale3d(.475,.475,.475) translate3d(-42px,0,0)}100%{opacity:0;-webkit-transform:scale(.1) translate3d(2000px,0,0);-ms-transform:scale(.1) translate3d(2000px,0,0);transform:scale(.1) translate3d(2000px,0,0);-webkit-transform-origin:right center;-ms-transform-origin:right center;transform-origin:right center}}.zoomOutRight{-webkit-animation-name:zoomOutRight;animation-name:zoomOutRight}@-webkit-keyframes zoomOutUp{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}100%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}@keyframes zoomOutUp{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-ms-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(0.55,.055,.675,.19);animation-timing-function:cubic-bezier(0.55,.055,.675,.19)}100%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);-ms-transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);-webkit-transform-origin:center bottom;-ms-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(0.175,.885,.32,1);animation-timing-function:cubic-bezier(0.175,.885,.32,1)}}.zoomOutUp{-webkit-animation-name:zoomOutUp;animation-name:zoomOutUp}
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index b6fbba6949..b2f2f99dd5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -75,7 +75,6 @@
@import "listview.less";
@import "gridview.less";
@import "footer.less";
-@import "dragdrop.less";
@import "dashboards.less";
@import "forms/umb-validation-label.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
index 2156f75d00..73f059b4ee 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
@@ -1,10 +1,20 @@
.umb-toggle {
- display: flex;
- align-items: center;
+ display: flex;
+ align-items: center;
+ background: none;
+ border: none;
+ padding: 0;
+
+ &:focus {
+ outline: 0;
+ }
}
.umb-toggle__handler {
- display: inline-block;
+ position: absolute;
+ top: 0;
+ left: 0;
+ display: block;
width: 24px;
height: 24px;
background-color: @white;
@@ -62,4 +72,4 @@
.umb-toggle__icon--right {
right: 7px;
color: @gray-5;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less b/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
index a4c3a89c99..fadf9c7940 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
@@ -1,6 +1,5 @@
.check_circle {
display: flex;
- opacity: 0;
width: 20px;
height: 20px;
margin: 0 auto;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index e7564ca2ca..72c1ea5209 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -64,11 +64,9 @@
.umb-editor-header {
background: @white;
- // flex: 1 1 60px;
position: absolute;
padding: 0 20px;
- z-index: 1;
- // box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.16);
+ z-index: @zindexFixedNavbar;
border-bottom: 1px solid @gray-9;
width: 100%;
box-sizing: border-box;
@@ -266,3 +264,14 @@ a.umb-variant-switcher__toggle {
margin-right: auto;
padding-right: 10px;
}
+
+/* Confirm */
+.umb-editor-confirm {
+ background-color: @white;
+ padding: 20px;
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ z-index: 10;
+ box-shadow: 0 -3px 12px 0px rgba(0,0,0,0.16);
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
index c6009bce7b..26347c8501 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
@@ -1,5 +1,4 @@
.umb-expansion-panel {
- //border: 1px solid @gray-8;
background: @white;
border-radius: 3px;
margin-bottom: 16px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
index a307e5c585..5363a8db9b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
@@ -1,5 +1,10 @@
.umb-prevalues-multivalues {
width: 400px;
+ max-width: 100%;
+
+ .umb-overlay & {
+ width: 500px;
+ }
}
.umb-prevalues-multivalues__left {
@@ -27,7 +32,7 @@
.umb-prevalues-multivalues__add button {
margin: 0 6px 0 0;
- float: right
+ margin-left: auto;
}
.umb-prevalues-multivalues__listitem {
@@ -46,6 +51,7 @@
.umb-prevalues-multivalues__listitem a {
cursor: pointer;
+ margin-left: auto;
}
.umb-prevalues-multivalues__listitem input {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
index e27bd0d654..c7905879d8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
@@ -18,12 +18,6 @@
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
- &.active {
- .check_circle {
- opacity: 1;
- }
- }
-
&.umb-color-box--m {
width: 40px;
height: 40px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index c5f9cdde88..407cfaf6a7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -50,3 +50,34 @@
font-size: 12px;
line-height: 1em;
}
+
+.umb-sub-views-nav-item__more {
+ margin-bottom: 10px;
+}
+
+.umb-sub-views-nav-item__more i {
+ height: 5px;
+ width: 5px;
+ border-radius: 50%;
+ background: @gray-3;
+ display: inline-block;
+ margin: 0 5px 0 0;
+}
+
+.umb-sub-views-nav-item__more i:last-of-type {
+ margin-right: 0;
+}
+
+// make dots green the an item is active
+.umb-sub-views-nav-item.is-active .umb-sub-views-nav-item__more i {
+ background-color: @turquoise-d1;
+}
+
+.umb-sub-views-nav__dropdown.umb-sub-views-nav__dropdown {
+ left: auto;
+ right: 0;
+ display: grid;
+ grid-template-columns: 1fr 1fr 1fr;
+ min-width: auto;
+ margin-top: 10px;
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 7dfcc493a8..a4c744bf7f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -4,6 +4,7 @@
// -------------------------
.umb-grid IFRAME {
overflow: hidden;
+ width: 100%;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index e2a8c8fc81..d1ad8ee8ff 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -1,16 +1,13 @@
-.nested-content
-{
+.umb-nested-content {
text-align: center;
}
-.nested-content--not-supported
-{
+.umb-nested-content--not-supported {
opacity: 0.3;
pointer-events: none;
}
-.nested-content-overlay
-{
+.umb-nested-content-overlay {
position: absolute;
top: 0;
left: 0;
@@ -19,47 +16,39 @@
z-index: 1000;
}
-.nested-content__item
-{
+.umb-nested-content__item {
position: relative;
text-align: left;
border-top: solid 1px transparent;
- background: white;
-
-
+ background: @white;
}
-.nested-content__item--active:not(.nested-content__item--single)
-{
- background: #f8f8f8;
+.umb-nested-content__item--active:not(.umb-nested-content__item--single) {
+ background: @gray-10;
}
-.nested-content__item.ui-sortable-placeholder
-{
- background: #f8f8f8;
- border: 1px dashed #d9d9d9;
+.umb-nested-content__item.ui-sortable-placeholder {
+ background: @gray-10;
+ border: 1px dashed @gray-8;
visibility: visible !important;
height: 55px;
margin-top: -1px;
}
-.nested-content__item--single > .nested-content__content
-{
+.umb-nested-content__item--single > .umb-nested-content__content {
border: 0;
}
-.nested-content__item--single > .nested-content__content > .umb-pane
-{
+.umb-nested-content__item--single > .umb-nested-content__content > .umb-pane {
margin: 0;
}
-.nested-content__header-bar
-{
+.umb-nested-content__header-bar {
padding: 15px 20px;
- border-bottom: 1px dashed #e0e0e0;
+ border-bottom: 1px dashed @gray-8;
text-align: right;
cursor: pointer;
- background-color: white;
+ background-color: @white;
-moz-user-select: none;
-khtml-user-select: none;
@@ -67,24 +56,21 @@
-o-user-select: none;
}
-.nested-content__heading {
+.umb-nested-content__heading {
line-height: 20px;
position: relative;
- &.-with-icon
- {
+ &.-with-icon {
padding-left: 20px;
}
- i
- {
- color: #999; /* same icon color as the icons in the item type picker */
+ i {
+ color: @gray-2;
position: absolute;
left: 0;
}
- .nested-content__item-name
- {
+ .umb-nested-content__item-name {
max-height: 20px;
text-align: left;
white-space: nowrap;
@@ -94,22 +80,16 @@
}
}
-.nested-content__icons
-{
+.umb-nested-content__icons {
opacity: 0;
-
transition: opacity .15s ease-in-out;
- -moz-transition: opacity .15s ease-in-out;
- -webkit-transition: opacity .15s ease-in-out;
-
position: absolute;
right: 0px;
top: 2px;
- background-color: white;
+ background-color: @white;
padding: 5px;
- &:before
- {
+ &:before {
content: ' ';
position: absolute;
display: block;
@@ -117,126 +97,118 @@
left: -30px;
top: 0;
bottom: 0;
- background: -webkit-linear-gradient(90deg, rgba(255,255,255,0), white);
- background: -moz-linear-gradient(90deg, rgba(255,255,255,0), white);
background: linear-gradient(90deg, rgba(255,255,255,0), white);
}
}
-.nested-content__header-bar:hover .nested-content__icons,
-.nested-content__item--active > .nested-content__header-bar .nested-content__icons
-{
+.umb-nested-content__header-bar:hover .umb-nested-content__icons,
+.umb-nested-content__item--active > .umb-nested-content__header-bar .umb-nested-content__icons {
opacity: 1;
}
-.nested-content__icon,
-.nested-content__icon.nested-content__icon--disabled:hover
-{
+.umb-nested-content__icon,
+.umb-nested-content__icon.umb-nested-content__icon--disabled:hover {
display: inline-block;
padding: 4px 6px;
margin: 2px;
cursor: pointer;
- background: #fff;
- border: 1px solid #b6b6b6;
+ background: @white;
+ border: 1px solid @gray-7;
border-radius: 200px;
text-decoration: none !important;
}
-.nested-content__icon:hover,
-.nested-content__icon--active
+.umb-nested-content__icon:hover,
+.umb-nested-content__icon--active
{
- color: white;
- background: #2e8aea;
- border-color: #2e8aea;
+ color: @white;
+ background: @turquoise-d1;
+ border-color: @turquoise-d1;
text-decoration: none;
}
-.nested-content__icon .icon,
-.nested-content__icon.nested-content__icon--disabled:hover .icon
-{
+.umb-nested-content__icon .icon,
+.umb-nested-content__icon.umb-nested-content__icon--disabled:hover .icon {
display: block;
font-size: 16px !important;
- color: #5f5f5f;
+ color: @gray-3;
}
-.nested-content__icon:hover .icon,
-.nested-content__icon--active .icon
-{
- color: white;
+.umb-nested-content__icon:hover .icon,
+.umb-nested-content__icon--active .icon {
+ color: @white;
}
-.nested-content__icon--disabled
-{
+.umb-nested-content__icon--disabled {
opacity: 0.3;
}
-.nested-content__footer-bar
-{
+.umb-nested-content__footer-bar {
text-align: center;
padding-top: 20px;
}
-.nested-content__content
-{
- border-bottom: 1px dashed #e0e0e0;
+.umb-nested-content__content {
+ border-bottom: 1px dashed @gray-8;
}
-.nested-content__content .umb-control-group {
+.umb-nested-content__content .umb-control-group {
padding-bottom: 0;
}
-.nested-content__item.ui-sortable-helper .nested-content__content
-{
+.umb-nested-content__item.ui-sortable-helper .umb-nested-content__content {
display: none !important;
}
-.nested-content__help-text
-{
+.umb-nested-content__help-text {
display: inline-block;
padding: 10px 20px 10px 20px;
clear: both;
font-size: 14px;
- color: #555;
- background: #f8f8f8;
+ color: @gray-3;
+ background: @gray-10;
border-radius: 15px;
}
-.nested-content__doctypepicker table input, .nested-content__doctypepicker table select {
+.umb-nested-content__doctypepicker table input,
+.umb-nested-content__doctypepicker table select {
width: 100%;
padding-right: 0;
}
-.nested-content__doctypepicker table td.icon-navigation, .nested-content__doctypepicker i.nested-content__help-icon {
+.umb-nested-content__doctypepicker table td.icon-navigation,
+.umb-nested-content__doctypepicker i.umb-nested-content__help-icon {
vertical-align: middle;
- color: #CCC;
+ color: @gray-7;
}
-.nested-content__doctypepicker table td.icon-navigation:hover, .nested-content__doctypepicker i.nested-content__help-icon:hover {
- color: #343434;
+.umb-nested-content__doctypepicker table td.icon-navigation:hover,
+.umb-nested-content__doctypepicker i.umb-nested-content__help-icon:hover {
+ color: @gray-2;
}
-.nested-content__doctypepicker i.nested-content__help-icon {
+.umb-nested-content__doctypepicker i.umb-nested-content__help-icon {
margin-left: 10px;
}
-.form-horizontal .nested-content--narrow .controls-row
+.form-horizontal .umb-nested-content--narrow .controls-row
{
margin-left: 40% !important;
}
-.form-horizontal .nested-content--narrow .controls-row .umb-textstring,
-.form-horizontal .nested-content--narrow .controls-row .umb-textarea
+.form-horizontal .umb-nested-content--narrow .controls-row .umb-textstring,
+.form-horizontal .umb-nested-content--narrow .controls-row .umb-textarea
{
width: 95%;
}
-.form-horizontal .nested-content--narrow .controls-row .umb-dropdown {
+.form-horizontal .umb-nested-content--narrow .controls-row .umb-dropdown {
width: 99%;
}
-.usky-grid.nested-content__node-type-picker .cell-tools-menu {
+.usky-grid.umb-nested-content__node-type-picker .cell-tools-menu {
position: relative;
transform: translate(-50%, -25%);
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 3d1015f972..07bc32d79a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -72,6 +72,7 @@
font-size: 13px;
font-weight: bold;
color: @gray-5;
+ cursor: pointer;
}
.umb-node-preview__action:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
index 54116e9093..c041f3f4ea 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
@@ -20,6 +20,7 @@
.umb-permission__content {
display: flex;
flex-direction: column;
+ justify-content: center;
flex: 1 1 auto;
cursor: pointer;
}
@@ -27,4 +28,4 @@
.umb-permission__description {
font-size: 13px;
color: @gray-5;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/dragdrop.less b/src/Umbraco.Web.UI.Client/src/less/dragdrop.less
deleted file mode 100644
index 328ab27e5b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/dragdrop.less
+++ /dev/null
@@ -1,37 +0,0 @@
-body.dragging, body.dragging * {
- cursor: move !important;
-}
-
-li.dragged {
- position: absolute;
- opacity: 0.5;
- z-index: 2000;
-}
-
-.umb-sort li{
- display: block;
- margin: 5px;
- padding: 5px;
- border: 1px solid @gray-7;
- background: @gray-10;
-}
-
-.umb-sort .placeholder {
- position: relative;
- margin: 0;
- padding: 0;
- border: none;
-}
-
-.umb-sort .placeholder:before {
- position: absolute;
- content: "";
- width: 0;
- height: 0;
- margin-top: -5px;
- left: -5px;
- top: -4px;
- border: 5px solid transparent;
- border-left-color: @red;
- border-right: none;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 4df1bd9b8d..6940987290 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -496,21 +496,6 @@ input[type="checkbox"][readonly] {
border-color: @red-l1 !important;
}
-//disable the glowing border for the umb-content-name
-.show-validation .umb-headline-editor-wrapper input:focus:invalid,
-.show-validation .umb-headline-editor-wrapper textarea:focus:invalid,
-.show-validation .umb-headline-editor-wrapper select:focus:invalid {
- border:none;
- color:inherit;
- border-color:inherit;
- @shadow:inherit;
- .box-shadow(@shadow);
-}
-
-.ng-invalid > .umb-headline-editor-wrapper h1{
- border-bottom: 1px dashed @red; color: @red; cursor: pointer;
-};
-
// FORM ACTIONS
// ------------
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index 68a703201a..def6d114ff 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -80,18 +80,6 @@
background-color: @white;
}
-.umb-headline-editor-wrapper {
- position: relative;
-}
-
-.umb-headline-editor-wrapper .help-inline {
- right: 0px;
- top: 25px;
- position: absolute;
- font-size: 10px;
- color: @red;
-}
-
.umb-panel-header p {
margin: 0px 20px;
}
@@ -100,36 +88,6 @@
opacity: 0.6;
}
-.umb-headline-editor-wrapper input {
- background: none;
- border: none;
- margin: -6px 0 0 0;
- padding: 0 0 2px 0;
- border-radius: 0;
- line-height: normal;
- border: 1px solid transparent;
- color: @black;
- letter-spacing: -0.01em;
-}
-
-.umb-headline-editor-wrapper input.ng-invalid {
- color: @red;
-}
-
-.umb-headline-editor-wrapper input.ng-invalid::-moz-placeholder,
-.umb-headline-editor-wrapper input.ng-invalid:-ms-input-placeholder,
-.umb-headline-editor-wrapper input.ng-invalid::-webkit-input-placeholder {
- color: @red;
- line-height: 22px;
-}
-
-/*
-.umb-panel-header i {
- font-size: 13px;
- vertical-align: middle;
-}
-*/
-
.umb-panel-header-meta {
height: 50px;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index 57edbd7266..c7d156d44c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -70,7 +70,6 @@
margin: 0 0 0 14px;
background-color: @gray-8;
position: absolute;
- z-index: 0;
}
.history-item {
@@ -78,7 +77,6 @@
align-items: center;
margin-bottom: 24px;
position: relative;
- z-index: 1;
}
.history-item__avatar {
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index fd9296259f..2b716b9b9f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -139,12 +139,6 @@ ul.color-picker li {
border: 2px solid transparent;
width: 60px;
- &.active {
- .check_circle {
- opacity: 1;
- }
- }
-
.thumbnail{
min-width: auto;
width: inherit;
@@ -180,13 +174,13 @@ ul.color-picker li {
div.color-picker-prediv {
display: inline-flex;
align-items: center;
+ max-width: 80%;
pre {
- display: inline;
+ display: inline-flex;
font-family: monospace;
margin-right: 10px;
margin-left: 10px;
- width: 50%;
white-space: nowrap;
overflow: hidden;
margin-bottom: 0;
@@ -194,21 +188,28 @@ ul.color-picker li {
padding-top: 7px;
padding-bottom: 7px;
background: #f7f7f7;
+ flex: 0 0 auto;
}
span {
margin-left: 5px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
input[type="text"] {
- min-width: 40%;
- width: 320px;
- display: inline-block;
+ display: flex;
+ flex: 1 1 100px;
margin-top: 1px;
+ margin-right: 15px;
+ min-width: auto;
+ width: auto;
}
.sp-replacer {
+ display: inline-flex;
margin-right: 18px;
}
@@ -569,7 +570,7 @@ ul.color-picker li {
.imagecropper .umb-cropper__container {
position: relative;
margin-bottom: 10px;
- max-width: 100%;
+ max-width: 100%;
border: 1px solid @gray-10;
@media (min-width: 769px) {
@@ -582,7 +583,7 @@ ul.color-picker li {
top: 3px;
right: 3px;
cursor: pointer;
- z-index: 1;
+ z-index: @zindexCropperOverlay + 1;
}
.umb-close-cropper:hover {
@@ -656,28 +657,8 @@ ul.color-picker li {
line-height: 120px
}
-.umb-upload-drop-zone{
- margin-bottom:5px;
-}
-
-.umb-upload-drop-zone .info, .umb-upload-button-big{
- display: block;
- padding: 20px;
- opacity: 1;
- border: 1px dashed @gray-8;
- background: none;
- text-align: center;
- font-size: 14px;
- color: @gray-8;
-}
-
.umb-upload-button-big:hover{color: @gray-8;}
-.umb-upload-drop-zone .info i.icon, .umb-upload-button-big i.icon{
- font-size: 55px;
- line-height: 70px
-}
-
.umb-upload-button-big {display: block}
.umb-upload-button-big input {
left: 0;
@@ -687,123 +668,6 @@ ul.color-picker li {
}
-
-//
-// Photo folder styling
-// --------------------------------------------------
-
-.umb-photo-folder .picrow{
- overflow-y: hidden;
- position: relative;
-}
-
-
-
-.umb-photo-folder .picrow div, .umb-photo-preview{
- margin: 0px;
- padding: 0px;
- border: none;
- display: inline-block;
- vertical-align: top;
- position: relative;
-}
-
-
-
-.umb-photo-folder .picrow div a:first-child {
- width:100%;
- height:100%;
-}
-
-.umb-photo-folder .picrow div.umb-photo {
- width:100%;
- height:100%;
- background-color: @gray-10;
-}
-
-.umb-photo-folder a:hover{text-decoration: none}
-.umb-photo-folder .umb-non-thumbnail{
- text-align: center;
- vertical-align: middle;
- font-size: 12px;
- background: @gray-10;
- color: @black;
- text-decoration: none;
-}
-
-.umb-photo-folder .selector-overlay{
- display: none;
-}
-
-//this is a temp hack, to provide selectors in the dialog:
-.umb-photo-folder .pic:hover .selector-overlay {
- position: absolute;
- bottom: 0px;
- left: 0px;
- right: 0px;
- padding: 5px;
- background: @black;
- z-index: 100;
- display: block;
- text-align: center;
- color: @white;
- opacity: 0.4;
- text-decoration:none;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.umb-photo-folder .umb-non-thumbnail i{
- color: @gray-8;
- font-size: 50px;
- line-height: 60px;
- display: block;
- margin: auto;
- /*vertically aligns */
- position: relative;
- top: 50%;
- transform: translateY(-50%);
-}
-
-.umb-photo-folder .umb-non-thumbnail span{
- position: absolute;
- display: block;
- margin: auto;
- width: 100%;
- top: 20px;
-}
-
-.umb-photo-folder .selected{
- position: relative;
-}
-
-.umb-photo-folder .selected:before{
- content: "\e165";
- font-family: Icomoon;
-
- position: absolute;
- bottom: 10px;
- right: 10px;
-
- font-size: 24px;
- color: @black;
- opacity: 0.5;
- background: @white;
-
- line-height: 36px;
- text-align: center;
- -moz-border-radius: 15px;
- border-radius: 15px;
-
- height: 32px;
- width: 32px;
- overflow: hidden;
- display: block;
- z-index: 100;
-}
-
-
//
// File upload
// --------------------------------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/less/tables.less b/src/Umbraco.Web.UI.Client/src/less/tables.less
index 5f1acfaf5d..fa8a44ec47 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tables.less
@@ -66,11 +66,12 @@ table {
// CONDENSED TABLE W/ HALF PADDING
// -------------------------------
-.table-condensed {
- th,
- td {
- padding: 4px 5px;
- }
+.table-condensed tbody td {
+ padding: 5px 10px;
+}
+
+.table-condensed thead th {
+ padding: 10px;
}
@@ -249,3 +250,8 @@ table th[class*="span"],
background-color: darken(@infoBackground, 5%);
}
}
+
+// table sortable
+.table-sortable tbody tr {
+ cursor: move;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 35481af343..c7d2e8d6ed 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -126,7 +126,7 @@
.color-green, .color-green i{color: @green-d1 !important;}
.color-yellow, .color-yellow i{color: @yellowIcon !important;}
-/* Colors based on http://zavoloklom.github.io/material-design-color-palette/colors.html */
+/* Colors based on https://zavoloklom.github.io/material-design-color-palette/colors.html */
.btn-color-black {background-color: @black;}
.color-black i { color: @black;}
diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
index 8b5ca87470..2d8ad46371 100644
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ b/src/Umbraco.Web.UI.Client/src/routes.js
@@ -180,7 +180,7 @@ app.config(function ($routeProvider) {
.when('/:section/:tree/:method?/:id', {
//This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
template: "",
- //This controller will execute for this route, then we replace the template dynamnically based on the current tree.
+ //This controller will execute for this route, then we replace the template dynamically based on the current tree.
controller: function ($scope, $route, $routeParams, treeService) {
if (!$routeParams.tree || !$routeParams.method) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
index d18277737a..fdd438e9cf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
+++ b/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
});
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index 46acddddb4..0e777a5b9f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -96,7 +96,7 @@
-
-
+
+
- At least {{installer.current.model.minCharLength}} characters long
-
-
- At least {{installer.current.model.minNonAlphaNumericLength}} symbol{{installer.current.model.minNonAlphaNumericLength > 1 ? 's' : ''}}
-
-
+ At least {{installer.current.model.minCharLength}} characters long
+
+
+ At least {{installer.current.model.minNonAlphaNumericLength}} symbol{{installer.current.model.minNonAlphaNumericLength > 1 ? 's' : ''}}
+
+
-
+
Visit umbraco.tv
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
new file mode 100644
index 0000000000..54d5da29a8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
@@ -0,0 +1,70 @@
+ (function() {
+ "use strict";
+
+ function CompositionsController($scope,$location) {
+
+ var vm = this;
+ var oldModel = null;
+
+ vm.showConfirmSubmit = false;
+
+ vm.isSelected = isSelected;
+ vm.openContentType = openContentType;
+ vm.submit = submit;
+ vm.close = close;
+
+ function onInit() {
+
+ /* make a copy of the init model so it is possible to roll
+ back the changes on cancel */
+ oldModel = angular.copy($scope.model);
+
+ if(!$scope.model.title) {
+ $scope.model.title = "Compositions";
+ }
+
+ }
+
+ function isSelected(alias) {
+ if($scope.model.contentType.compositeContentTypes.indexOf(alias) !== -1) {
+ return true;
+ }
+ }
+
+ function openContentType(contentType, section) {
+ var url = (section === "documentType" ? "/settings/documenttypes/edit/" : "/settings/mediaTypes/edit/") + contentType.id;
+ $location.path(url);
+ }
+
+ function submit() {
+ if ($scope.model && $scope.model.submit) {
+
+ // check if any compositions has been removed
+ vm.compositionRemoved = false;
+ for(var i = 0; oldModel.compositeContentTypes.length > i; i++) {
+ var oldComposition = oldModel.compositeContentTypes[i];
+ if(_.contains($scope.model.compositeContentTypes, oldComposition) === false) {
+ vm.compositionRemoved = true;
+ }
+ }
+
+ /* submit the form if there havne't been removed any composition
+ or the confirm checkbox has been checked */
+ if(!vm.compositionRemoved || vm.allowSubmit) {
+ $scope.model.submit($scope.model);
+ }
+ }
+ }
+
+ function close() {
+ if ($scope.model && $scope.model.close) {
+ $scope.model.close(oldModel);
+ }
+ }
+
+ onInit();
+ }
+
+ angular.module("umbraco").controller("Umbraco.Editors.CompositionsController", CompositionsController);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
new file mode 100644
index 0000000000..5d7a5420db
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.controller.js
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.controller.js
index 5de36dfd44..060e17a55e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.controller.js
@@ -1,13 +1,15 @@
(function() {
"use strict";
- function CopyOverlay($scope, localizationService, eventsService, entityHelper) {
+ function CopyController($scope, localizationService, eventsService, entityHelper) {
var vm = this;
vm.hideSearch = hideSearch;
vm.selectResult = selectResult;
vm.onSearchResults = onSearchResults;
+ vm.submit = submit;
+ vm.close = close;
var dialogOptions = $scope.model;
var searchText = "Search...";
@@ -105,10 +107,22 @@
$scope.miniListView = node;
}
- onInit();
+ function submit() {
+ if($scope.model && $scope.model.submit) {
+ $scope.model.submit($scope.model);
+ }
+ }
+
+ function close() {
+ if($scope.model && $scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
+ onInit();
}
- angular.module("umbraco").controller("Umbraco.Overlays.CopyOverlay", CopyOverlay);
+ angular.module("umbraco").controller("Umbraco.Editors.CopyController", CopyController);
})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html
new file mode 100644
index 0000000000..18a35394ec
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
new file mode 100644
index 0000000000..fb66552731
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
@@ -0,0 +1,125 @@
+(function() {
+ "use strict";
+
+ function EmbedController($scope, $http, $sce, umbRequestHelper, localizationService) {
+
+ var vm = this;
+ var origWidth = 500;
+ var origHeight = 300;
+
+ vm.trustedPreview = null;
+
+ $scope.model.embed = {
+ url: "",
+ width: 360,
+ height: 240,
+ constrain: true,
+ preview: "",
+ success: false,
+ info: "",
+ supportsDimensions: ""
+ };
+
+ vm.showPreview = showPreview;
+ vm.changeSize = changeSize;
+ vm.submit = submit;
+ vm.close = close;
+
+ function onInit() {
+ if(!$scope.model.title) {
+ localizationService.localize("general_embed").then(function(value){
+ $scope.model.title = value;
+ });
+ }
+ }
+
+ function showPreview() {
+
+ if ($scope.model.embed.url) {
+ $scope.model.embed.show = true;
+ $scope.model.embed.preview = "";
+ $scope.model.embed.info = "";
+ $scope.model.embed.success = false;
+
+
+ $http({
+ method: 'GET',
+ url: umbRequestHelper.getApiUrl("embedApiBaseUrl", "GetEmbed"),
+ params: {
+ url: $scope.model.embed.url,
+ width: $scope.model.embed.width,
+ height: $scope.model.embed.height
+ }
+ }).then(function(response) {
+
+ $scope.model.embed.preview = "";
+
+ switch (response.data.Status) {
+ case 0:
+ //not supported
+ $scope.model.embed.info = "Not supported";
+ break;
+ case 1:
+ //error
+ $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
+ break;
+ case 2:
+ $scope.model.embed.preview = response.data.Markup;
+ vm.trustedPreview = $sce.trustAsHtml(response.data.Markup);
+ $scope.model.embed.supportsDimensions = response.data.SupportsDimensions;
+ $scope.model.embed.success = true;
+ break;
+ }
+ }, function() {
+ $scope.model.embed.supportsDimensions = false;
+ $scope.model.embed.preview = "";
+ $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
+ });
+
+ } else {
+ $scope.model.embed.supportsDimensions = false;
+ $scope.model.embed.preview = "";
+ $scope.model.embed.info = "Please enter a URL";
+ }
+ }
+
+ function changeSize(type) {
+
+ var width, height;
+
+ if ($scope.model.embed.constrain) {
+ width = parseInt($scope.model.embed.width, 10);
+ height = parseInt($scope.model.embed.height, 10);
+ if (type == 'width') {
+ origHeight = Math.round((width / origWidth) * height);
+ $scope.model.embed.height = origHeight;
+ } else {
+ origWidth = Math.round((height / origHeight) * width);
+ $scope.model.embed.width = origWidth;
+ }
+ }
+ if ($scope.model.embed.url !== "") {
+ showPreview();
+ }
+
+ }
+
+ function submit() {
+ if($scope.model && $scope.model.submit) {
+ $scope.model.submit($scope.model);
+ }
+ }
+
+ function close() {
+ if($scope.model && $scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
+ onInit();
+
+ }
+
+ angular.module("umbraco").controller("Umbraco.Editors.EmbedController", EmbedController);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
new file mode 100644
index 0000000000..f6a641f2af
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
@@ -0,0 +1,73 @@
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index f428e64e3e..05c76beeae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -13,6 +13,28 @@ function IconPickerController($scope, iconHelper, localizationService) {
vm.selectIcon = selectIcon;
vm.close = close;
+ vm.colors = [
+ { name: "Black", value: "color-black" },
+ { name: "Blue Grey", value: "color-blue-grey" },
+ { name: "Grey", value: "color-grey" },
+ { name: "Brown", value: "color-brown" },
+ { name: "Blue", value: "color-blue" },
+ { name: "Light Blue", value: "color-light-blue" },
+ { name: "Indigo", value: "color-indigo" },
+ { name: "Purple", value: "color-purple" },
+ { name: "Deep Purple", value: "color-deep-purple" },
+ { name: "Cyan", value: "color-cyan" },
+ { name: "Green", value: "color-green" },
+ { name: "Light Green", value: "color-light-green" },
+ { name: "Lime", value: "color-lime" },
+ { name: "Yellow", value: "color-yellow" },
+ { name: "Amber", value: "color-amber" },
+ { name: "Orange", value: "color-orange" },
+ { name: "Deep Orange", value: "color-deep-orange" },
+ { name: "Red", value: "color-red" },
+ { name: "Pink", value: "color-pink" }
+ ];
+
function onInit() {
vm.loading = true;
@@ -24,6 +46,12 @@ function IconPickerController($scope, iconHelper, localizationService) {
vm.loading = false;
});
+ // set a default color if nothing is passed in
+ vm.color = $scope.model.color ? $scope.model.color : vm.colors[0].value;
+
+ // if an icon is passed in - preselect it
+ vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
+
}
function setTitle() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index 320e0cee8a..8a7358116a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -32,35 +32,19 @@
-
+
+
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.controller.js
similarity index 90%
rename from src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.controller.js
index ebe2feabb9..db3e16f8b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.controller.js
@@ -1,7 +1,7 @@
(function () {
"use strict";
- function InsertFieldController($scope, $http, contentTypeResource, localizationService) {
+ function InsertFieldController($scope, contentTypeResource, localizationService) {
var vm = this;
@@ -29,6 +29,8 @@
vm.setCasingOption = setCasingOption;
vm.setEncodingOption = setEncodingOption;
vm.generateOutputSample = generateOutputSample;
+ vm.submit = submit;
+ vm.close = close;
function onInit() {
@@ -139,10 +141,21 @@
}
- onInit();
+ function submit(model) {
+ if($scope.model.submit) {
+ $scope.model.submit(model);
+ }
+ }
+ function close() {
+ if($scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
+ onInit();
}
- angular.module("umbraco").controller("Umbraco.Overlays.InsertFieldController", InsertFieldController);
+ angular.module("umbraco").controller("Umbraco.Editors.InsertFieldController", InsertFieldController);
})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
new file mode 100644
index 0000000000..56bd498fd1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.controller.js
new file mode 100644
index 0000000000..094e108d8f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.controller.js
@@ -0,0 +1,47 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.ItemPickerController
+ * @function
+ *
+ * @description
+ * The controller for a reusable editor to pick items
+ */
+
+function ItemPickerController($scope, localizationService) {
+
+ var vm = this;
+
+ vm.selectItem = selectItem;
+ vm.submit = submit;
+ vm.close = close;
+
+ function onInit() {
+ if (!$scope.model.title) {
+ localizationService.localize("defaultdialogs_selectItem").then(function(value){
+ $scope.model.title = value;
+ });
+ }
+ }
+
+ function selectItem(item) {
+ $scope.model.selectedItem = item;
+ submit($scope.model);
+ };
+
+ function submit(model) {
+ if($scope.model.submit) {
+ $scope.model.submit(model);
+ }
+ }
+
+ function close() {
+ if($scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
+ onInit();
+
+}
+
+angular.module("umbraco").controller("Umbraco.Editors.ItemPicker", ItemPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
new file mode 100644
index 0000000000..9963807772
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add fallback field
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add default value
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Format and encoding
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Modify output
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ vm.generateOutputSample() }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index 720edc2114..36640eae75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -1,17 +1,24 @@
//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
- function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
+angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
+ function ($scope, eventsService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService, editorService) {
+
+ var vm = this;
var dialogOptions = $scope.model;
-
var anchorPattern = //gi;
-
var searchText = "Search...";
+
+ vm.submit = submit;
+ vm.close = close;
+
localizationService.localize("general_search").then(function (value) {
searchText = value + "...";
});
if (!$scope.model.title) {
- $scope.model.title = localizationService.localize("defaultdialogs_selectLink");
+ localizationService.localize("defaultdialogs_selectLink")
+ .then(function(value) {
+ $scope.model.title = value;
+ });
}
$scope.dialogTreeApi = {};
@@ -83,7 +90,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
} else {
contentResource.getById(args.node.id).then(function (resp) {
$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
- $scope.model.target.url = resp.urls[0];
+ $scope.model.target.url = resp.urls[0].text;
});
}
@@ -101,11 +108,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
$scope.switchToMediaPicker = function () {
userService.getCurrentUser().then(function (userData) {
- $scope.mediaPickerOverlay = {
- view: "mediapicker",
+ var mediaPicker = {
startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
startNodeIsVirtual: userData.startMediaIds.length !== 1,
- show: true,
submit: function (model) {
var media = model.selectedImages[0];
@@ -115,12 +120,13 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
$scope.model.target.name = media.name;
$scope.model.target.url = mediaHelper.resolveFile(media);
- debugger;
-
- $scope.mediaPickerOverlay.show = false;
- $scope.mediaPickerOverlay = null;
+ editorService.close();
+ },
+ close: function() {
+ editorService.close();
}
};
+ editorService.mediaPicker(mediaPicker);
});
};
@@ -167,4 +173,16 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
$scope.miniListView = node;
}
+ function close() {
+ if($scope.model && $scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
+ function submit() {
+ if($scope.model && $scope.model.submit) {
+ $scope.model.submit($scope.model);
+ }
+ }
+
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
new file mode 100644
index 0000000000..dd258f6c75
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
@@ -0,0 +1,137 @@
+
+
+
+
+
+ -
+
- + + + {{ availableItem.name }} + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
index 058f71bfcf..aa63f2d6d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
@@ -26,6 +26,12 @@ function MacroPickerController($scope, entityResource, macroResource, umbPropEdi
}
};
+ $scope.close = function() {
+ if($scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
/** changes the view to edit the params of the selected macro */
/** if there is pnly one macro, and it has parameters - editor can skip selecting the Macro **/
function editParams(insertIfNoParameters) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
new file mode 100644
index 0000000000..a9551138e1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Link to page
+
+
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ Select media
+
+
+
+ Link to media
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 1d34482358..298c90c822 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
//used for the media picker dialog
angular.module("umbraco")
.controller("Umbraco.Editors.MediaPickerController",
- function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService, $element, $timeout, $cookies, localStorageService, localizationService, editorService) {
+ function($scope, mediaResource, entityResource, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
if (!$scope.model.title) {
localizationService.localize("defaultdialogs_selectMedia")
@@ -20,6 +20,7 @@ angular.module("umbraco")
$scope.cropSize = dialogOptions.cropSize;
$scope.lastOpenedNode = localStorageService.get("umbLastOpenedMediaNodeId");
$scope.lockedFolder = true;
+ $scope.allowMediaEdit = dialogOptions.allowMediaEdit ? dialogOptions.allowMediaEdit : false;
var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
@@ -50,7 +51,7 @@ angular.module("umbraco")
pageSize: 100,
totalItems: 0,
totalPages: 0,
- filter: '',
+ filter: ''
};
//preload selected item
@@ -435,4 +436,4 @@ angular.module("umbraco")
onInit();
- });
\ No newline at end of file
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index f17a08dd47..5a858accbb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -78,14 +78,14 @@
hide-dropzone="{{!activeDrag && images.length > 0 || searchOptions.filter }}"
compact="{{ images.length > 0 }}">
-
+
+
+
+
+
+
+
+ There are no macros available to insert
+
+
+
+
+
+
+
+
+
+ -
+
- + + + {{ availableItem.name }} + + +
+
+
+ There are no parameters for this macro
+
+
+
+ {{model.selectedMacro.name}}
+ +-
+
-
+
+
+ + ++ ++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.controller.js
similarity index 85%
rename from src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.controller.js
index bccf7487bb..c2a66dddf1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.controller.js
@@ -1,13 +1,15 @@
(function() {
"use strict";
- function MoveOverlay($scope, localizationService, eventsService, entityHelper) {
+ function MoveController($scope, localizationService, entityHelper) {
var vm = this;
vm.hideSearch = hideSearch;
vm.selectResult = selectResult;
vm.onSearchResults = onSearchResults;
+ vm.submit = submit;
+ vm.close = close;
var dialogOptions = $scope.model;
var searchText = "Search...";
@@ -105,10 +107,22 @@
$scope.miniListView = node;
}
+ function submit() {
+ if ($scope.model && $scope.model.submit) {
+ $scope.model.submit($scope.model);
+ }
+ }
+
+ function close() {
+ if ($scope.model && $scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
onInit();
}
- angular.module("umbraco").controller("Umbraco.Overlays.MoveOverlay", MoveOverlay);
+ angular.module("umbraco").controller("Umbraco.Editors.MoveController", MoveController);
})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html
new file mode 100644
index 0000000000..03d7e84342
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index 1366eb10e4..7239fd22e7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -35,8 +35,8 @@
vm.showSensitiveData = user.userGroups.indexOf("sensitiveData") != -1;
});
- //make the default the same as the content type
- if (!$scope.model.property.id) {
+ //make the default the same as the content type
+ if (!$scope.model.property.dataTypeId) {
$scope.model.property.allowCultureVariant = $scope.model.contentTypeAllowCultureVariant;
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.controller.js
index fc273ab089..1beac99928 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.controller.js
+++ b/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: {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.controller.js
similarity index 52%
rename from src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.controller.js
index d8cc93c1b8..36d7c0f4ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.controller.js
@@ -1,35 +1,47 @@
(function () {
"use strict";
- function TemplateSectionsOverlayController($scope) {
+ function TemplateSectionsController($scope, formHelper) {
var vm = this;
+ vm.select = select;
+ vm.submit = submit;
+ vm.close = close;
+
$scope.model.mandatoryRenderSection = false;
if(!$scope.model.title) {
$scope.model.title = "Sections";
}
- vm.select = select;
-
function onInit() {
-
if($scope.model.hasMaster) {
$scope.model.insertType = 'addSection';
} else {
$scope.model.insertType = 'renderBody';
}
-
}
function select(type) {
$scope.model.insertType = type;
}
+ function submit(model) {
+ if (formHelper.submitForm({scope: $scope})) {
+ $scope.model.submit($scope.model);
+ }
+ }
+
+ function close() {
+ if($scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
onInit();
}
- angular.module("umbraco").controller("Umbraco.Overlays.TemplateSectionsOverlay", TemplateSectionsOverlayController);
+ angular.module("umbraco").controller("Umbraco.Editors.TemplateSectionsController", TemplateSectionsController);
})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
new file mode 100644
index 0000000000..d6e3996287
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.controller.js
deleted file mode 100644
index 7e768336a6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.controller.js
+++ /dev/null
@@ -1,25 +0,0 @@
- (function() {
- "use strict";
-
- function CompositionsOverlay($scope,$location) {
-
- var vm = this;
-
- vm.isSelected = isSelected;
- vm.openContentType = openContentType;
-
- function isSelected(alias) {
- if($scope.model.contentType.compositeContentTypes.indexOf(alias) !== -1) {
- return true;
- }
- }
- function openContentType(contentType, section) {
-
- var url = (section === "documentType" ? "/settings/documenttypes/edit/" : "/settings/mediaTypes/edit/") + contentType.id;
- $location.path(url);
- }
- }
-
- angular.module("umbraco").controller("Umbraco.Overlays.CompositionsOverlay", CompositionsOverlay);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
deleted file mode 100644
index f2d8902f9d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html
deleted file mode 100644
index 16d00c8689..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- - -- - - -
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
deleted file mode 100644
index c64430d9fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
+++ /dev/null
@@ -1,108 +0,0 @@
-(function() {
- "use strict";
-
- function EmbedOverlay($scope, $http, umbRequestHelper, localizationService) {
-
- var vm = this;
- var origWidth = 500;
- var origHeight = 300;
-
- $scope.model.embed = {
- url: "",
- width: 360,
- height: 240,
- constrain: true,
- preview: "",
- success: false,
- info: "",
- supportsDimensions: ""
- };
-
- vm.showPreview = showPreview;
- vm.changeSize = changeSize;
-
- function onInit() {
- if(!$scope.model.title) {
- localizationService.localize("general_embed").then(function(value){
- $scope.model.title = value;
- });
- }
- }
-
- function showPreview() {
-
- if ($scope.model.embed.url) {
- $scope.model.embed.show = true;
- $scope.model.embed.preview = "";
- $scope.model.embed.info = "";
- $scope.model.embed.success = false;
-
- $http({
- method: 'GET',
- url: umbRequestHelper.getApiUrl("embedApiBaseUrl", "GetEmbed"),
- params: {
- url: $scope.model.embed.url,
- width: $scope.model.embed.width,
- height: $scope.model.embed.height
- }
- })
- .success(function(data) {
-
- $scope.model.embed.preview = "";
-
- switch (data.Status) {
- case 0:
- //not supported
- $scope.model.embed.info = "Not supported";
- break;
- case 1:
- //error
- $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
- break;
- case 2:
- $scope.model.embed.preview = data.Markup;
- $scope.model.embed.supportsDimensions = data.SupportsDimensions;
- $scope.model.embed.success = true;
- break;
- }
- })
- .error(function() {
- $scope.model.embed.supportsDimensions = false;
- $scope.model.embed.preview = "";
- $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
- });
- } else {
- $scope.model.embed.supportsDimensions = false;
- $scope.model.embed.preview = "";
- $scope.model.embed.info = "Please enter a URL";
- }
- }
-
- function changeSize(type) {
-
- var width, height;
-
- if ($scope.model.embed.constrain) {
- width = parseInt($scope.model.embed.width, 10);
- height = parseInt($scope.model.embed.height, 10);
- if (type == 'width') {
- origHeight = Math.round((width / origWidth) * height);
- $scope.model.embed.height = origHeight;
- } else {
- origWidth = Math.round((height / origHeight) * width);
- $scope.model.embed.width = origWidth;
- }
- }
- if ($scope.model.embed.url !== "") {
- showPreview();
- }
-
- }
-
- onInit();
-
- }
-
- angular.module("umbraco").controller("Umbraco.Overlays.EmbedOverlay", EmbedOverlay);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
deleted file mode 100644
index 401acca2c5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
deleted file mode 100644
index 3c36505fcb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DocumentType.PropertyController
- * @function
- *
- * @description
- * The controller for the content type editor property dialog
- */
-function IconPickerOverlay($scope, iconHelper, localizationService) {
-
- $scope.loading = true;
- $scope.model.hideSubmitButton = false;
-
- $scope.colors = [
- { name: "Black", value: "color-black" },
- { name: "Blue Grey", value: "color-blue-grey" },
- { name: "Grey", value: "color-grey" },
- { name: "Brown", value: "color-brown" },
- { name: "Blue", value: "color-blue" },
- { name: "Light Blue", value: "color-light-blue" },
- { name: "Indigo", value: "color-indigo" },
- { name: "Purple", value: "color-purple" },
- { name: "Deep Purple", value: "color-deep-purple" },
- { name: "Cyan", value: "color-cyan" },
- { name: "Green", value: "color-green" },
- { name: "Light Green", value: "color-light-green" },
- { name: "Lime", value: "color-lime" },
- { name: "Yellow", value: "color-yellow" },
- { name: "Amber", value: "color-amber" },
- { name: "Orange", value: "color-orange" },
- { name: "Deep Orange", value: "color-deep-orange" },
- { name: "Red", value: "color-red" },
- { name: "Pink", value: "color-pink" }
- ];
-
- if (!$scope.color) {
- // Set default selected color to black
- $scope.color = $scope.colors[0].value;
- };
-
- if (!$scope.model.title) {
- $scope.model.title = localizationService.localize("defaultdialogs_selectIcon");
- };
-
- if ($scope.model.color) {
- $scope.color = $scope.model.color;
- };
-
- if ($scope.model.icon) {
- $scope.icon = $scope.model.icon;
- };
-
- iconHelper.getIcons().then(function (icons) {
- $scope.icons = icons;
- $scope.loading = false;
- });
-
- $scope.selectIcon = function (icon, color) {
- $scope.model.icon = icon;
- $scope.model.color = color;
- $scope.submitForm($scope.model);
- };
-
- var unsubscribe = $scope.$on("formSubmitting",
- function () {
- if ($scope.color) {
- $scope.model.color = $scope.color;
- }
- });
-
- //when the scope is destroyed we need to unsubscribe
- $scope.$on("$destroy",
- function () {
- unsubscribe();
- });
-}
-
-angular.module("umbraco").controller("Umbraco.Overlays.IconPickerOverlay", IconPickerOverlay);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
deleted file mode 100644
index 0098463cb4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No icons were found.
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
deleted file mode 100644
index 3218b44dd8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
deleted file mode 100644
index 5dd1275014..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Add fallback field
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Add default value
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Format and encoding
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Modify output
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ vm.generateOutputSample() }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html
deleted file mode 100644
index 8f16bc40d4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Link to page
-
-
-
-
-
-
-
- -
-
-
-
-
- - -
-
-
-
-
-
-
-
- Select media
-
-
-
-
- Link to media
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
deleted file mode 100644
index d2d2178861..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ /dev/null
@@ -1,400 +0,0 @@
-//used for the media picker dialog
-angular.module("umbraco")
- .controller("Umbraco.Overlays.MediaPickerController",
- function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService, $element, $timeout, $cookies, localStorageService, localizationService) {
-
- if (!$scope.model.title) {
- localizationService.localize("defaultdialogs_selectMedia").then(function(value){
- $scope.model.title = value;
- });
- }
-
- var dialogOptions = $scope.model;
-
- $scope.disableFolderSelect = dialogOptions.disableFolderSelect;
- $scope.onlyImages = dialogOptions.onlyImages;
- $scope.showDetails = dialogOptions.showDetails;
- $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
- $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
- $scope.cropSize = dialogOptions.cropSize;
- $scope.lastOpenedNode = localStorageService.get("umbLastOpenedMediaNodeId");
- $scope.lockedFolder = true;
-
- var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
- var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
- if ($scope.onlyImages) {
- $scope.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
- } else {
- // Use whitelist of allowed file types if provided
- if (allowedUploadFiles !== '') {
- $scope.acceptedFileTypes = allowedUploadFiles;
- } else {
- // If no whitelist, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
- $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
- }
- }
-
- $scope.maxFileSize = umbracoSettings.maxFileSize + "KB";
-
- $scope.model.selectedImages = [];
-
- $scope.acceptedMediatypes = [];
- mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
- .then(function(types) {
- $scope.acceptedMediatypes = types;
- });
-
- $scope.searchOptions = {
- pageNumber: 1,
- pageSize: 100,
- totalItems: 0,
- totalPages: 0,
- filter: '',
- };
-
- //preload selected item
- $scope.target = undefined;
- if (dialogOptions.currentTarget) {
- $scope.target = dialogOptions.currentTarget;
- }
-
- function onInit() {
- if ($scope.startNodeId !== -1) {
- entityResource.getById($scope.startNodeId, "media")
- .then(function (ent) {
- $scope.startNodeId = ent.id;
- run();
- });
- } else {
- run();
- }
- }
-
- function run() {
- //default root item
- if (!$scope.target) {
- if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
- entityResource.getById($scope.lastOpenedNode, "media")
- .then(ensureWithinStartNode, gotoStartNode);
- } else {
- gotoStartNode();
- }
- } else {
- //if a target is specified, go look it up - generally this target will just contain ids not the actual full
- //media object so we need to look it up
- var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
- var altText = $scope.target.altText;
- if (id) {
- mediaResource.getById(id)
- .then(function (node) {
- $scope.target = node;
- if (ensureWithinStartNode(node)) {
- selectImage(node);
- $scope.target.url = mediaHelper.resolveFile(node);
- $scope.target.altText = altText;
- $scope.openDetailsDialog();
- }
- },
- gotoStartNode);
- } else {
- gotoStartNode();
- }
- }
- }
-
- $scope.upload = function(v) {
- angular.element(".umb-file-dropzone-directive .file-select").click();
- };
-
- $scope.dragLeave = function(el, event) {
- $scope.activeDrag = false;
- };
-
- $scope.dragEnter = function(el, event) {
- $scope.activeDrag = true;
- };
-
- $scope.submitFolder = function() {
- if ($scope.newFolderName) {
- $scope.creatingFolder = true;
- mediaResource
- .addFolder($scope.newFolderName, $scope.currentFolder.id)
- .then(function(data) {
- //we've added a new folder so lets clear the tree cache for that specific item
- treeService.clearCache({
- cacheKey: "__media", //this is the main media tree cache key
- childrenOf: data.parentId //clear the children of the parent
- });
- $scope.creatingFolder = false;
- $scope.gotoFolder(data);
- $scope.showFolderInput = false;
- $scope.newFolderName = "";
- });
- } else {
- $scope.showFolderInput = false;
- }
- };
-
- $scope.enterSubmitFolder = function(event) {
- if (event.keyCode === 13) {
- $scope.submitFolder();
- event.stopPropagation();
- }
- };
-
- $scope.gotoFolder = function(folder) {
- if (!$scope.multiPicker) {
- deselectAllImages($scope.model.selectedImages);
- }
-
- if (!folder) {
- folder = { id: -1, name: "Media", icon: "icon-folder" };
- }
-
- if (folder.id > 0) {
- entityResource.getAncestors(folder.id, "media")
- .then(function(anc) {
- $scope.path = _.filter(anc,
- function(f) {
- return f.path.indexOf($scope.startNodeId) !== -1;
- });
- });
-
- } else {
- $scope.path = [];
- }
-
- mediaTypeHelper.getAllowedImagetypes(folder.id)
- .then(function (types) {
- $scope.acceptedMediatypes = types;
- });
-
- $scope.lockedFolder = folder.id === -1 && $scope.model.startNodeIsVirtual;
-
- $scope.currentFolder = folder;
- localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
- return getChildren(folder.id);
- };
-
- $scope.clickHandler = function(image, event, index) {
- if (image.isFolder) {
- if ($scope.disableFolderSelect) {
- $scope.gotoFolder(image);
- } else {
- eventsService.emit("dialogs.mediaPicker.select", image);
- selectImage(image);
- }
- } else {
- eventsService.emit("dialogs.mediaPicker.select", image);
- if ($scope.showDetails) {
-
- $scope.target = image;
-
- // handle both entity and full media object
- if (image.image) {
- $scope.target.url = image.image;
- } else {
- $scope.target.url = mediaHelper.resolveFile(image);
- }
-
- $scope.openDetailsDialog();
- } else {
- selectImage(image);
- }
- }
- };
-
- $scope.clickItemName = function(item) {
- if (item.isFolder) {
- $scope.gotoFolder(item);
- }
- };
-
- function selectImage(image) {
- if (image.selected) {
- for (var i = 0; $scope.model.selectedImages.length > i; i++) {
- var imageInSelection = $scope.model.selectedImages[i];
- if (image.key === imageInSelection.key) {
- image.selected = false;
- $scope.model.selectedImages.splice(i, 1);
- }
- }
- } else {
- if (!$scope.multiPicker) {
- deselectAllImages($scope.model.selectedImages);
- }
- image.selected = true;
- $scope.model.selectedImages.push(image);
- }
- }
-
- function deselectAllImages(images) {
- for (var i = 0; i < images.length; i++) {
- var image = images[i];
- image.selected = false;
- }
- images.length = 0;
- }
-
- $scope.onUploadComplete = function(files) {
- $scope.gotoFolder($scope.currentFolder).then(function() {
- if (files.length === 1 && $scope.model.selectedImages.length === 0) {
- selectImage($scope.images[$scope.images.length - 1]);
- }
- });
- };
-
- $scope.onFilesQueue = function() {
- $scope.activeDrag = false;
- };
-
- function ensureWithinStartNode(node) {
- // make sure that last opened node is on the same path as start node
- var nodePath = node.path.split(",");
-
- if (nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
- $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
- return true;
- } else {
- $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
- return false;
- }
- }
-
- function gotoStartNode(err) {
- $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
- }
-
- $scope.openDetailsDialog = function() {
-
- $scope.mediaPickerDetailsOverlay = {};
- $scope.mediaPickerDetailsOverlay.show = true;
-
- $scope.mediaPickerDetailsOverlay.submit = function(model) {
- $scope.model.selectedImages.push($scope.target);
- $scope.model.submit($scope.model);
-
- $scope.mediaPickerDetailsOverlay.show = false;
- $scope.mediaPickerDetailsOverlay = null;
- };
-
- $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
- $scope.mediaPickerDetailsOverlay.show = false;
- $scope.mediaPickerDetailsOverlay = null;
- };
- };
-
- var debounceSearchMedia = _.debounce(function() {
- $scope.$apply(function() {
- if ($scope.searchOptions.filter) {
- searchMedia();
- } else {
- // reset pagination
- $scope.searchOptions = {
- pageNumber: 1,
- pageSize: 100,
- totalItems: 0,
- totalPages: 0,
- filter: ''
- };
- getChildren($scope.currentFolder.id);
- }
- });
- }, 500);
-
- $scope.changeSearch = function() {
- $scope.loading = true;
- debounceSearchMedia();
- };
-
- $scope.changePagination = function(pageNumber) {
- $scope.loading = true;
- $scope.searchOptions.pageNumber = pageNumber;
- searchMedia();
- };
-
- function searchMedia() {
- $scope.loading = true;
- entityResource.getPagedDescendants($scope.startNodeId, "Media", $scope.searchOptions)
- .then(function(data) {
- // update image data to work with image grid
- angular.forEach(data.items,
- function(mediaItem) {
- // set thumbnail and src
- mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
- mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
- // set properties to match a media object
- mediaItem.properties = [];
- if (mediaItem.metaData) {
- if (mediaItem.metaData.umbracoWidth && mediaItem.metaData.umbracoHeight) {
- mediaItem.properties.push({
- alias: "umbracoWidth",
- value: mediaItem.metaData.umbracoWidth.Value
- });
- mediaItem.properties.push({
- alias: "umbracoHeight",
- value: mediaItem.metaData.umbracoHeight.Value
- });
- }
- if (mediaItem.metaData.umbracoFile) {
- mediaItem.properties.push({
- alias: "umbracoFile",
- editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
- value: mediaItem.metaData.umbracoFile.Value
- });
- }
- }
- });
- // update images
- $scope.images = data.items ? data.items : [];
- // update pagination
- if (data.pageNumber > 0)
- $scope.searchOptions.pageNumber = data.pageNumber;
- if (data.pageSize > 0)
- $scope.searchOptions.pageSize = data.pageSize;
- $scope.searchOptions.totalItems = data.totalItems;
- $scope.searchOptions.totalPages = data.totalPages;
- // set already selected images to selected
- preSelectImages();
- $scope.loading = false;
- });
- }
-
- function getChildren(id) {
- $scope.loading = true;
- return mediaResource.getChildren(id)
- .then(function(data) {
- $scope.searchOptions.filter = "";
- $scope.images = data.items ? data.items : [];
- // set already selected images to selected
- preSelectImages();
- $scope.loading = false;
- });
- }
-
- function preSelectImages() {
- for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
- var folderImage = $scope.images[folderImageIndex];
- var imageIsSelected = false;
-
- if ($scope.model && angular.isArray($scope.model.selectedImages)) {
- for (var selectedImageIndex = 0;
- selectedImageIndex < $scope.model.selectedImages.length;
- selectedImageIndex++) {
- var selectedImage = $scope.model.selectedImages[selectedImageIndex];
-
- if (folderImage.key === selectedImage.key) {
- imageIsSelected = true;
- }
- }
- }
-
- if (imageIsSelected) {
- folderImage.selected = true;
- }
- }
- }
-
- onInit();
-
- });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
deleted file mode 100644
index 482485c4b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
+++ /dev/null
@@ -1,150 +0,0 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.html
deleted file mode 100644
index ab481d5f0d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
- There are no macros available to insert
-
-
-
-
-
-
-
-
-
- -
-
- - - - {{ availableItem.name }} - - -
-
-
- There are no parameters for this macro
-
-
-
- {{model.selectedMacro.name}}
- --
-
-
-
-
- - -- --
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.html
deleted file mode 100644
index 30afe56d4b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html
deleted file mode 100644
index b97057302e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
index e850bf22b8..fc62485521 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
@@ -1,4 +1,4 @@
-
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index c5cecb2190..41ddd04584 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -8,38 +8,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+ {{status.culture}}:
+
+ {{status.label}}
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
new file mode 100644
index 0000000000..f0c1132005
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ {{ group.label }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html
new file mode 100644
index 0000000000..3a41f0623d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html
@@ -0,0 +1,6 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html
index b3978ca754..9e675b15ba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html
@@ -1,5 +1,10 @@
-
+
+
-
+
@@ -12,7 +12,7 @@
+ title="{{$parent.icon}}">
-
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
index 21500e7c84..8ea809ef8b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
@@ -1,9 +1,10 @@
@@ -100,17 +98,15 @@
-
+
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
index df64055d1e..3166992e8a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
@@ -1,14 +1,45 @@
-
-
- - - - {{ item.name }} - + +
- + + +
-
+
+
+ + {{ moreButton.name }} + + +
+ + ++ + + {{ item.name }} + + +
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
index 76d3104924..4e4a7229cc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
@@ -3,12 +3,12 @@
+
+
+
- Add
-
-
-
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 efafb9066d..0a44a9fcaa 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
@@ -229,10 +229,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
$scope.sortableOptions = {
axis: 'y',
cursor: "move",
- handle: ".nested-content__icon--move",
+ handle: ".umb-nested-content__icon--move",
start: function (ev, ui) {
// Yea, yea, we shouldn't modify the dom, sue me
- $("#nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
+ $("#umb-nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
tinymce.execCommand('mceRemoveEditor', false, $(this).attr('id'));
$(this).css("visibility", "hidden");
});
@@ -244,7 +244,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
$scope.setDirty();
},
stop: function (ev, ui) {
- $("#nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
+ $("#umb-nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
tinymce.execCommand('mceAddEditor', true, $(this).attr('id'));
$(this).css("visibility", "visible");
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
index 4b43df9c93..0617331682 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
@@ -1,4 +1,4 @@
-
+
+
-
-
\ No newline at end of file
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/sort.html b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
new file mode 100644
index 0000000000..fd3eae1e7a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
@@ -0,0 +1,89 @@
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
index 82b088df49..db0314639c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
@@ -11,36 +11,27 @@
name-locked="true">
-
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-content-name.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-content-name.html
deleted file mode 100644
index 46ad6e5eff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-content-name.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-header.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-header.html
deleted file mode 100644
index c65b373795..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-header.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
index 640eb5fa02..b66c46f66d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
@@ -1,6 +1,6 @@
//this controller simply tells the dialogs service to open a memberPicker window
//with a specified callback, this callback will receive an object with a selection on it
-function memberGroupPicker($scope, dialogService){
+function memberGroupPicker($scope, editorService){
function trim(str, chr) {
var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
@@ -18,34 +18,25 @@ function memberGroupPicker($scope, dialogService){
}
$scope.openMemberGroupPicker = function() {
-
- $scope.memberGroupPicker = {};
- $scope.memberGroupPicker.multiPicker = true;
- $scope.memberGroupPicker.view = "memberGroupPicker";
- $scope.memberGroupPicker.show = true;
-
- $scope.memberGroupPicker.submit = function(model) {
-
- if(model.selectedMemberGroups) {
- _.each(model.selectedMemberGroups, function (item, i) {
- $scope.add(item);
- });
- }
-
- if(model.selectedMemberGroup) {
- $scope.clear();
- $scope.add(model.selectedMemberGroup);
- }
-
- $scope.memberGroupPicker.show = false;
- $scope.memberGroupPicker = null;
- };
-
- $scope.memberGroupPicker.close = function(oldModel) {
- $scope.memberGroupPicker.show = false;
- $scope.memberGroupPicker = null;
- };
-
+ var memberGroupPicker = {
+ multiPicker: true,
+ submit: function(model) {
+ if(model.selectedMemberGroups) {
+ _.each(model.selectedMemberGroups, function (item, i) {
+ $scope.add(item);
+ });
+ }
+ if(model.selectedMemberGroup) {
+ $scope.clear();
+ $scope.add(model.selectedMemberGroup);
+ }
+ editorService.close();
+ },
+ close: function() {
+ editorService.close();
+ }
+ };
+ editorService.memberGroupPicker(memberGroupPicker);
};
$scope.remove =function(index){
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
index 0f2a9e58d6..afd0c358a6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
@@ -18,11 +18,4 @@
- ![]()
+ ![]()
-
\ No newline at end of file
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
index 5e6fe6d662..b2acbb8774 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
@@ -6,7 +6,7 @@
ng-click="load(node)">
- {{::node.name}}
+ {{node.name}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
index eae299e579..d3105d52a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
@@ -1,7 +1,7 @@
-
@@ -48,8 +50,11 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
similarity index 52%
rename from src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
index ba8d4f1712..a99da13811 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
@@ -1,45 +1,29 @@
(function () {
"use strict";
- function PublishController($scope, localizationService) {
+ function SaveContentController($scope, localizationService) {
var vm = this;
- vm.variants = $scope.model.variants;
- vm.changeSelection = changeSelection;
vm.loading = true;
- vm.dirtyVariantFilter = dirtyVariantFilter;
- vm.pristineVariantFilter = pristineVariantFilter;
vm.hasPristineVariants = false;
- //watch this model, if it's reset, then re init
- $scope.$watch(function () {
- return $scope.model.variants;
- },
- function (newVal, oldVal) {
- vm.variants = newVal;
- if (oldVal && oldVal.length) {
- //re-bind the selections
- for (var i = 0; i < oldVal.length; i++) {
- var found = _.find(vm.variants, function (v) {
- return v.language.id === oldVal[i].language.id;
- });
- if (found) {
- found.publish = oldVal[i].publish;
- }
- }
- }
- onInit();
- });
-
+ vm.changeSelection = changeSelection;
+ vm.dirtyVariantFilter = dirtyVariantFilter;
+ vm.pristineVariantFilter = pristineVariantFilter;
+
function changeSelection(variant) {
var firstSelected = _.find(vm.variants, function (v) {
- return v.publish;
+ return v.save;
});
$scope.model.disableSubmitButton = !firstSelected; //disable submit button if there is none selected
}
function dirtyVariantFilter(variant) {
- return (variant.current || variant.isEdited === true || (variant.isEdited === false && variant.state === "Unpublished"));
+ //determine a variant is 'dirty' (meaning it will show up as save-able) if it's
+ // * the active one
+ // * it's editor is in a $dirty state
+ // * it is in NotCreated state
+ return (variant.active || variant.isDirty);
}
function pristineVariantFilter(variant) {
@@ -48,8 +32,10 @@
function onInit() {
+ vm.variants = $scope.model.variants;
+
if(!$scope.model.title) {
- localizationService.localize("content_readyToPublish").then(function(value){
+ localizationService.localize("content_readyToSave").then(function(value){
$scope.model.title = value;
});
}
@@ -59,7 +45,7 @@
_.each(vm.variants,
function (variant) {
variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
- variant.htmlId = "publish_variant_" + variant.compositeId;
+ variant.htmlId = "_content_variant_" + variant.compositeId;
//check for pristine variants
if (!vm.hasPristineVariants) {
@@ -70,19 +56,37 @@
if (vm.variants.length !== 0) {
//now sort it so that the current one is at the top
vm.variants = _.sortBy(vm.variants, function (v) {
- return v.current ? 0 : 1;
+ return v.active ? 0 : 1;
});
- //ensure that the current one is selected
- vm.variants[0].publish = true;
+
+ var active = _.find(vm.variants, function (v) {
+ return v.active;
+ });
+
+ if (active) {
+ //ensure that the current one is selected
+ active.save = true;
+ }
+
} else {
- //disable Publish button if we have nothing to publish
+ //disable save button if we have nothing to save
$scope.model.disableSubmitButton = true;
}
vm.loading = false;
}
+
+ onInit();
+
+ //when this dialog is closed, reset all 'save' flags
+ $scope.$on('$destroy', function () {
+ for (var i = 0; i < vm.variants.length; i++) {
+ vm.variants[i].save = false;
+ }
+ });
+
}
- angular.module("umbraco").controller("Umbraco.Overlays.PublishController", PublishController);
+ angular.module("umbraco").controller("Umbraco.Overlays.SaveContentController", SaveContentController);
})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
new file mode 100644
index 0000000000..0515bd878e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -0,0 +1,62 @@
+
-
{{ variant.language.name }}
-
+
+ {{ variant.language.name }}
+ *
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
index 3dd5e846a8..2981097656 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
@@ -1,19 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ {{ variant.language.name }}
+ *
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
index 1a83a5e329..5b42657ddd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
@@ -1,9 +1,9 @@
Hours of Umbraco training videos are only a click away
-Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos
+Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos
To get you started:
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html
index d8d3d127eb..5b4bc988c0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html
@@ -5,10 +5,10 @@
- Find the answers to your Umbraco questions on our Community Wiki +
- Find the answers to your Umbraco questions in our Documentation
- Ask a question in the Community Forum
- Find an add-on package to help you get going quickly -
- Watch our tutorial videos (some are free, some require a subscription) -
- Find out about our productivity boosting tools and commercial support -
- Find out about real-life training and certification opportunities +
- Watch our tutorial videos (some are free, some require a subscription) +
- Find out about our productivity boosting tools and commercial support +
- Find out about real-life training and certification opportunities
- Drag the files and folders you wish to upload directly into the Desktop Media Uploader application
- Click Upload to start uploading -
- Read more about working with the Items in Settings in the Documentation section of Our Umbraco
- Download the Editors Manual for details on working with the Umbraco UI
- Ask a question in the Community Forum -
- Watch our tutorial videos (some are free, some require a subscription) -
- Find out about our productivity boosting tools and commercial support -
- Find out about real-life training and certification opportunities +
- Watch our tutorial videos (some are free, some require a subscription) +
- Find out about our productivity boosting tools and commercial support +
- Find out about real-life training and certification opportunities
Find out more:
-
-
Hours of Umbraco training videos are only a click away
-Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit umbraco.tv for even more Umbraco videos.
+Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit umbraco.tv for even more Umbraco videos.
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/desktopmediauploader.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/desktopmediauploader.html
index 59a50f44fb..10609bf497 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/desktopmediauploader.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/desktopmediauploader.html
@@ -8,7 +8,7 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardintro.html
index 0af91b4544..b8c28bbd39 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardintro.html
@@ -10,4 +10,4 @@
-
\ No newline at end of file
+Download Desktop Media Uploader now.
- This application requires Adobe® AIR™ to be installed for Mac OS or Windows. + This application requires Adobe® AIR™ to be installed for Mac OS or Windows.For a more thorough guide on how to use the Desktop Media Uploader, checkout this video.
+For a more thorough guide on how to use the Desktop Media Uploader, checkout this video.
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html index 08e7fb3c41..f04aff24c1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html @@ -1,9 +1,9 @@Hours of Umbraco training videos are only a click away
-Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos
+Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos
To get you started:
-
@@ -15,4 +15,4 @@
-
+
+
-
-
-
-
-
-
- Name
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- | {{column.displayName}} | + +|
|---|---|
| + {{item.name}} + | ++ + + | +
-
-
-
- Required
- {{contentNameForm.name.errorMsg}}
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-item-sorter.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-item-sorter.html
deleted file mode 100644
index 569a678dfb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-item-sorter.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-login.html
deleted file mode 100644
index 3bf8332ad3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-login.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- {{model.successMsg}}
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-optionsmenu.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-optionsmenu.html
deleted file mode 100644
index f834dfb93b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-optionsmenu.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-Happy {{today}}!, log in below
-
-
-
-
-
-
-
-
-
-
-
- Actions
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-photo-folder.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-photo-folder.html
deleted file mode 100644
index 67e0ecbf66..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-photo-folder.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-tab-view.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-tab-view.html
deleted file mode 100644
index 93b520cb79..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-tab-view.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-upload-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-upload-dropzone.html
deleted file mode 100644
index 20a8f9d741..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-upload-dropzone.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index 30c2b493da..7a1a825e46 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -290,8 +290,7 @@
/* ---------- SAVE ---------- */
function save() {
- //return the saveInternal method but catch rejections since this is the upper most caller
- return saveInternal().catch(angular.noop);
+ saveInternal();
}
/** This internal save method performs the actual saving and returns a promise, not to be bound to any buttons but used by other bound methods */
@@ -305,6 +304,9 @@
// reformat allowed content types to array if id's
vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes);
+ //if this is a new item and it's creating a template, ensure that the template alias is synced correctly
+ syncTemplateAlias(vm.contentType);
+
return contentEditingHelper.contentEditorPerformSave({
saveMethod: contentTypeResource.save,
scope: $scope,
@@ -411,6 +413,24 @@
vm.contentType = contentType;
}
+ /** Syncs the template alias for new doc types before saving if a template is to be created */
+ function syncTemplateAlias(contentType) {
+ if (!noTemplate && contentType.id === 0) {
+ //sync default template that had the placeholder flag
+ if (contentType.defaultTemplate !== null && contentType.defaultTemplate.placeholder) {
+ contentType.defaultTemplate.name = contentType.name;
+ contentType.defaultTemplate.alias = contentType.alias;
+ }
+ //sync allowed templates that had the placeholder flag
+ angular.forEach(contentType.allowedTemplates, function (allowedTemplate) {
+ if (allowedTemplate.placeholder) {
+ allowedTemplate.name = contentType.name;
+ allowedTemplate.alias = contentType.alias;
+ }
+ });
+ }
+ }
+
function convertLegacyIcons(contentType) {
// make array to store contentType icon
var contentTypeArray = [];
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js
new file mode 100644
index 0000000000..b7e09db84f
--- /dev/null
+++ b/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";
+ }
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
new file mode 100644
index 0000000000..db6c19da98
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
@@ -0,0 +1,53 @@
+
-
-
-
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
index a5c446dfb5..42d14fa5dc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
@@ -31,7 +31,7 @@
var labelKeys = [
"treeHeaders_languages",
"general_mandatory",
- "general_default",
+ "general_default"
"languages_fallsbackToLabel"
];
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.controller.js
index 3349bfbcba..6dcf1211c2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.controller.js
@@ -6,7 +6,7 @@
var vm = this;
function onInit() {
- angular.forEach($scope.model.tabs, function(group){
+ angular.forEach($scope.content.tabs, function(group){
group.open = true;
});
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
index a865e2ff5d..c0e2c2ae33 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
@@ -1,9 +1,9 @@
+
+
+
Please choose a .udt file to import
+
+
+
+
+
+ Name :
+
+ {{vm.model.name}}
+
+ +Alias :
+
+ {{vm.model.alias}}
+
+
+ +
+ + +
+
+ +
+ {{vm.model.name}} has been imported!
+
+
-
+ ng-if="content"
+ node="content">
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.controller.js
deleted file mode 100644
index 7ad5724e75..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.controller.js
+++ /dev/null
@@ -1,23 +0,0 @@
-(function () {
- "use strict";
-
- function MediaAppListViewController($scope) {
-
- var vm = this;
-
- vm.listViewGroup = {};
-
- function onInit() {
- angular.forEach($scope.model.tabs, function(group){
- if(group.alias === "Contents") {
- vm.listViewGroup = group;
- }
- });
- }
-
- onInit();
-
- }
-
- angular.module("umbraco").controller("Umbraco.Editors.Media.Apps.ListViewController", MediaAppListViewController);
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.html
index e463680ae6..6c558301c7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.html
@@ -1,8 +1,7 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index c0a469a554..e5e3d98f6f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -10,17 +10,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.allowEditMedia = false;
$scope.allowAddMedia = false;
- userService.getCurrentUser().then(function(userData) {
- if (!$scope.model.config.startNodeId) {
- $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
- $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
- }
- // only allow users to add and edit media if they have access to the media section
- var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
- $scope.allowEditMedia = hasAccessToMedia;
- $scope.allowAddMedia = hasAccessToMedia;
- });
-
function setupViewModel() {
$scope.images = [];
$scope.ids = [];
@@ -37,7 +26,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
// might require it's use. Therefore we need to use the metaData property to get at the thumbnail
// value.
- entityResource.getByIds(ids, "Media").then(function(medias) {
+ entityResource.getByIds(ids, "Media").then(function (medias) {
// The service only returns item results for ids that exist (deleted items are silently ignored).
// This results in the picked items value to be set to contain only ids of picked items that could actually be found.
@@ -47,11 +36,11 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
// on whether it is simply resaved or not.
// This is done by remapping the int/guid ids into a new array of items, where we create "Deleted item" placeholders
// when there is no match for a selected id. This will ensure that the values being set on save, are the same as before.
-
+
medias = _.map(ids,
- function(id) {
+ function (id) {
var found = _.find(medias,
- function(m) {
+ function (m) {
// We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
// it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
// compares and be completely sure it works.
@@ -72,7 +61,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
});
_.each(medias,
- function(media, i) {
+ function (media, i) {
// if there is no thumbnail, try getting one if the media is not a placeholder item
if (!media.thumbnail && media.id && media.metaData) {
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
@@ -87,95 +76,22 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
}
});
- $scope.sync();
+ sync();
});
}
}
- setupViewModel();
-
- $scope.remove = function(index) {
- $scope.images.splice(index, 1);
- $scope.ids.splice(index, 1);
- $scope.sync();
+ function sync() {
+ $scope.model.value = $scope.ids.join();
};
- $scope.editItem = function(item) {
- var mediaEditor = {
- id: item.id,
- submit: function(model) {
- editorService.close();
- // update the selected media item to match the saved media item
- // the media picker is using media entities so we get the
- // entity so we easily can format it for use in the media grid
- if(model && model.mediaNode) {
- entityResource.getById(model.mediaNode.id, "media")
- .then(function (mediaEntity) {
- // if an image is selecting more than once
- // we need to update all the media items
- angular.forEach($scope.images, function(image){
- if(image.id === model.mediaNode.id) {
- angular.extend(image, mediaEntity);
- image.thumbnail = mediaHelper.resolveFileFromEntity(image, true);
- }
- });
- });
- }
- },
- close: function(model) {
- editorService.close();
- }
- };
- editorService.mediaEditor(mediaEditor);
- };
-
- $scope.add = function() {
- var mediaPicker = {
- startNodeId: $scope.model.config.startNodeId,
- startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
- multiPicker: multiPicker,
- onlyImages: onlyImages,
- disableFolderSelect: disableFolderSelect,
- submit: function(model) {
-
- editorService.close();
-
- _.each(model.selectedImages, function(media, i) {
- // if there is no thumbnail, try getting one if the media is not a placeholder item
- if (!media.thumbnail && media.id && media.metaData) {
- media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
- }
-
- $scope.images.push(media);
-
- if ($scope.model.config.idType === "udi") {
- $scope.ids.push(media.udi);
- }
- else {
- $scope.ids.push(media.id);
- }
-
- });
- $scope.sync();
- reloadUpdatedMediaItems(model.updatedMediaNodes);
- },
- close: function(model) {
- editorService.close();
- reloadUpdatedMediaItems(model.updatedMediaNodes);
- }
- }
-
- editorService.mediaPicker(mediaPicker);
-
- };
-
- function reloadUpdatedMediaItems(updatedMediaNodes) {
+ function reloadUpdatedMediaItems(updatedMediaNodes) {
// because the images can be edited through the media picker we need to
// reload. We only reload the images that is already picked but has been updated.
// We have to get the entities from the server because the media
// can be edited without being selected
- _.each($scope.images, function(image, i) {
- if(updatedMediaNodes.indexOf(image.udi) !== -1) {
+ _.each($scope.images, function (image, i) {
+ if (updatedMediaNodes.indexOf(image.udi) !== -1) {
image.loading = true;
entityResource.getById(image.udi, "media")
.then(function (mediaEntity) {
@@ -185,31 +101,131 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
});
}
})
- }
+ }
- $scope.sortableOptions = {
- disabled: !$scope.isMultiPicker,
- items: "li:not(.add-wrapper)",
- cancel: ".unsortable",
- update: function(e, ui) {
- var r = [];
- // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
- // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
- // watch do all the rest.
- $timeout(function(){
- angular.forEach($scope.images, function(value, key) {
+ function init() {
+
+ userService.getCurrentUser().then(function (userData) {
+ if (!$scope.model.config.startNodeId) {
+ $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+ $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+ }
+ // only allow users to add and edit media if they have access to the media section
+ var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
+ $scope.allowEditMedia = hasAccessToMedia;
+ $scope.allowAddMedia = hasAccessToMedia;
+
+ setupViewModel();
+
+ //When the model value changes sync the view model
+ $scope.$watch("model.value",
+ function (newVal, oldVal) {
+ if (newVal !== oldVal) {
+ setupViewModel();
+ }
+ });
+ });
+
+ }
+
+ $scope.remove = function (index) {
+ $scope.images.splice(index, 1);
+ $scope.ids.splice(index, 1);
+ sync();
+ };
+
+ $scope.editItem = function (item) {
+ var mediaEditor = {
+ id: item.id,
+ submit: function (model) {
+ editorService.close();
+ // update the selected media item to match the saved media item
+ // the media picker is using media entities so we get the
+ // entity so we easily can format it for use in the media grid
+ if (model && model.mediaNode) {
+ entityResource.getById(model.mediaNode.id, "media")
+ .then(function (mediaEntity) {
+ // if an image is selecting more than once
+ // we need to update all the media items
+ angular.forEach($scope.images, function (image) {
+ if (image.id === model.mediaNode.id) {
+ angular.extend(image, mediaEntity);
+ image.thumbnail = mediaHelper.resolveFileFromEntity(image, true);
+ }
+ });
+ });
+ }
+ },
+ close: function (model) {
+ editorService.close();
+ }
+ };
+ editorService.mediaEditor(mediaEditor);
+ };
+
+ $scope.add = function () {
+ var mediaPicker = {
+ startNodeId: $scope.model.config.startNodeId,
+ startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
+ multiPicker: multiPicker,
+ onlyImages: onlyImages,
+ disableFolderSelect: disableFolderSelect,
+
+ allowMediaEdit: true,
+ submit: function(model) {
+
+ editorService.close();
+
+ _.each(model.selectedImages, function (media, i) {
+ // if there is no thumbnail, try getting one if the media is not a placeholder item
+ if (!media.thumbnail && media.id && media.metaData) {
+ media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
+ }
+
+ $scope.images.push(media);
+
+ if ($scope.model.config.idType === "udi") {
+ $scope.ids.push(media.udi);
+ }
+ else {
+ $scope.ids.push(media.id);
+ }
+
+ });
+ sync();
+ reloadUpdatedMediaItems(model.updatedMediaNodes);
+ },
+ close: function (model) {
+ editorService.close();
+ reloadUpdatedMediaItems(model.updatedMediaNodes);
+ }
+ }
+
+ editorService.mediaPicker(mediaPicker);
+
+ };
+
+
+
+ $scope.sortableOptions = {
+ disabled: !$scope.isMultiPicker,
+ items: "li:not(.add-wrapper)",
+ cancel: ".unsortable",
+ update: function (e, ui) {
+ var r = [];
+ // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
+ // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
+ // watch do all the rest.
+ $timeout(function () {
+ angular.forEach($scope.images, function (value, key) {
r.push($scope.model.config.idType === "udi" ? value.udi : value.id);
});
$scope.ids = r;
- $scope.sync();
+ sync();
}, 500, false);
}
};
- $scope.sync = function() {
- $scope.model.value = $scope.ids.join();
- };
-
$scope.showAdd = function () {
if (!multiPicker) {
if ($scope.model.value && $scope.model.value !== "") {
@@ -219,10 +235,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
return true;
};
- //here we declare a special method which will be called whenever the value has changed from the server
- //this is instead of doing a watch on the model.value = faster
- $scope.model.onValueChanged = function (newVal, oldVal) {
- //update the display val again if it has changed from the server
- setupViewModel();
- };
+ init();
+
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 48858a507b..3658f828f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -42,12 +42,4 @@
+
\ No newline at end of file
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/info/info.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/info/info.html
index a5bb9a4929..84b7327b8a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/info/info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/info/info.html
@@ -1,4 +1,4 @@
{{ group.label }}
-
+
@@ -14,4 +14,4 @@
-
+
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
index e397722f7d..9ce7e18f06 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
@@ -4,7 +4,7 @@
function updateToggleValue() {
$scope.toggleValue = false;
- if ($scope.model && $scope.model.value && ($scope.model.value.toString() === "1" || angular.lowercase($scope.model.value) === "true")) {
+ if ($scope.model && Object.toBoolean($scope.model.value)) {
$scope.toggleValue = true;
}
}
@@ -16,7 +16,7 @@
updateToggleValue();
$scope.toggle = function(){
- if($scope.model.value === 1 || $scope.model.value === "1"){
+ if (Object.toBoolean($scope.model.value)) {
$scope.model.value = "0";
updateToggleValue();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
index 729d899439..4c8c5f845a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
@@ -5,11 +5,11 @@ function booleanEditorController($scope, $rootScope, assetsService) {
value: false
};
- if ($scope.model.config && $scope.model.config.default && $scope.model.config.default.toString() === "1" && $scope.model && !$scope.model.value) {
+ if ($scope.model.config && $scope.model.config.default && Object.toBoolean($scope.model.config.default) && $scope.model && !$scope.model.value) {
$scope.renderModel.value = true;
}
- if ($scope.model && $scope.model.value && ($scope.model.value.toString() === "1" || $scope.model.value.toString().toLowerCase() === "true")) {
+ if ($scope.model && $scope.model.value && Object.toBoolean($scope.model.value)) {
$scope.renderModel.value = true;
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index f58655937d..9ef1b69aad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -1,64 +1,91 @@
angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListController",
- function($scope) {
-
- if (angular.isObject($scope.model.config.items)) {
-
- //now we need to format the items in the dictionary because we always want to have an array
- var newItems = [];
- var vals = _.values($scope.model.config.items);
- var keys = _.keys($scope.model.config.items);
- for (var i = 0; i < vals.length; i++) {
- newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value });
+ function ($scope) {
+
+ function init() {
+
+ //we can't really do anything if the config isn't an object
+ if (angular.isObject($scope.model.config.items)) {
+
+ //now we need to format the items in the dictionary because we always want to have an array
+ var configItems = [];
+ var vals = _.values($scope.model.config.items);
+ var keys = _.keys($scope.model.config.items);
+ for (var i = 0; i < vals.length; i++) {
+ configItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value });
+ }
+
+ //ensure the items are sorted by the provided sort order
+ configItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
+
+ if ($scope.model.value === null || $scope.model.value === undefined) {
+ $scope.model.value = [];
+ }
+
+ updateViewModel(configItems);
+
+ //watch the model.value in case it changes so that we can keep our view model in sync
+ $scope.$watchCollection("model.value",
+ function (newVal) {
+ updateViewModel(configItems);
+ });
}
-
- //ensure the items are sorted by the provided sort order
- newItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
-
- //re-assign
- $scope.model.config.items = newItems;
-
+
}
- function setupViewModel() {
+ function updateViewModel(configItems) {
+
+ //check if it's already in sync
+
+ //get the checked vals from the view model
+ var selectedVals = _.map(_.filter($scope.selectedItems,
+ function(f) {
+ return f.checked;
+ }),
+ function(m) {
+ return m.key;
+ });
+ //get all of the same values between the arrays
+ var same = _.intersection($scope.model.value, selectedVals);
+ //if the lengths are the same as the value, then we are in sync, just exit
+ if (same.length == $scope.model.value.length === selectedVals.length) {
+ return;
+ }
+
$scope.selectedItems = [];
- //now we need to check if the value is null/undefined, if it is we need to set it to "" so that any value that is set
- // to "" gets selected by default
- if ($scope.model.value === null || $scope.model.value === undefined) {
- $scope.model.value = [];
- }
-
- for (var i = 0; i < $scope.model.config.items.length; i++) {
- var isChecked = _.contains($scope.model.value, $scope.model.config.items[i].id);
+ for (var i = 0; i < configItems.length; i++) {
+ var isChecked = _.contains($scope.model.value, configItems[i].id);
$scope.selectedItems.push({
checked: isChecked,
- key: $scope.model.config.items[i].id,
- val: $scope.model.config.items[i].value
+ key: configItems[i].id,
+ val: configItems[i].value
});
}
-
}
- setupViewModel();
-
+ function changed(item) {
+ var index = _.findIndex($scope.model.value,
+ function (v) {
+ return v === item.key;
+ });
- //update the model when the items checked changes
- $scope.$watch("selectedItems", function(newVal, oldVal) {
-
- $scope.model.value = [];
- for (var x = 0; x < $scope.selectedItems.length; x++) {
- if ($scope.selectedItems[x].checked) {
- $scope.model.value.push($scope.selectedItems[x].key);
+ if (item.checked) {
+ //if it doesn't exist in the model, then add it
+ if (index < 0) {
+ $scope.model.value.push(item.key);
}
}
+ else {
+ //if it exists in the model, then remove it
+ if (index >= 0) {
+ $scope.model.value.splice(index, 1);
+ }
+ }
+ }
- }, true);
-
- //here we declare a special method which will be called whenever the value has changed from the server
- //this is instead of doing a watch on the model.value = faster
- $scope.model.onValueChanged = function (newVal, oldVal) {
- //update the display val again if it has changed from the server
- setupViewModel();
- };
+ $scope.selectedItems = [];
+ $scope.changed = changed;
+
+ init();
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index 0e528fbe80..b287b0b58e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,11 +1,12 @@
-
+
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index 3de3758af2..a9afde36ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -1,81 +1,74 @@
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
index d5a17c83c7..64ca0331af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
@@ -161,50 +161,33 @@
function openMacroOverlay() {
-
- vm.macroPickerOverlay = {
- view: "macropicker",
+ var macroPicker = {
dialogData: {},
- show: true,
submit: function (model) {
-
var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
insert(macroObject.syntax);
-
- vm.macroPickerOverlay.show = false;
- vm.macroPickerOverlay = null;
-
+ editorService.close();
},
- close: function(oldModel) {
- // close the dialog
- vm.macroPickerOverlay.show = false;
- vm.macroPickerOverlay = null;
- // focus editor
+ close: function() {
+ editorService.close();
vm.editor.focus();
}
};
+ editorService.macroPicker(macroPicker);
}
-
function openPageFieldOverlay() {
- vm.pageFieldOverlay = {
- submitButtonLabel: "Insert",
- closeButtonlabel: "Cancel",
- view: "insertfield",
- show: true,
+ var insertFieldEditor = {
submit: function (model) {
insert(model.umbracoField);
- vm.pageFieldOverlay.show = false;
- vm.pageFieldOverlay = null;
+ editorService.close();
},
- close: function (model) {
- // close the dialog
- vm.pageFieldOverlay.show = false;
- vm.pageFieldOverlay = null;
- // focus editor
+ close: function () {
+ editorService.close();
vm.editor.focus();
}
};
+ editorService.insertField(insertFieldEditor);
}
@@ -372,7 +355,7 @@
});
},
readOnly: true
- },
+ }
]);
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
index 4a16ad4ebf..a222234e80 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
@@ -84,18 +84,4 @@
-
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index 8c171af2f0..688b44ae64 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -116,25 +116,6 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
"view": "views/media/apps/listview/listview.html"
};
- $scope.content.apps = [];
-
- if($scope.content.contentTypeAlias === "Folder") {
- // add list view app
- $scope.content.apps.push(listview);
-
- // remove the list view tab
- angular.forEach($scope.content.tabs, function(tab, index){
- if(tab.alias === "Contents") {
- tab.hide = true;
- }
- });
-
- } else {
- $scope.content.apps.push(contentApp);
- }
-
- $scope.content.apps.push(infoApp);
-
// set first app to active
$scope.content.apps[0].active = true;
@@ -220,7 +201,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
// route but there might be server validation errors in the collection which we need to display
// after the redirect, so we will bind all subscriptions which will show the server validation errors
// if there are any and then clear them so the collection no longer persists them.
- serverValidationManager.executeAndClearAllSubscriptions();
+ serverValidationManager.notifyAndClearAllSubscriptions();
if(!infiniteMode) {
syncTreeNode($scope.content, data.path, true);
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js
index 4e54bd832a..00e09bd34d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js
@@ -22,18 +22,9 @@ function MediaRecycleBinController($scope, $routeParams, mediaResource, navigati
$routeParams.id = "-21";
mediaResource.getRecycleBin().then(function (result) {
- //we'll get the 'content item' for the recycle bin, we know that it will contain a single tab and a
- // single property, so we'll extract that property (list view) and use it's data.
- var listproperty = result.tabs[0].properties[0];
-
- _.each(listproperty.config, function (val, key) {
- $scope.model.config[key] = val;
- });
- $scope.listViewPath = 'views/propertyeditors/listview/listview.html';
+ $scope.content = result;
});
- $scope.model = { config: { entityType: $routeParams.section, layouts: [] } };
-
// sync tree node
navigationService.syncTree({ tree: "media", path: ["-1", $routeParams.id], forceReload: false });
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
new file mode 100644
index 0000000000..e7d3cc2dfb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
@@ -0,0 +1,82 @@
+(function () {
+ "use strict";
+
+ function MediaSortController($scope, $filter, mediaResource, navigationService) {
+
+ var vm = this;
+ var parentId = $scope.currentNode.parentId ? $scope.currentNode.parentId : "-1";
+ var id = $scope.currentNode.id;
+
+ vm.loading = false;
+ vm.children = [];
+ vm.saveButtonState = "init";
+ vm.sortOrder = {};
+ vm.sortableOptions = {
+ distance: 10,
+ tolerance: "pointer",
+ opacity: 0.7,
+ scroll: true,
+ cursor: "move",
+ helper: fixSortableHelper,
+ update: function() {
+ // clear the sort order when drag and drop is used
+ vm.sortOrder.column = "";
+ vm.sortOrder.reverse = false;
+ }
+ };
+
+ vm.save = save;
+ vm.sort = sort;
+
+ function onInit() {
+ vm.loading = true;
+ mediaResource.getChildren(id)
+ .then(function(data){
+ vm.children = data.items;
+ vm.loading = false;
+ });
+ }
+
+ function save() {
+ vm.saveButtonState = "busy";
+
+ var args = {
+ parentId: parentId,
+ sortedIds: _.map(vm.children, function(child){ return child.id; })
+ };
+
+ mediaResource.sort(args)
+ .then(function(){
+ navigationService.syncTree({ tree: "media", path: $scope.currentNode.path, forceReload: true, activate: false });
+ vm.saveButtonState = "success";
+ }, function(error) {
+ vm.error = error;
+ vm.saveButtonState = "error";
+ });
+ }
+
+ function fixSortableHelper(e, ui) {
+ // keep the correct width of each table cell when sorting
+ ui.children().each(function () {
+ $(this).width($(this).width());
+ });
+ return ui;
+ }
+
+ function sort(column) {
+ // reverse if it is already ordered by that column
+ if(vm.sortOrder.column === column) {
+ vm.sortOrder.reverse = !vm.sortOrder.reverse
+ } else {
+ vm.sortOrder.column = column;
+ vm.sortOrder.reverse = false;
+ }
+ vm.children = $filter('orderBy')(vm.children, vm.sortOrder.column, vm.sortOrder.reverse);
+ }
+
+ onInit();
+
+ }
+
+ angular.module("umbraco").controller("Umbraco.Editors.Media.SortController", MediaSortController);
+})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
index 16649f214a..cd4ad6d07e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
@@ -1,16 +1,20 @@
-
-
- +
- diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html index 1cb61f4168..f726800696 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html @@ -5,9 +5,9 @@
-
-
- +
-
- +-diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html index 7d88fb068f..a70ecabf35 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html @@ -1,4 +1,4 @@ -+diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js index 5403ce4aad..7978ca3150 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js +++ b/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 diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js index 749d3b4faa..04bfe98284 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js @@ -1,111 +1,168 @@ -//this controller simply tells the dialogs service to open a mediaPicker window -//with a specified callback, this callback will receive an object with a selection on it angular.module('umbraco') .controller("Umbraco.PropertyEditors.ImageCropperController", function ($rootScope, $routeParams, $scope, $log, mediaHelper, cropperHelper, $timeout, editorState, umbRequestHelper, fileManager, angularHelper) { var config = angular.copy($scope.model.config); - $scope.imageIsLoaded = false; - //move previously saved value to the editor - if ($scope.model.value) { - //backwards compat with the old file upload (incase some-one swaps them..) - if (angular.isString($scope.model.value)) { - config.src = $scope.model.value; - $scope.model.value = config; - } else if ($scope.model.value.crops) { - //sync any config changes with the editor and drop outdated crops - _.each($scope.model.value.crops, function (saved) { - var configured = _.find(config.crops, function (item) { return item.alias === saved.alias }); + $scope.filesSelected = onFileSelected; + $scope.filesChanged = onFilesChanged; + $scope.fileUploaderInit = onFileUploaderInit; + $scope.crop = crop; + $scope.done = done; + $scope.clear = clear; + $scope.focalPointChanged = focalPointChanged; + //declare a special method which will be called whenever the value has changed from the server + $scope.model.onValueChanged = onValueChanged; - if (configured && configured.height === saved.height && configured.width === saved.width) { - configured.coordinates = saved.coordinates; - } - }); - $scope.model.value.crops = config.crops; + /** + * Called when the umgImageGravity component updates the focal point value + * @param {any} left + * @param {any} top + */ + function focalPointChanged(left, top) { + //update the model focalpoint value + $scope.model.value.focalPoint = { + left: left, + top: top + }; - //restore focalpoint if missing - if (!$scope.model.value.focalPoint) { - $scope.model.value.focalPoint = { left: 0.5, top: 0.5 }; - } - } - - $scope.imageSrc = $scope.model.value.src; + //set form to dirty to track changes + $scope.imageCropperForm.$setDirty(); } + /** + * Used to assign a new model value + * @param {any} src + */ + function setModelValueWithSrc(src) { + if (!$scope.model.value || !$scope.model.value.src) { + //we are copying to not overwrite the original config + $scope.model.value = angular.extend(angular.copy($scope.model.config), { src: src }); + } + } - //crop a specific crop - $scope.crop = function (crop) { - $scope.currentCrop = crop; - $scope.currentPoint = undefined; - }; - - //done cropping - $scope.done = function () { - $scope.currentCrop = undefined; - $scope.currentPoint = undefined; - }; - - //crop a specific crop - $scope.clear = function (crop) { + /** + * called whenever the value has changed from the server + * @param {any} newVal + * @param {any} oldVal + */ + function onValueChanged(newVal, oldVal) { //clear current uploaded files - fileManager.setFiles($scope.model.alias, []); + fileManager.setFiles({ + propertyAlias: $scope.model.alias, + culture: $scope.model.culture, + files: [] + }); + } + + /** + * Called when the a new file is selected + * @param {any} value + */ + function onFileSelected(value, files) { + setModelValueWithSrc(value); + //set form to dirty to track changes + $scope.imageCropperForm.$setDirty(); + } + + /** + * Called when the file collection changes + * @param {any} value + * @param {any} files + */ + function onFilesChanged(files) { + if (files && files[0]) { + $scope.imageSrc = files[0].fileSrc; + //set form to dirty to track changes + $scope.imageCropperForm.$setDirty(); + } + } + + /** + * Called when the file uploader initializes + * @param {any} value + */ + function onFileUploaderInit(value, files) { + //move previously saved value to the editor + if ($scope.model.value) { + //backwards compat with the old file upload (incase some-one swaps them..) + if (angular.isString($scope.model.value)) { + setModelValueWithSrc($scope.model.value); + } + else if ($scope.model.value.crops) { + //sync any config changes with the editor and drop outdated crops + _.each($scope.model.value.crops, function (saved) { + var configured = _.find(config.crops, function (item) { return item.alias === saved.alias }); + + if (configured && configured.height === saved.height && configured.width === saved.width) { + configured.coordinates = saved.coordinates; + } + }); + $scope.model.value.crops = config.crops; + + //restore focalpoint if missing + if (!$scope.model.value.focalPoint) { + $scope.model.value.focalPoint = { left: 0.5, top: 0.5 }; + } + } + + //if there are already files in the client assigned then set the src + if (files && files[0]) { + $scope.imageSrc = files[0].fileSrc; + } + else { + $scope.imageSrc = $scope.model.value.src; + } + + } + } + + /** + * crop a specific crop + * @param {any} crop + */ + function crop(crop) { + $scope.currentCrop = crop; + $scope.currentPoint = null; + + //set form to dirty to track changes + $scope.imageCropperForm.$setDirty(); + }; + + /** done cropping */ + function done() { + $scope.currentCrop = null; + $scope.currentPoint = null; + + //set form to dirty to track changes + $scope.imageCropperForm.$setDirty(); + }; + + /** + * crop a specific crop + * @param {any} crop + */ + function clear(crop) { + //clear current uploaded files + fileManager.setFiles({ + propertyAlias: $scope.model.alias, + culture: $scope.model.culture, + files: [] + }); //clear the ui - $scope.imageSrc = undefined; + $scope.imageSrc = null; if ($scope.model.value) { - delete $scope.model.value; + $scope.model.value = null; } - // set form to dirty to tricker discard changes dialog - var currForm = angularHelper.getCurrentForm($scope); - currForm.$setDirty(); + //set form to dirty to track changes + $scope.imageCropperForm.$setDirty(); }; - - //show previews - $scope.togglePreviews = function () { - if ($scope.showPreviews) { - $scope.showPreviews = false; - $scope.tempShowPreviews = false; - } else { - $scope.showPreviews = true; - } - }; - - $scope.imageLoaded = function() { - $scope.imageIsLoaded = true; - }; - - //on image selected, update the cropper - $scope.$on("filesSelected", function (ev, args) { - $scope.model.value = config; - - if (args.files && args.files[0]) { - - fileManager.setFiles($scope.model.alias, args.files); - - var reader = new FileReader(); - reader.onload = function (e) { - - $scope.$apply(function () { - $scope.imageSrc = e.target.result; - }); - - }; - - reader.readAsDataURL(args.files[0]); - } - }); - - - //here we declare a special method which will be called whenever the value has changed from the server - $scope.model.onValueChanged = function (newVal, oldVal) { - //clear current uploaded files - fileManager.setFiles($scope.model.alias, []); - }; - + var unsubscribe = $scope.$on("formSubmitting", function () { - $scope.done(); + $scope.currentCrop = null; + $scope.currentPoint = null; }); $scope.$on('$destroy', function () { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html index 64a2b97ef4..bc84f1b64f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html @@ -1,72 +1,70 @@-diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js index 397438d5a0..91cdfe6b9a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js @@ -1,7 +1,7 @@ (function() { "use strict"; - function GridRichTextEditorController($scope, tinyMceService, macroService, editorState) { + function GridRichTextEditorController($scope, tinyMceService, macroService, editorState, editorService) { var vm = this; @@ -11,64 +11,65 @@ vm.openEmbed = openEmbed; function openLinkPicker(editor, currentTarget, anchorElement) { - - vm.linkPickerOverlay = { - view: "linkpicker", + var linkPicker = { currentTarget: currentTarget, anchors: tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)), - show: true, submit: function(model) { tinyMceService.insertLinkInEditor(editor, model.target, anchorElement); - vm.linkPickerOverlay.show = false; - vm.linkPickerOverlay = null; + editorService.close(); + }, + close: function() { + editorService.close(); } }; + editorService.linkPicker(linkPicker); } function openMediaPicker(editor, currentTarget, userData) { - vm.mediaPickerOverlay = { + var mediaPicker = { currentTarget: currentTarget, onlyImages: true, showDetails: true, startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0], - view: "mediapicker", - show: true, submit: function(model) { tinyMceService.insertMediaInEditor(editor, model.selectedImages[0]); - vm.mediaPickerOverlay.show = false; - vm.mediaPickerOverlay = null; + editorService.close(); + }, + close: function() { + editorService.close(); } }; + editorService.mediaPicker(mediaPicker); } function openEmbed(editor) { - vm.embedOverlay = { - view: "embed", - show: true, + var embed = { submit: function(model) { tinyMceService.insertEmbeddedMediaInEditor(editor, model.embed.preview); - vm.embedOverlay.show = false; - vm.embedOverlay = null; + editorService.close(); + }, + close: function() { + editorService.close(); } }; + editorService.embed(embed); } function openMacroPicker(editor, dialogData) { - vm.macroPickerOverlay = { - view: "macropicker", + var macroPicker = { dialogData: dialogData, - show: true, submit: function(model) { var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine); tinyMceService.insertMacroInEditor(editor, macroObject, $scope); - vm.macroPickerOverlay.show = false; - vm.macroPickerOverlay = null; + editorService.close(); + }, + close: function() { + editorService.close(); } }; + editorService.macroPicker(macroPicker); } - - } angular.module("umbraco").controller("Umbraco.PropertyEditors.Grid.RichTextEditorController", GridRichTextEditorController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html index 7bceed6a60..cee261829f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html @@ -11,32 +11,4 @@ on-macro-picker-click="vm.openMacroPicker">diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index 78ce1f29a5..5a8396776e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -12,7 +12,7 @@ * @param {any} $location * @param {any} localizationService */ -function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, localizationService, editorService) { +function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, localizationService, editorService, $q) { var unsubscribe; @@ -30,23 +30,9 @@ function contentPickerController($scope, entityResource, editorState, iconHelper return str.replace(rgxtrim, ''); } - function startWatch() { - //We need to watch our renderModel so that we can update the underlying $scope.model.value properly, this is required - // because the ui-sortable doesn't dispatch an event after the digest of the sort operation. Any of the events for UI sortable - // occur after the DOM has updated but BEFORE the digest has occured so the model has NOT changed yet - it even states so in the docs. - // In their source code there is no event so we need to just subscribe to our model changes here. - //This also makes it easier to manage models, we update one and the rest will just work. - $scope.$watch(function () { - //return the joined Ids as a string to watch - return _.map($scope.renderModel, function (i) { - return $scope.model.config.idType === "udi" ? i.udi : i.id; - }).join(); - }, function (newVal) { - var currIds = _.map($scope.renderModel, function (i) { - return $scope.model.config.idType === "udi" ? i.udi : i.id; - }); - $scope.model.value = trim(currIds.join(), ","); - + /** Performs validation based on the renderModel data */ + function validate() { + if ($scope.contentPickerForm) { //Validate! if ($scope.model.config && $scope.model.config.minNumber && parseInt($scope.model.config.minNumber) > $scope.renderModel.length) { $scope.contentPickerForm.minCount.$setValidity("minCount", false); @@ -61,15 +47,32 @@ function contentPickerController($scope, entityResource, editorState, iconHelper else { $scope.contentPickerForm.maxCount.$setValidity("maxCount", true); } + } + } - setSortingState($scope.renderModel); + function startWatch() { + + //due to the way angular-sortable works, it needs to update a model, we don't want it to update renderModel since renderModel + //is updated based on changes to model.value so if we bound angular-sortable to that and put a watch on it we'd end up in a + //infinite loop. Instead we have a custom array model for angular-sortable and we'll watch that which we'll use to sync the model.value + //which in turn will sync the renderModel. + $scope.$watchCollection("sortableModel", function(newVal, oldVal) { + $scope.model.value = newVal.join(); + }); + //if the underlying model changes, update the view model, this ensures that the view is always consistent with the underlying + //model if it changes (i.e. based on server updates, or if used in split view, etc...) + $scope.$watch("model.value", function(newVal, oldVal) { + if (newVal !== oldVal) { + syncRenderModel(); + } }); } $scope.renderModel = []; - - $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true; + $scope.sortableModel = []; + + $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true; //the default pre-values var defaultConfig = { @@ -78,11 +81,11 @@ function contentPickerController($scope, entityResource, editorState, iconHelper showEditButton: false, showPathOnHover: false, maxNumber: 1, - minNumber : 0, + minNumber: 0, startNode: { query: "", type: "content", - id: $scope.model.config.startNodeId ? $scope.model.config.startNodeId : -1 // get start node for simple Content Picker + id: $scope.model.config.startNodeId ? $scope.model.config.startNodeId : -1 // get start node for simple Content Picker } }; @@ -107,12 +110,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper $scope.model.config.showOpenButton = Object.toBoolean($scope.model.config.showOpenButton); $scope.model.config.showEditButton = Object.toBoolean($scope.model.config.showEditButton); $scope.model.config.showPathOnHover = Object.toBoolean($scope.model.config.showPathOnHover); - + var entityType = $scope.model.config.startNode.type === "member" ? "Member" : $scope.model.config.startNode.type === "media" - ? "Media" - : "Document"; + ? "Media" + : "Document"; $scope.allowOpenButton = entityType === "Document"; $scope.allowEditButton = entityType === "Document"; $scope.allowRemoveButton = true; @@ -145,7 +148,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the // pre-value config on to the dialog options angular.extend(dialogOptions, $scope.model.config); - + //We need to manually handle the filter for members here since the tree displayed is different and only contains // searchable list views if (entityType === "Member") { @@ -153,7 +156,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper dialogOptions.filterCssClass = "not-allowed"; var currFilter = dialogOptions.filter; //now change the filter to be a method - dialogOptions.filter = function(i) { + dialogOptions.filter = function (i) { //filter out the list view nodes if (i.metaData.isContainer) { return true; @@ -175,7 +178,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper if ($routeParams.section === "settings" && $routeParams.tree === "documentTypes") { //if the content-picker is being rendered inside the document-type editor, we don't need to process the startnode query dialogOptions.startNodeId = -1; - } else if ($scope.model.config.startNode.query) { + } + else if ($scope.model.config.startNode.query) { //if we have a query for the startnode, we will use that. var rootId = $routeParams.id; entityResource.getByQuery($scope.model.config.startNode.query, rootId, "Document").then(function (ent) { @@ -209,8 +213,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper }; $scope.remove = function (index) { - $scope.renderModel.splice(index, 1); - angularHelper.getCurrentForm($scope).$setDirty(); + var currIds = $scope.model.value ? $scope.model.value.split(',') : []; + if (currIds.length > 0) { + currIds.splice(index, 1); + angularHelper.getCurrentForm($scope).$setDirty(); + $scope.model.value = currIds.join(); + } }; $scope.showNode = function (index) { @@ -229,36 +237,35 @@ function contentPickerController($scope, entityResource, editorState, iconHelper } $scope.add = function (item) { - var currIds = _.map($scope.renderModel, function (i) { - return $scope.model.config.idType === "udi" ? i.udi : i.id; - }); + var currIds = $scope.model.value ? $scope.model.value.split(',') : []; var itemId = $scope.model.config.idType === "udi" ? item.udi : item.id; if (currIds.indexOf(itemId) < 0) { - setEntityUrl(item); + currIds.push(itemId); + $scope.model.value = currIds.join(); } }; $scope.clear = function () { - $scope.renderModel = []; + $scope.model.value = null; }; - $scope.openContentEditor = function(node) { + $scope.openContentEditor = function (node) { var contentEditor = { id: node.id, - submit: function(model) { + submit: function (model) { // update the node node.name = model.contentNode.name; node.published = model.contentNode.hasPublishedVersion; - if(entityType !== "Member") { - entityResource.getUrl(model.contentNode.id, entityType).then(function(data){ + if (entityType !== "Member") { + entityResource.getUrl(model.contentNode.id, entityType).then(function (data) { node.url = data; }); } editorService.close(); }, - close: function() { + close: function () { editorService.close(); } }; @@ -267,48 +274,95 @@ function contentPickerController($scope, entityResource, editorState, iconHelper //when the scope is destroyed we need to unsubscribe $scope.$on('$destroy', function () { - if(unsubscribe) { + if (unsubscribe) { unsubscribe(); } }); - - var modelIds = $scope.model.value ? $scope.model.value.split(',') : []; - //load current data if anything selected - if (modelIds.length > 0) { - entityResource.getByIds(modelIds, entityType).then(function(data) { + /** Syncs the renderModel based on the actual model.value and returns a promise */ + function syncRenderModel() { + + var valueIds = $scope.model.value ? $scope.model.value.split(',') : []; + + //sync the sortable model + $scope.sortableModel = valueIds; + + //load current data if anything selected + if (valueIds.length > 0) { + + //need to determine which items we already have loaded + var renderModelIds = _.map($scope.renderModel, function(d) { + return $scope.model.config.idType === "udi" ? d.udi : d.id; + }); + + //get the ids that no longer exist + var toRemove = _.difference(renderModelIds, valueIds); + + //remove the ones that no longer exist + for (var j = 0; j < toRemove.length; j++) { + var index = renderModelIds.indexOf(toRemove[j]); + $scope.renderModel.splice(index, 1); + } + + //get the ids that we need to lookup entities for + var missingIds = _.difference(valueIds, renderModelIds); + + if (missingIds.length > 0) { + return entityResource.getByIds(missingIds, entityType).then(function(data) { + + _.each(valueIds, + function(id, i) { + var entity = _.find(data, function(d) { + return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id); + }); + + if (entity) { + addSelectedItem(entity); + } - _.each(modelIds, - function(id, i) { - var entity = _.find(data, - function(d) { - return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id); }); - if (entity) { - setEntityUrl(entity); - } - + validate(); + setSortingState($scope.renderModel); + return $q.when(true); }); + } + else { + //if there's nothing missing, make sure it's sorted correctly + + var current = $scope.renderModel; + $scope.renderModel = []; + for (var k = 0; k < valueIds.length; k++) { + var id = valueIds[k]; + var found = _.find(current, function(d) { + return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id); + }); + if (found) { + $scope.renderModel.push(found); + } + } + + validate(); + setSortingState($scope.renderModel); + return $q.when(true); + } + } + else { + $scope.renderModel = []; + validate(); + setSortingState($scope.renderModel); + return $q.when(true); + } - //everything is loaded, start the watch on the model - startWatch(); - subscribe(); - }); - } - else { - //everything is loaded, start the watch on the model - startWatch(); - subscribe(); } function setEntityUrl(entity) { // get url for content and media items - if(entityType !== "Member") { - entityResource.getUrl(entity.id, entityType).then(function(data){ + if (entityType !== "Member") { + entityResource.getUrl(entity.id, entityType).then(function (data) { // update url - angular.forEach($scope.renderModel, function(item){ + angular.forEach($scope.renderModel, function (item) { if (item.id === entity.id) { if (entity.trashed) { item.url = localizationService.dictionary.general_recycleBin; @@ -320,17 +374,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper }); } - // add the selected item to the renderModel - // if it needs to show a url the item will get - // updated when the url comes back from server - addSelectedItem(entity); - } function addSelectedItem(item) { // set icon - if(item.icon) { + if (item.icon) { item.icon = iconHelper.convertFromLegacyIcon(item.icon); } @@ -349,7 +398,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper } } - $scope.renderModel.push({ + $scope.renderModel.push({ "name": item.name, "id": item.id, "udi": item.udi, @@ -361,17 +410,28 @@ function contentPickerController($scope, entityResource, editorState, iconHelper // only content supports published/unpublished content so we set everything else to published so the UI looks correct }); + setEntityUrl(item); } function setSortingState(items) { // disable sorting if the list only consist of one item - if(items.length > 1) { + if (items.length > 1) { $scope.sortableOptions.disabled = false; } else { $scope.sortableOptions.disabled = true; } } + function init() { + syncRenderModel().then(function () { + //everything is loaded, start the watch on the model + startWatch(); + subscribe(); + }); + } + + init(); + } angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 0a41119a48..2f1303077c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -5,8 +5,8 @@-
- -diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js index 21f9534848..c240d6b37d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js @@ -1,6 +1,6 @@ angular.module("umbraco") .controller("Umbraco.PropertyEditors.Grid.MediaController", - function ($scope, $rootScope, $timeout, userService) { + function ($scope, $timeout, userService, editorService) { if (!$scope.model.config.startNodeId) { userService.getCurrentUser().then(function (userData) { @@ -9,38 +9,44 @@ angular.module("umbraco") }); } - $scope.setImage = function(){ - $scope.mediaPickerOverlay = {}; - $scope.mediaPickerOverlay.view = "mediapicker"; - $scope.mediaPickerOverlay.startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined; - $scope.mediaPickerOverlay.startNodeIsVirtual = $scope.mediaPickerOverlay.startNodeId ? $scope.model.config.startNodeIsVirtual : undefined; - $scope.mediaPickerOverlay.cropSize = $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined; - $scope.mediaPickerOverlay.showDetails = true; - $scope.mediaPickerOverlay.disableFolderSelect = true; - $scope.mediaPickerOverlay.onlyImages = true; - $scope.mediaPickerOverlay.show = true; - - $scope.mediaPickerOverlay.submit = function(model) { - var selectedImage = model.selectedImages[0]; - - $scope.control.value = { - focalPoint: selectedImage.focalPoint, - id: selectedImage.id, - udi: selectedImage.udi, - image: selectedImage.image, - altText: selectedImage.altText - }; - + function onInit() { + if($scope.control.value){ $scope.setUrl(); + } + } - $scope.mediaPickerOverlay.show = false; - $scope.mediaPickerOverlay = null; - }; + $scope.setImage = function(){ + var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined; + var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined; - $scope.mediaPickerOverlay.close = function(oldModel) { - $scope.mediaPickerOverlay.show = false; - $scope.mediaPickerOverlay = null; - }; + var mediaPicker = { + startNodeId: startNodeId, + startNodeIsVirtual: startNodeIsVirtual, + cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined, + showDetails: true, + disableFolderSelect: true, + onlyImages: true, + submit: function(model) { + var selectedImage = model.selectedImages[0]; + + $scope.control.value = { + focalPoint: selectedImage.focalPoint, + id: selectedImage.id, + udi: selectedImage.udi, + image: selectedImage.image, + altText: selectedImage.altText + }; + + $scope.setUrl(); + + editorService.close(); + }, + close: function() { + editorService.close(); + } + } + + editorService.mediaPicker(mediaPicker); }; $scope.setUrl = function(){ @@ -68,11 +74,6 @@ angular.module("umbraco") } }; - $timeout(function(){ - if($scope.control.$initializing){ - $scope.setImage(); - }else if($scope.control.value){ - $scope.setUrl(); - } - }, 200); + onInit(); + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html index dd35757397..7ffb26d831 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html @@ -14,11 +14,4 @@+ + diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js index 9e2b796a93..dead3da6ec 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js @@ -32,11 +32,11 @@ function entityPicker($scope, entityResource) { } else { //if it's multiple, change the value to an array - if ($scope.model.config.multiple === "1") { + if (Object.toBoolean($scope.model.config.multiple)) { if (_.isString($scope.model.value)) { $scope.model.value = $scope.model.value.split(','); } } } } -angular.module('umbraco').controller("Umbraco.PropertyEditors.EntityPickerController", entityPicker); \ No newline at end of file +angular.module('umbraco').controller("Umbraco.PropertyEditors.EntityPickerController", entityPicker); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js index 58f438c194..17959b9950 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js @@ -1,180 +1,70 @@ -/** - * @ngdoc controller - * @name Umbraco.Editors.FileUploadController - * @function - * - * @description - * The controller for the file upload property editor. It is important to note that the $scope.model.value - * doesn't necessarily depict what is saved for this property editor. $scope.model.value can be empty when we - * are submitting files because in that case, we are adding files to the fileManager which is what gets peristed - * on the server. However, when we are clearing files, we are setting $scope.model.value to "{clearFiles: true}" - * to indicate on the server that we are removing files for this property. We will keep the $scope.model.value to - * be the name of the file selected (if it is a newly selected file) or keep it to be it's original value, this allows - * for the editors to check if the value has changed and to re-bind the property if that is true. - * -*/ -function fileUploadController($scope, $element, $compile, imageHelper, fileManager, umbRequestHelper, mediaHelper) { +(function () { + 'use strict'; - /** Clears the file collections when content is saving (if we need to clear) or after saved */ - function clearFiles() { - //clear the files collection (we don't want to upload any!) - fileManager.setFiles($scope.model.alias, []); - //clear the current files - $scope.files = []; + /** + * @ngdoc controller + * @name Umbraco.Editors.FileUploadController + * @function + * + * @description + * The controller for the file upload property editor. + * + */ + function fileUploadController($scope, fileManager) { + + $scope.fileChanged = onFileChanged; + //declare a special method which will be called whenever the value has changed from the server + $scope.model.onValueChanged = onValueChanged; - if($scope.propertyForm) { - if ($scope.propertyForm.fileCount) { - //this is required to re-validate - $scope.propertyForm.fileCount.$setViewValue($scope.files.length); - } + /** + * Called when the file selection value changes + * @param {any} value + */ + function onFileChanged(value) { + $scope.model.value = value; } - } - - /** this method is used to initialize the data and to re-initialize it if the server value is changed */ - function initialize(index) { - - clearFiles(); - - if (!index) { - index = 1; - } - - //this is used in order to tell the umb-single-file-upload directive to - //rebuild the html input control (and thus clearing the selected file) since - //that is the only way to manipulate the html for the file input control. - $scope.rebuildInput = { - index: index - }; - //clear the current files - $scope.files = []; - //store the original value so we can restore it if the user clears and then cancels clearing. - $scope.originalValue = $scope.model.value; - - //create the property to show the list of files currently saved - if ($scope.model.value != "" && $scope.model.value != undefined) { - - var images = $scope.model.value.split(","); - - $scope.persistedFiles = _.map(images, function (item) { - return { file: item, isImage: imageHelper.detectIfImageByExtension(item) }; + /** + * called whenever the value has changed from the server + * @param {any} newVal + * @param {any} oldVal + */ + function onValueChanged(newVal, oldVal) { + //clear current uploaded files + fileManager.setFiles({ + propertyAlias: $scope.model.alias, + culture: $scope.model.culture, + files: [] }); } - else { - $scope.persistedFiles = []; - } + + }; - _.each($scope.persistedFiles, function (file) { + angular.module("umbraco") + .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController) + .run(function (mediaHelper, umbRequestHelper, assetsService) { + if (mediaHelper && mediaHelper.registerFileResolver) { - var thumbnailUrl = umbRequestHelper.getApiUrl( - "imagesApiBaseUrl", - "GetBigThumbnail", - [{ originalImagePath: file.file }]); - - var extension = file.file.substring(file.file.lastIndexOf(".") + 1, file.file.length); - - file.thumbnail = thumbnailUrl + '&rnd=' + Math.random(); - file.extension = extension.toLowerCase(); - }); - - $scope.clearFiles = false; - } - - initialize(); - - // Method required by the valPropertyValidator directive (returns true if the property editor has at least one file selected) - $scope.validateMandatory = function () { - return { - isValid: !$scope.model.validation.mandatory || ((($scope.persistedFiles != null && $scope.persistedFiles.length > 0) || ($scope.files != null && $scope.files.length > 0)) && !$scope.clearFiles), - errorMsg: "Value cannot be empty", - errorKey: "required" - }; - } - - //listen for clear files changes to set our model to be sent up to the server - $scope.$watch("clearFiles", function (isCleared) { - if (isCleared == true) { - $scope.model.value = { clearFiles: true }; - clearFiles(); - } - else { - //reset to original value - $scope.model.value = $scope.originalValue; - //this is required to re-validate - if($scope.propertyForm) { - $scope.propertyForm.fileCount.$setViewValue($scope.files.length); - } - } - }); - - //listen for when a file is selected - $scope.$on("filesSelected", function (event, args) { - $scope.$apply(function () { - //set the files collection - fileManager.setFiles($scope.model.alias, args.files); - //clear the current files - $scope.files = []; - var newVal = ""; - for (var i = 0; i < args.files.length; i++) { - //save the file object to the scope's files collection - $scope.files.push({ alias: $scope.model.alias, file: args.files[i] }); - newVal += args.files[i].name + ","; - } - - //this is required to re-validate - $scope.propertyForm.fileCount.$setViewValue($scope.files.length); - - //set clear files to false, this will reset the model too - $scope.clearFiles = false; - //set the model value to be the concatenation of files selected. Please see the notes - // in the description of this controller, it states that this value isn't actually used for persistence, - // but we need to set it so that the editor and the server can detect that it's been changed, and it is used for validation. - $scope.model.value = { selectedFiles: newVal.trimEnd(",") }; - - //need to explicity setDirty here as file upload field can't track dirty & we can't use the fileCount (hidden field/model) - $scope.propertyForm.$setDirty(); - }); - }); - - //listen for when the model value has changed - $scope.$watch("model.value", function (newVal, oldVal) { - //cannot just check for !newVal because it might be an empty string which we - //want to look for. - if (newVal !== null && newVal !== undefined && newVal !== oldVal) { - // here we need to check if the value change needs to trigger an update in the UI. - // if the value is only changed in the controller and not in the server values, we do not - // want to trigger an update yet. - // we can however no longer rely on checking values in the controller vs. values from the server - // to determine whether to update or not, since you could potentially be uploading a file with - // the exact same name - in that case we need to reinitialize to show the newly uploaded file. - if (newVal.clearFiles !== true && !newVal.selectedFiles) { - initialize($scope.rebuildInput.index + 1); - } - } - }); -}; -angular.module("umbraco") - .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController) - .run(function(mediaHelper, umbRequestHelper, assetsService){ - if (mediaHelper && mediaHelper.registerFileResolver) { - - //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource - // they contain different data structures so if we need to query against it we need to be aware of this. - mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){ - if (thumbnail) { - if (mediaHelper.detectIfImageByExtension(property.value)) { - //get default big thumbnail from image processor - var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500&animationprocessmode=first"; - return thumbnailUrl; + //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource + // they contain different data structures so if we need to query against it we need to be aware of this. + mediaHelper.registerFileResolver("Umbraco.UploadField", function (property, entity, thumbnail) { + if (thumbnail) { + if (mediaHelper.detectIfImageByExtension(property.value)) { + //get default big thumbnail from image processor + var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500&animationprocessmode=first"; + return thumbnailUrl; + } + else { + return null; + } } else { - return null; + return property.value; } - } - else { - return property.value; - } - }); + }); - } - }); + } + }); + + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html index 9db24c237b..8f97456c60 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html @@ -1,38 +1,7 @@ -- -- --- --
-
-
-
-
-
- - {{file.file}} - -
-
--- - - +--- -
-
- {{file.file.name}} -
+diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js index dfc9cfdcef..beb8edab20 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js @@ -1,28 +1,33 @@ angular.module("umbraco") .controller("Umbraco.PropertyEditors.Grid.EmbedController", - function ($scope, $rootScope, $timeout) { + function ($scope, $timeout, $sce, editorService) { + + function onInit() { + $scope.trustedValue = null; + $scope.trustedValue = $sce.trustAsHtml($scope.control.value); + + if(!$scope.control.value) { + $timeout(function(){ + if($scope.control.$initializing){ + $scope.setEmbed(); + } + }, 200); + } + } $scope.setEmbed = function(){ - $scope.embedDialog = {}; - $scope.embedDialog.view = "embed"; - $scope.embedDialog.show = true; - - $scope.embedDialog.submit = function(model) { - $scope.control.value = model.embed.preview; - $scope.embedDialog.show = false; - $scope.embedDialog = null; + var embed = { + submit: function(model) { + $scope.control.value = model.embed.preview; + $scope.trustedValue = $sce.trustAsHtml(model.embed.preview); + editorService.close(); + }, + close: function() { + editorService.close(); + } }; + editorService.embed(embed); + }; - $scope.embedDialog.close = function(oldModel) { - $scope.embedDialog.show = false; - $scope.embedDialog = null; - }; - - }; - - $timeout(function(){ - if($scope.control.$initializing){ - $scope.setEmbed(); - } - }, 200); + onInit(); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html index 00daa48644..87109e1eb9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html @@ -1,17 +1,10 @@+ -+diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js index d536d9174a..5c1d729364 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js @@ -1,6 +1,6 @@ angular.module("umbraco") .controller("Umbraco.PropertyEditors.Grid.MacroController", - function ($scope, $rootScope, $timeout, dialogService, macroResource, macroService, $routeParams) { + function ($scope, $timeout, editorService, macroResource, macroService, $routeParams) { $scope.title = "Click to insert macro"; @@ -14,31 +14,24 @@ angular.module("umbraco") } }; - $scope.macroPickerOverlay = {}; - $scope.macroPickerOverlay.view = "macropicker"; - $scope.macroPickerOverlay.dialogData = dialogData; - $scope.macroPickerOverlay.show = true; + var macroPicker = { + dialogData: dialogData, + submit: function(model) { + var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine); - $scope.macroPickerOverlay.submit = function(model) { - - var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine); - - $scope.control.value = { + $scope.control.value = { macroAlias: macroObject.macroAlias, macroParamsDictionary: macroObject.macroParamsDictionary - }; - - $scope.setPreview($scope.control.value ); - - $scope.macroPickerOverlay.show = false; - $scope.macroPickerOverlay = null; - }; - - $scope.macroPickerOverlay.close = function(oldModel) { - $scope.macroPickerOverlay.show = false; - $scope.macroPickerOverlay = null; - }; - + }; + + $scope.setPreview($scope.control.value ); + editorService.close(); + }, + close: function() { + editorService.close(); + } + } + editorService.macroPicker(macroPicker); }; $scope.setPreview = function(macro){ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html index 4aad38a24e..cc581698fc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html @@ -12,12 +12,5 @@- - -Click to embed - +- - +- -- - -- - -- - -- -+-- + + -diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js index ef660f02b1..47d670e68a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js @@ -1,4 +1,4 @@ -function listViewController($rootScope, $scope, $routeParams, $injector, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState, $timeout, $q, mediaResource, listViewHelper, userService, navigationService, treeService) { +function listViewController($scope, $routeParams, $injector, currentUserResource, notificationsService, iconHelper, editorState, localizationService, appState, $timeout, mediaResource, listViewHelper, navigationService, editorService) { //this is a quick check to see if we're in create mode, if so just exit - we cannot show children for content // that isn't created yet, if we continue this will use the parent id in the route params which isn't what @@ -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) }; } } @@ -99,9 +99,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific canUnpublish: true }; - $scope.$watch(function () { - return $scope.selection.length; - }, function (newVal, oldVal) { + $scope.$watch("selection.length", function (newVal, oldVal) { if ((idsWithPermissions == null && newVal > 0) || (idsWithPermissions != null)) { @@ -126,7 +124,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific }); if (missingLookup.length > 0) { - contentResource.getPermissions(missingLookup).then(function (p) { + currentUserResource.getPermissions(missingLookup).then(function (p) { $scope.buttonPermissions = listViewHelper.getButtonPermissions(p, idsWithPermissions); }); } @@ -431,27 +429,20 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific }; $scope.move = function() { - $scope.moveDialog = {}; - $scope.moveDialog.section = $scope.entityType; - $scope.moveDialog.currentNode = $scope.contentId; - $scope.moveDialog.view = "move"; - $scope.moveDialog.show = true; - - $scope.moveDialog.submit = function(model) { - - if (model.target) { - performMove(model.target); + var move = { + section: $scope.entityType, + currentNode: $scope.contentId, + submit: function(model) { + if (model.target) { + performMove(model.target); + } + editorService.close(); + }, + close: function() { + editorService.close(); } - - $scope.moveDialog.show = false; - $scope.moveDialog = null; - }; - - $scope.moveDialog.close = function(oldModel) { - $scope.moveDialog.show = false; - $scope.moveDialog = null; - }; - + } + editorService.move(move); }; @@ -500,28 +491,22 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific }); } - $scope.copy = function () { - $scope.copyDialog = {}; - $scope.copyDialog.section = $scope.entityType; - $scope.copyDialog.currentNode = $scope.contentId; - $scope.copyDialog.view = "copy"; - $scope.copyDialog.show = true; - - $scope.copyDialog.submit = function (model) { - if (model.target) { - performCopy(model.target, model.relateToOriginal); - } - - $scope.copyDialog.show = false; - $scope.copyDialog = null; - }; - - $scope.copyDialog.close = function (oldModel) { - $scope.copyDialog.show = false; - $scope.copyDialog = null; - }; - - }; + $scope.copy = function () { + var copyEditor = { + section: $scope.entityType, + currentNode: $scope.contentId, + submit: function(model) { + if (model.target) { + performCopy(model.target, model.relateToOriginal); + } + editorService.close(); + }, + close: function() { + editorService.close(); + } + }; + editorService.copy(copyEditor); + }; function performCopy(target, relateToOriginal) { applySelected( diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html index 3df37f6306..e05067ee42 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html @@ -174,20 +174,6 @@+-+diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js index abe2b41bd1..9ba8822843 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js @@ -9,7 +9,7 @@ (function() { "use strict"; - function ListViewLayoutsPreValsController($scope) { + function ListViewLayoutsPreValsController($scope, editorService) { var vm = this; vm.focusLayoutName = false; @@ -63,21 +63,22 @@ } function openIconPicker(layout) { - vm.iconPickerDialog = { - view: "iconpicker", - show: true, - submit: function(model) { - if (model.color) { - layout.icon = model.icon + " " + model.color; - } else { - layout.icon = model.icon; - } - vm.focusLayoutName = true; - vm.iconPickerDialog.show = false; - vm.iconPickerDialog = null; - } - }; - } + var iconPicker = { + submit: function(model) { + if (model.color) { + layout.icon = model.icon + " " + model.color; + } else { + layout.icon = model.icon; + } + vm.focusLayoutName = true; + editorService.close(); + }, + close: function() { + editorService.close(); + } + }; + editorService.iconPicker(iconPicker); + } activate(); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html index c71f3306cd..f8ad0bb3f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html @@ -47,11 +47,4 @@+ -+- -+-+ +- + +-++ ++ +Remove file +-
+
-
+
+
+ + ++ {{value.alias}} + {{value.width}}px x {{value.height}}px ++
+
-+ -- -Remove file --
-
-
+
-
- - -- {{value.alias}} - {{value.width}}px x {{value.height}}px --
-
- -- - -- -- - -
-
-
+
+