-
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
index 68ef225d18..9d2997625e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
@@ -37,12 +37,6 @@
- {{ color.label }}
+ {{ color.label || color.value }}
#{{ color.value }}
-
- You can drag files here to upload
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 10184dcccc..03a024c439 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -84,10 +84,10 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
index ec3ff44006..cdde683cf1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
@@ -7,7 +7,7 @@
-
+
+
+ ++--
+
-
+
+
+
-+ + -+
-
-
+
+
-
- - + 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 adf2216d58..6e67d2d251 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 @@ -116,12 +116,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop $scope.showIcons = $scope.model.config.showIcons || true; $scope.wideMode = $scope.model.config.hideLabel == "1"; - $scope.overlayMenu = { - show: false, - style: {}, - showFilter: false - }; - // helper to force the current form into the dirty state $scope.setDirty = function () { if ($scope.propertyForm) { @@ -136,30 +130,48 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop $scope.currentNode = newNode; $scope.setDirty(); - - $scope.closeNodeTypePicker(); }; - $scope.openNodeTypePicker = function (event) { + $scope.openNodeTypePicker = function ($event) { if ($scope.nodes.length >= $scope.maxItems) { return; } + $scope.overlayMenu = { + title: localizationService.localize('grid_insertControl'), + show: false, + style: {}, + filter: $scope.scaffolds.length > 15 ? true : false, + view: "itempicker", + event: $event, + submit: function(model) { + if(model && model.selectedItem) { + $scope.addNode(model.selectedItem.alias); + } + $scope.overlayMenu.show = false; + $scope.overlayMenu = null; + }, + close: function() { + $scope.overlayMenu.show = false; + $scope.overlayMenu = null; + } + }; + // this could be used for future limiting on node types - $scope.overlayMenu.scaffolds = []; + $scope.overlayMenu.availableItems = []; _.each($scope.scaffolds, function (scaffold) { - $scope.overlayMenu.scaffolds.push({ + $scope.overlayMenu.availableItems.push({ alias: scaffold.contentTypeAlias, name: scaffold.contentTypeName, icon: iconHelper.convertFromLegacyIcon(scaffold.icon) }); }); - if ($scope.overlayMenu.scaffolds.length == 0) { + if ($scope.overlayMenu.availableItems.length === 0) { return; } - if ($scope.overlayMenu.scaffolds.length == 1) { + if ($scope.overlayMenu.availableItems.length === 1) { // only one scaffold type - no need to display the picker $scope.addNode($scope.scaffolds[0].contentTypeAlias); return; @@ -168,10 +180,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop $scope.overlayMenu.show = true; }; - $scope.closeNodeTypePicker = function () { - $scope.overlayMenu.show = false; - }; - $scope.editNode = function (idx) { if ($scope.currentNode && $scope.currentNode.key == $scope.nodes[idx].key) { $scope.currentNode = undefined; @@ -359,8 +367,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop $scope.currentNode = $scope.nodes[0]; } - $scope.overlayMenu.showFilter = $scope.scaffolds.length > 15; - inited = true; } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html index 9a5d75ae92..0117bac92d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html @@ -42,33 +42,13 @@
- -- + ++ + -
+
+
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
index 2aa856ba66..849b5ccd7b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
@@ -6,42 +6,86 @@
* @description
* The controller for the content type editor templates sub view
*/
-(function() {
+(function () {
'use strict';
- function TemplatesController($scope, entityResource, contentTypeHelper, $routeParams) {
+ function TemplatesController($scope, entityResource, contentTypeHelper, templateResource, $routeParams) {
/* ----------- SCOPE VARIABLES ----------- */
var vm = this;
vm.availableTemplates = [];
+ vm.canCreateTemplate = false;
vm.updateTemplatePlaceholder = false;
vm.loadingTemplates = false;
+ vm.createTemplate = createTemplate;
/* ---------- INIT ---------- */
function onInit() {
vm.loadingTemplates = true;
-
- entityResource.getAll("Template").then(function(templates){
+ entityResource.getAll("Template").then(function (templates) {
vm.availableTemplates = templates;
// update placeholder template information on new doc types
if (!$routeParams.notemplate && $scope.model.id === 0) {
- vm.updateTemplatePlaceholder = true;
- vm.availableTemplates = contentTypeHelper.insertTemplatePlaceholder(vm.availableTemplates);
+ vm.updateTemplatePlaceholder = true;
+ vm.availableTemplates = contentTypeHelper.insertTemplatePlaceholder(vm.availableTemplates);
}
vm.loadingTemplates = false;
+ checkIfTemplateExists();
});
}
+ function createTemplate() {
+
+ vm.createTemplateButtonState = "busy";
+
+ templateResource.getScaffold(-1).then(function (template) {
+
+ template.alias = $scope.model.alias;
+ template.name = $scope.model.name;
+
+ templateResource.save(template).then(function (savedTemplate) {
+
+ // add icon
+ savedTemplate.icon = "icon-layout";
+
+ vm.availableTemplates.push(savedTemplate);
+ vm.canCreateTemplate = false;
+
+ $scope.model.allowedTemplates.push(savedTemplate);
+
+ if ($scope.model.defaultTemplate === null) {
+ $scope.model.defaultTemplate = savedTemplate;
+ }
+
+ vm.createTemplateButtonState = "success";
+
+ }, function() {
+ vm.createTemplateButtonState = "error";
+ });
+
+ }, function() {
+ vm.createTemplateButtonState = "error";
+ });
+ };
+
+ function checkIfTemplateExists() {
+ var existingTemplate = vm.availableTemplates.find(function (availableTemplate) {
+ return (availableTemplate.name === $scope.model.name || availableTemplate.placeholder);
+ });
+
+ vm.canCreateTemplate = existingTemplate ? false : true;
+ }
+
onInit();
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
index e5317c134e..8084497441 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
@@ -9,15 +9,26 @@
-
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
index 4558a21e2a..cc7d261a95 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
@@ -8,7 +8,7 @@
+
+
+
+ {{error.errorMsg}}
+ {{error.data.message}}
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
index 3a99c90a50..5a0b43d105 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
@@ -1,10 +1,13 @@
angular.module("umbraco").controller("Umbraco.PrevalueEditors.CropSizesController",
- function ($scope, $timeout) {
+ function ($scope) {
if (!$scope.model.value) {
$scope.model.value = [];
}
+ $scope.editMode = false;
+ $scope.setFocus = false;
+
$scope.remove = function (item, evt) {
evt.preventDefault();
$scope.model.value = _.reject($scope.model.value, function (x) {
@@ -13,32 +16,57 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.CropSizesControlle
};
$scope.edit = function (item, evt) {
- evt.preventDefault();
+ evt.preventDefault();
+ $scope.editMode = true;
+ $scope.setFocus = false;
+
$scope.newItem = item;
};
$scope.cancel = function (evt) {
- evt.preventDefault();
+ evt.preventDefault();
+ $scope.editMode = false;
+ $scope.setFocus = true;
+
$scope.newItem = null;
};
- $scope.add = function (evt) {
- evt.preventDefault();
+ $scope.change = function () {
+ // Listen to the change event and set focus 2 false
+ if($scope.setFocus){
+ $scope.setFocus = false;
+ return;
+ }
+ }
- if ($scope.newItem && $scope.newItem.alias &&
+ $scope.add = function (evt) {
+ evt.preventDefault();
+
+ $scope.editMode = false;
+
+ $scope.setFocus = true;
+
+ if ($scope.newItem && $scope.newItem.alias &&
angular.isNumber($scope.newItem.width) && angular.isNumber($scope.newItem.height) &&
$scope.newItem.width > 0 && $scope.newItem.height > 0) {
- var exists = _.find($scope.model.value, function (item) { return $scope.newItem.alias === item.alias; });
+ var exists = _.find($scope.model.value, function (item) { return $scope.newItem.alias === item.alias; });
+
if (!exists) {
$scope.model.value.push($scope.newItem);
$scope.newItem = {};
- $scope.hasError = false;
+ $scope.hasError = false;
+ $scope.cropAdded = false;
return;
- }
+ }
+ else{
+ $scope.newItem = null;
+ $scope.hasError = false;
+ return;
+ }
}
//there was an error, do the highlight (will be set back by the directive)
$scope.hasError = true;
- };
- });
\ No newline at end of file
+ };
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
index ac3ce946c0..86804fddb0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
@@ -1,49 +1,74 @@
-
+ You haven't defined any colors
+
+
+
+
+
-
-
-
-
-
Define crop
-
-
-
-
+
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 e90bf7ae7d..b6bb5a2444 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
@@ -59,6 +59,11 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
items: []
};
+ $scope.createAllowedButtonSingle = false;
+ $scope.createAllowedButtonSingleWithBlueprints = false;
+ $scope.createAllowedButtonMultiWithBlueprints = false;
+
+
//when this is null, we don't check permissions
$scope.currentNodePermissions = null;
@@ -695,9 +700,28 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
id = -1;
}
- getContentTypesCallback(id).then(function (items) {
- $scope.listViewAllowedTypes = items;
- });
+ //$scope.listViewAllowedTypes = getContentTypesCallback(id);
+ getContentTypesCallback(id).then(function (listViewAllowedTypes) {
+ var blueprints = false;
+ $scope.listViewAllowedTypes = listViewAllowedTypes;
+
+ angular.forEach(listViewAllowedTypes, function (allowedType) {
+ angular.forEach(allowedType.blueprints, function (value, key) {
+ blueprints = true;
+ });
+ });
+
+ if (listViewAllowedTypes.length === 1 && blueprints === false) {
+ $scope.createAllowedButtonSingle = true;
+ }
+ if (listViewAllowedTypes.length === 1 && blueprints === true) {
+ $scope.createAllowedButtonSingleWithBlueprints = true;
+ }
+ if (listViewAllowedTypes.length > 1) {
+ $scope.createAllowedButtonMultiWithBlueprints = true;
+ }
+ });
+
$scope.contentId = id;
$scope.isTrashed = id === "-20" || id === "-21";
@@ -749,6 +773,22 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
}
}
+
+ function createBlank(entityType,docTypeAlias) {
+ $location
+ .path("/" + entityType + "/" + entityType + "/edit/" + $scope.contentId)
+ .search("doctype=" + docTypeAlias + "&create=true");
+ }
+
+ function createFromBlueprint(entityType,docTypeAlias, blueprintId) {
+ $location
+ .path("/" + entityType + "/" + entityType + "/edit/" + $scope.contentId)
+ .search("doctype=" + docTypeAlias + "&create=true&blueprintId=" + blueprintId);
+ }
+
+ $scope.createBlank = createBlank;
+ $scope.createFromBlueprint = createFromBlueprint;
+
//GO!
initView();
}
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 3ce28f0dab..361354c524 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
@@ -11,7 +11,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.allowAddMedia = false;
function setupViewModel() {
- $scope.images = [];
+ $scope.mediaItems = [];
$scope.ids = [];
$scope.isMultiPicker = multiPicker;
@@ -67,7 +67,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
}
- $scope.images.push(media);
+ $scope.mediaItems.push(media);
if ($scope.model.config.idType === "udi") {
$scope.ids.push(media.udi);
@@ -129,7 +129,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
}
$scope.remove = function (index) {
- $scope.images.splice(index, 1);
+ $scope.mediaItems.splice(index, 1);
$scope.ids.splice(index, 1);
sync();
};
@@ -182,7 +182,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
}
- $scope.images.push(media);
+ $scope.mediaItems.push(media);
if ($scope.model.config.idType === "udi") {
$scope.ids.push(media.udi);
@@ -217,7 +217,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
// 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) {
+ angular.forEach($scope.mediaItems, function(value, key) {
r.push($scope.model.config.idType === "udi" ? value.udi : value.id);
});
$scope.ids = r;
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 002ade8902..69f8230b70 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
@@ -1,35 +1,39 @@
+
-
-
-
-
-
-
- ×
-
-
-
-
-
- Cancel
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 3231e3c7e9..a5fc2bfb39 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -1,11 +1,16 @@
-
-