+ 
+
+ This is some content
", propVal.ToString());
+ Assert.AreEqual("This is some content
", propVal.ToString());
- var propVal2 = doc.GetPropertyValueThis is some content
", propVal2.ToString());
var propVal3 = doc.GetPropertyValue("Content");
Assert.IsInstanceOf(typeof(IHtmlString), propVal3);
Assert.AreEqual("This is some content
", propVal3.ToString());
- }
+ }
- [Test]
- public void Complex_Linq()
- {
- var doc = GetNode(1173);
+ [Test]
+ public void Complex_Linq()
+ {
+ var doc = GetNode(1173);
- var result = doc.Ancestors().OrderBy(x => x.Level)
- .Single()
- .Descendants()
- .FirstOrDefault(x => x.GetPropertyValue
We'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter
We'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter
Umbraco the the leading ASP.NET open source CMS, under pinning over 150,000 websites. Our Certified Developers are experts in developing high performance and feature rich websites.
We'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter
We'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter
Extending the help drawer with custom tours
The easiet way to add new tours to Umbraco is through the Help-drawer. All it requires is a my-tour.json file. @@ -304,6 +304,12 @@ In the following example you see how to run some custom logic before a step goes scope.elementNotFound = false; $timeout(function () { + // clear element when step as marked as intro, so it always displays in the center + if (scope.model.currentStep && scope.model.currentStep.type === "intro") { + scope.model.currentStep.element = null; + scope.model.currentStep.eventElement = null; + scope.model.currentStep.event = null; + } // if an element isn't set - show the popover in the center if(scope.model.currentStep && !scope.model.currentStep.element) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js index a7bdd4b741..e3c4cbf40c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js @@ -64,7 +64,7 @@ (function () { 'use strict'; - function ToggleDirective(localizationService) { + function ToggleDirective(localizationService, eventsService) { function link(scope, el, attr, ctrl) { @@ -73,6 +73,7 @@ function onInit() { setLabelText(); + eventsService.emit("toggleValue", { value: scope.checked }); } function setLabelText() { @@ -98,7 +99,8 @@ } scope.click = function() { - if(scope.onClick) { + if (scope.onClick) { + eventsService.emit("toggleValue", { value: !scope.checked }); scope.onClick(); } }; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js index e76ac36b20..5bcab56f48 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js @@ -77,6 +77,8 @@ resetLastListPageNumber($scope.content); + eventsService.emit("content.loaded", { content: $scope.content }); + $scope.page.loading = false; }); @@ -130,6 +132,8 @@ $scope.page.buttonGroupState = "busy"; + eventsService.emit("content.saving", { content: $scope.content, action: args.action }); + contentEditingHelper.contentEditorPerformSave({ statusMessage: args.statusMessage, saveMethod: args.saveMethod, @@ -144,6 +148,9 @@ $scope.page.buttonGroupState = "success"; deferred.resolve(data); + + eventsService.emit("content.saved", { content: $scope.content, action: args.action }); + }, function (err) { //error if (err) { @@ -183,7 +190,9 @@ $scope.page.loading = false; - }); + eventsService.emit("content.newReady", { content: $scope.content }); + + }); } else { @@ -192,35 +201,52 @@ } - $scope.unPublish = function () { + $scope.unPublish = function () { + // raising the event triggers the confirmation dialog + if (!notificationsService.hasView()) { + notificationsService.add({ view: "confirmunpublish" }); + } + + $scope.page.buttonGroupState = "busy"; - if (formHelper.submitForm({ scope: $scope, statusMessage: "Unpublishing...", skipValidation: true })) { + // actioning the dialog raises the confirmUnpublish event, act on it here + var actioned = $rootScope.$on("content.confirmUnpublish", function(event, confirmed) { + if (confirmed && formHelper.submitForm({ scope: $scope, statusMessage: "Unpublishing...", skipValidation: true })) { + + eventsService.emit("content.unpublishing", { content: $scope.content }); - $scope.page.buttonGroupState = "busy"; + contentResource.unPublish($scope.content.id) + .then(function (data) { - contentResource.unPublish($scope.content.id) - .then(function (data) { + formHelper.resetForm({ scope: $scope, notifications: data.notifications }); - formHelper.resetForm({ scope: $scope, notifications: data.notifications }); + contentEditingHelper.handleSuccessfulSave({ + scope: $scope, + savedContent: data, + rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data) + }); - contentEditingHelper.handleSuccessfulSave({ - scope: $scope, - savedContent: data, - rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data) - }); + init($scope.content); - init($scope.content); + syncTreeNode($scope.content, data.path); - syncTreeNode($scope.content, data.path); - - $scope.page.buttonGroupState = "success"; - - }, function(err) { - formHelper.showNotifications(err.data); - $scope.page.buttonGroupState = 'error'; - }); - } + $scope.page.buttonGroupState = "success"; + eventsService.emit("content.unpublished", { content: $scope.content }); + }, function(err) { + formHelper.showNotifications(err.data); + $scope.page.buttonGroupState = 'error'; + }); + + } else { + $scope.page.buttonGroupState = "init"; + } + + // unsubscribe to avoid queueing notifications + // listener is re-bound when the unpublish button is clicked so it is created just-in-time + actioned(); + + }); }; $scope.sendToPublish = function () { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js index b2bbd9006a..7f9d05aebc 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js @@ -10,10 +10,12 @@ scope.publishStatus = {}; scope.disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates; - - function onInit() { - scope.allowOpen = true; + function onInit() { + // If logged in user has access to the settings section + // show the open anchors - if the user doesn't have + // access, documentType is null, see ContentModelMapper + scope.allowOpen = scope.node.documentType !== null; scope.datePickerConfig = { pickDate: true, @@ -41,8 +43,13 @@ // make sure dates are formatted to the user's locale formatDatesToLocal(); + // Make sure to set the node status setNodePublishStatus(scope.node); - + + // Declare a fallback URL for theUse in combination with:
-
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
index 135d806aa4..a287ec0476 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
@@ -53,7 +53,7 @@ angular.module("umbraco.directives")
var $container = element.find(".crop-container");
//default constraints for drag n drop
- var constraints = {left: {max: scope.dimensions.margin, min: scope.dimensions.margin}, top: {max: scope.dimensions.margin, min: scope.dimensions.margin}, };
+ var constraints = {left: {max: scope.dimensions.margin, min: scope.dimensions.margin}, top: {max: scope.dimensions.margin, min: scope.dimensions.margin} };
scope.constraints = constraints;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index 1aa026cb3a..efdeceb78f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -8,11 +8,16 @@
var evts = [];
function onInit() {
- scope.allowOpenMediaType = true;
+ // If logged in user has access to the settings section
+ // show the open anchors - if the user doesn't have
+ // access, contentType is null, see MediaModelMapper
+ scope.allowOpen = scope.node.contentType !== null;
+
// get document type details
scope.mediaType = scope.node.contentType;
- // get node url
- scope.nodeUrl = scope.node.mediaLink;
+
+ // set the media link initially
+ setMediaLink();
// make sure dates are formatted to the user's locale
formatDatesToLocal();
}
@@ -25,16 +30,25 @@
});
}
+ function setMediaLink(){
+ scope.nodeUrl = scope.node.mediaLink;
+ }
+
scope.openMediaType = function (mediaType) {
// remove first "#" from url if it is prefixed else the path won't work
var url = "/settings/mediaTypes/edit/" + mediaType.id;
$location.path(url);
};
-
+
// watch for content updates - reload content when node is saved, published etc.
scope.$watch('node.updateDate', function(newValue, oldValue){
if(!newValue) { return; }
if(newValue === oldValue) { return; }
+
+ // Update the media link
+ setMediaLink();
+
+ // Update the create and update dates
formatDatesToLocal();
});
@@ -46,7 +60,6 @@
});
onInit();
-
}
var directive = {
@@ -64,4 +77,4 @@
angular.module('umbraco.directives').directive('umbMediaNodeInfo', MediaNodeInfoDirective);
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index cce4e0d792..d36836f440 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -140,37 +140,7 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat
//Filter the path for root node ids (we don't want to pass in -1 or 'init')
args.path = _.filter(args.path, function (item) { return (item !== "init" && item !== "-1"); });
-
- //Once those are filtered we need to check if the current user has a special start node id,
- // if they do, then we're going to trim the start of the array for anything found from that start node
- // and previous so that the tree syncs properly. The tree syncs from the top down and if there are parts
- // of the tree's path in there that don't actually exist in the dom/model then syncing will not work.
-
- userService.getCurrentUser().then(function (userData) {
-
- var startNodes = [];
- for (var i = 0; i < userData.startContentIds; i++) {
- startNodes.push(userData.startContentIds[i]);
- }
- for (var j = 0; j < userData.startMediaIds; j++) {
- startNodes.push(userData.startMediaIds[j]);
- }
-
- _.each(startNodes, function (i) {
- var found = _.find(args.path, function (p) {
- return String(p) === String(i);
- });
- if (found) {
- args.path = args.path.splice(_.indexOf(args.path, found));
- }
- });
-
-
- loadPath(args.path, args.forceReload, args.activate);
-
- });
-
-
+ loadPath(args.path, args.forceReload, args.activate);
return deferred.promise;
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
index 4bc6f08eb9..66e93d70d8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
@@ -82,7 +82,7 @@ angular.module("umbraco.directives")
generateAliasTimeout = $timeout(function () {
updateAlias = true;
- entityResource.getSafeAlias(value, true).then(function (safeAlias) {
+ entityResource.getSafeAlias(encodeURIComponent(value), true).then(function (safeAlias) {
if (updateAlias) {
scope.alias = safeAlias.alias;
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
index ca389a74a7..a215bca645 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
@@ -161,7 +161,7 @@
/**
* ACE editor session.
* @type object
- * @see [EditSession]{@link http://ace.c9.io/#nav=api&api=edit_session}
+ * @see [EditSession]{@link https://ace.c9.io/#nav=api&api=edit_session}
*/
var session = acee.getSession();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
new file mode 100644
index 0000000000..6ed65a9431
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
@@ -0,0 +1,61 @@
+
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbColorSwatches
+@restrict E
+@scope
+@description
+Use this directive to generate color swatches to pick from.
+
Markup example
+++@param {array} colors (+ +
attribute): The array of colors.
+@param {string} colors (attribute): The array of colors.
+@param {string} selectedColor (attribute): The selected color.
+@param {string} size (attribute): The size (s, m).
+@param {function} onSelect (expression): Callback function when the item is selected.
+**/
+
+(function () {
+ 'use strict';
+
+ function ColorSwatchesDirective() {
+
+ function link(scope, el, attr, ctrl) {
+
+ scope.setColor = function (color) {
+ //scope.selectedColor({color: color });
+ scope.selectedColor = color;
+
+ if (scope.onSelect) {
+ scope.onSelect(color);
+ }
+ };
+ }
+
+ var directive = {
+ restrict: 'E',
+ replace: true,
+ transclude: true,
+ templateUrl: 'views/components/umb-color-swatches.html',
+ scope: {
+ colors: '=?',
+ size: '@',
+ selectedColor: '=',
+ onSelect: '&'
+ },
+ link: link
+ };
+
+ return directive;
+
+ }
+
+ angular.module('umbraco.directives').directive('umbColorSwatches', ColorSwatchesDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
index 19ab789363..8d2b83d065 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
@@ -7,7 +7,7 @@
@description
Added in Umbraco version 7.6
This directive is a wrapper of the bootstrap datetime picker version 3.1.3. Use it to render a date time picker.
-For extra details about options and events take a look here: http://eonasdan.github.io/bootstrap-datetimepicker/
+For extra details about options and events take a look here: https://eonasdan.github.io/bootstrap-datetimepicker/
Use this directive to render a date time picker
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js
index 59b2b827eb..1c302ca90f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js
@@ -17,7 +17,7 @@
restrict: 'E',
replace: true,
transclude: true,
- templateUrl: 'views/components/umb-dropdown-item.html',
+ templateUrl: 'views/components/umb-dropdown-item.html'
};
return directive;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
index f8bdb50e32..127386e34d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
@@ -1,7 +1,7 @@
-(function() {
+(function () {
'use strict';
- function GridSelector() {
+ function GridSelector($location) {
function link(scope, el, attr, ctrl) {
@@ -11,18 +11,18 @@
scope.itemLabel = "";
// set default item name
- if(!scope.itemName){
+ if (!scope.itemName) {
scope.itemLabel = "item";
} else {
scope.itemLabel = scope.itemName;
}
- scope.removeItem = function(selectedItem) {
+ scope.removeItem = function (selectedItem) {
var selectedItemIndex = scope.selectedItems.indexOf(selectedItem);
scope.selectedItems.splice(selectedItemIndex, 1);
};
- scope.removeDefaultItem = function() {
+ scope.removeDefaultItem = function () {
// it will be the last item so we can clear the array
scope.selectedItems = [];
@@ -32,7 +32,7 @@
};
- scope.openItemPicker = function($event){
+ scope.openItemPicker = function ($event) {
scope.dialogModel = {
view: "itempicker",
title: "Choose " + scope.itemLabel,
@@ -40,11 +40,11 @@
selectedItems: scope.selectedItems,
event: $event,
show: true,
- submit: function(model) {
+ submit: function (model) {
scope.selectedItems.push(model.selectedItem);
// if no default item - set item as default
- if(scope.defaultItem === null) {
+ if (scope.defaultItem === null) {
scope.setAsDefaultItem(model.selectedItem);
}
@@ -54,7 +54,12 @@
};
};
- scope.setAsDefaultItem = function(selectedItem) {
+ scope.openTemplate = function (selectedItem) {
+ var url = "/settings/templates/edit/" + selectedItem.id;
+ $location.url(url);
+ }
+
+ scope.setAsDefaultItem = function (selectedItem) {
// clear default item
scope.defaultItem = {};
@@ -65,69 +70,69 @@
function updatePlaceholders() {
- // update default item
- if(scope.defaultItem !== null && scope.defaultItem.placeholder) {
+ // update default item
+ if (scope.defaultItem !== null && scope.defaultItem.placeholder) {
- scope.defaultItem.name = scope.name;
+ scope.defaultItem.name = scope.name;
- if(scope.alias !== null && scope.alias !== undefined) {
- scope.defaultItem.alias = scope.alias;
- }
-
- }
-
- // update selected items
- angular.forEach(scope.selectedItems, function(selectedItem) {
- if(selectedItem.placeholder) {
-
- selectedItem.name = scope.name;
-
- if(scope.alias !== null && scope.alias !== undefined) {
- selectedItem.alias = scope.alias;
- }
+ if (scope.alias !== null && scope.alias !== undefined) {
+ scope.defaultItem.alias = scope.alias;
+ }
}
- });
- // update availableItems
- angular.forEach(scope.availableItems, function(availableItem) {
- if(availableItem.placeholder) {
+ // update selected items
+ angular.forEach(scope.selectedItems, function (selectedItem) {
+ if (selectedItem.placeholder) {
- availableItem.name = scope.name;
+ selectedItem.name = scope.name;
- if(scope.alias !== null && scope.alias !== undefined) {
- availableItem.alias = scope.alias;
- }
+ if (scope.alias !== null && scope.alias !== undefined) {
+ selectedItem.alias = scope.alias;
+ }
- }
- });
+ }
+ });
+
+ // update availableItems
+ angular.forEach(scope.availableItems, function (availableItem) {
+ if (availableItem.placeholder) {
+
+ availableItem.name = scope.name;
+
+ if (scope.alias !== null && scope.alias !== undefined) {
+ availableItem.alias = scope.alias;
+ }
+
+ }
+ });
}
function activate() {
- // add watchers for updating placeholde name and alias
- if(scope.updatePlaceholder) {
- eventBindings.push(scope.$watch('name', function(newValue, oldValue){
- updatePlaceholders();
- }));
+ // add watchers for updating placeholde name and alias
+ if (scope.updatePlaceholder) {
+ eventBindings.push(scope.$watch('name', function (newValue, oldValue) {
+ updatePlaceholders();
+ }));
- eventBindings.push(scope.$watch('alias', function(newValue, oldValue){
- updatePlaceholders();
- }));
- }
+ eventBindings.push(scope.$watch('alias', function (newValue, oldValue) {
+ updatePlaceholders();
+ }));
+ }
}
activate();
// clean up
- scope.$on('$destroy', function(){
+ scope.$on('$destroy', function () {
- // clear watchers
- for(var e in eventBindings) {
- eventBindings[e]();
- }
+ // clear watchers
+ for (var e in eventBindings) {
+ eventBindings[e]();
+ }
});
@@ -138,13 +143,13 @@
replace: true,
templateUrl: 'views/components/umb-grid-selector.html',
scope: {
- name: "=",
- alias: "=",
- selectedItems: '=',
- availableItems: "=",
- defaultItem: "=",
- itemName: "@",
- updatePlaceholder: "="
+ name: "=",
+ alias: "=",
+ selectedItems: '=',
+ availableItems: "=",
+ defaultItem: "=",
+ itemName: "@",
+ updatePlaceholder: "="
},
link: link
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 63cddbf1bf..db0bc9a1d8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -57,7 +57,7 @@
},
stop: function(e, ui) {
updateTabsSortOrder();
- },
+ }
};
scope.sortableOptionsProperty = {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
index 11b934ce96..0f0ca9dd1b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
@@ -12,7 +12,7 @@ angular.module("umbraco.directives")
restrict: 'A',
replace: false,
scope: {
- node: '=umbLaunchMiniEditor',
+ node: '=umbLaunchMiniEditor'
},
link: function(scope, element, attrs) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
index f21f7b8d3d..26583b108b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
@@ -1,9 +1,9 @@
(function() {
'use strict';
- function ListViewSettingsDirective(contentTypeResource, dataTypeResource, dataTypeHelper, listViewPrevalueHelper) {
+ function ListViewSettingsDirective(dataTypeResource, dataTypeHelper, listViewPrevalueHelper) {
- function link(scope, el, attr, ctrl) {
+ function link(scope) {
scope.dataType = {};
scope.editDataTypeSettings = false;
@@ -22,7 +22,6 @@
listViewPrevalueHelper.setPrevalues(dataType.preValues);
scope.customListViewCreated = checkForCustomListView();
-
});
} else {
@@ -111,8 +110,16 @@
};
+ scope.toggle = function(){
+ if(scope.enableListView){
+ scope.enableListView = false;
+ return;
+ }
+ scope.enableListView = true;
+ };
+
/* ----------- SCOPE WATCHERS ----------- */
- var unbindEnableListViewWatcher = scope.$watch('enableListView', function(newValue, oldValue){
+ var unbindEnableListViewWatcher = scope.$watch('enableListView', function(newValue){
if(newValue !== undefined) {
activate();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
index ce14aaedc5..1cf934b78c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
@@ -8,7 +8,7 @@
scope.search = "";
scope.miniListViews = [];
scope.breadcrumb = [];
-
+
var miniListViewsHistory = [];
var goingForward = true;
var skipAnimation = true;
@@ -60,9 +60,13 @@
entityResource.getPagedChildren(miniListView.node.id, scope.entityType, miniListView.pagination)
.then(function (data) {
+
// update children
miniListView.children = data.items;
_.each(miniListView.children, function(c) {
+ // child allowed by default
+ c.allowed = true;
+
// convert legacy icon for node
if(c.icon) {
c.icon = iconHelper.convertFromLegacyIcon(c.icon);
@@ -74,6 +78,17 @@
c.published = c.metaData.IsPublished;
}
}
+
+ // filter items if there is a filter and it's not advanced
+ // ** ignores advanced filter at the moment
+ if (scope.entityTypeFilter && !scope.entityTypeFilter.filterAdvanced) {
+ var a = scope.entityTypeFilter.filter.toLowerCase().replace(/\s/g, '').split(',');
+ var found = a.indexOf(c.metaData.ContentTypeAlias.toLowerCase()) >= 0;
+
+ if (!scope.entityTypeFilter.filterExclude && !found || scope.entityTypeFilter.filterExclude && found) {
+ c.allowed = false;
+ }
+ }
});
// update pagination
miniListView.pagination.totalItems = data.totalItems;
@@ -89,7 +104,7 @@
};
scope.selectNode = function(node) {
- if(scope.onSelect) {
+ if (scope.onSelect && node.allowed) {
scope.onSelect({'node': node});
}
};
@@ -202,7 +217,8 @@
entityType: "@",
startNodeId: "=",
onSelect: "&",
- onClose: "&"
+ onClose: "&",
+ entityTypeFilter: "="
},
link: link
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
index 556019857b..9f1f7a0d2e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
@@ -16,6 +16,7 @@
ng-repeat="node in vm.nodes"
icon="node.icon"
name="node.name"
+ alias="node.alias"
published="node.published"
description="node.description"
sortable="vm.sortable"
@@ -77,6 +78,7 @@
@param {string} icon (binding): The node icon.
@param {string} name (binding): The node name.
+@param {string} alias (binding): The node document type alias will be displayed on hover if in debug mode or logged in as admin
@param {boolean} published (binding): The node published state.
@param {string} description (binding): A short description.
@param {boolean} sortable (binding): Will add a move cursor on the node preview. Can used in combination with ui-sortable.
@@ -86,17 +88,24 @@
@param {function} onRemove (expression): Callback function when the remove button is clicked.
@param {function} onOpen (expression): Callback function when the open button is clicked.
@param {function} onEdit (expression): Callback function when the edit button is clicked (Added in version 7.7.0).
+@param {string} openUrl (binding): Fallback URL for onOpen (Added in version 7.12.0).
+@param {string} editUrl (binding): Fallback URL for onEdit (Added in version 7.12.0).
+@param {string} removeUrl (binding): Fallback URL for onRemove (Added in version 7.12.0).
**/
(function () {
'use strict';
- function NodePreviewDirective() {
+ function NodePreviewDirective(userService) {
function link(scope, el, attr, ctrl) {
if (!scope.editLabelKey) {
scope.editLabelKey = "general_edit";
}
+ userService.getCurrentUser().then(function (u) {
+ var isAdmin = u.userGroups.indexOf('admin') !== -1;
+ scope.alias = (Umbraco.Sys.ServerVariables.isDebuggingEnabled === true || isAdmin) ? scope.alias : null;
+ });
}
var directive = {
@@ -106,6 +115,7 @@
scope: {
icon: "=?",
name: "=",
+ alias: "=?",
description: "=?",
permissions: "=?",
published: "=?",
@@ -115,7 +125,10 @@
allowEdit: "=?",
onOpen: "&?",
onRemove: "&?",
- onEdit: "&?"
+ onEdit: "&?",
+ openUrl: '=?',
+ editUrl: '=?',
+ removeUrl: '=?'
},
link: link
};
@@ -126,4 +139,4 @@
angular.module('umbraco.directives').directive('umbNodePreview', NodePreviewDirective);
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
index 84b3adb471..43f55315ac 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
@@ -170,7 +170,7 @@ Use this directive to generate a pagination.
}
};
- var unbindPageNumberWatcher = scope.$watch('pageNumber', function(newValue, oldValue){
+ var unbindPageNumberWatcher = scope.$watchCollection('[pageNumber, totalPages]', function (newValues, oldValues) {
activate();
});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index 91a0a41a10..e8d8315b7a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -50,6 +50,11 @@ Use this directive make an element sticky and follow the page when scrolling.
function activate() {
+ if (bar.parents(".umb-property").length > 1) {
+ bar.addClass("nested");
+ return;
+ }
+
if (attr.scrollableContainer) {
scrollableContainer = $(attr.scrollableContainer);
} else {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/konami.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/konami.directive.js
index 7c96e0e050..7914dfc3f0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/konami.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/konami.directive.js
@@ -1,7 +1,7 @@
/**
* Konami Code directive for AngularJS
* @version v0.0.1
- * @license MIT License, http://www.opensource.org/licenses/MIT
+ * @license MIT License, https://www.opensource.org/licenses/MIT
*/
angular.module('umbraco.directives')
@@ -59,4 +59,4 @@ angular.module('umbraco.directives')
scope.$on('$destroy', stopListening);
}
};
- }]);
\ No newline at end of file
+ }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index 104736530f..800ac87480 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -2,7 +2,7 @@
* @ngdoc directive
* @name umbraco.directives.directive:noDirtyCheck
* @restrict A
-* @description Can be attached to form inputs to prevent them from setting the form as dirty (http://stackoverflow.com/questions/17089090/prevent-input-from-setting-form-dirty-angularjs)
+* @description Can be attached to form inputs to prevent them from setting the form as dirty (https://stackoverflow.com/questions/17089090/prevent-input-from-setting-form-dirty-angularjs)
**/
function noDirtyCheck() {
return {
@@ -20,4 +20,4 @@ function noDirtyCheck() {
}
};
}
-angular.module('umbraco.directives.validation').directive("noDirtyCheck", noDirtyCheck);
\ No newline at end of file
+angular.module('umbraco.directives.validation').directive("noDirtyCheck", noDirtyCheck);
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/nestedcontent.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/nestedcontent.filter.js
index 76e4e4a822..8c23094bbf 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/nestedcontent.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/nestedcontent.filter.js
@@ -9,6 +9,13 @@ var ncNodeNameCache = {
angular.module("umbraco.filters").filter("ncNodeName", function (editorState, entityResource) {
+ function formatLabel(firstNodeName, totalNodes) {
+ return totalNodes <= 1
+ ? firstNodeName
+ // If there is more than one item selected, append the additional number of items selected to hint that
+ : firstNodeName + " (+" + (totalNodes - 1) + ")";
+ }
+
return function (input) {
// Check we have a value at all
@@ -25,23 +32,38 @@ angular.module("umbraco.filters").filter("ncNodeName", function (editorState, en
ncNodeNameCache.keys = {};
}
+ // MNTP values are comma separated IDs. We'll only fetch the first one for the NC header.
+ var ids = input.split(',');
+ var lookupId = ids[0];
+
// See if there is a value in the cache and use that
- if (ncNodeNameCache.keys[input]) {
- return ncNodeNameCache.keys[input];
+ if (ncNodeNameCache.keys[lookupId]) {
+ return formatLabel(ncNodeNameCache.keys[lookupId], ids.length);
}
// No value, so go fetch one
// We'll put a temp value in the cache though so we don't
// make a load of requests while we wait for a response
- ncNodeNameCache.keys[input] = "Loading...";
+ ncNodeNameCache.keys[lookupId] = "Loading...";
- entityResource.getById(input, "Document")
- .then(function (ent) {
- ncNodeNameCache.keys[input] = ent.name;
- });
+ var type = lookupId.indexOf("umb://media/") === 0
+ ? "Media"
+ : lookupId.indexOf("umb://member/") === 0
+ ? "Member"
+ : "Document";
+ entityResource.getById(lookupId, type)
+ .then(
+ function (ent) {
+ ncNodeNameCache.keys[lookupId] = ent.name;
+ }
+ );
// Return the current value for now
- return ncNodeNameCache.keys[input];
+ return formatLabel(ncNodeNameCache.keys[lookupId], ids.length);
};
-});
\ No newline at end of file
+}).filter("ncRichText", function () {
+ return function(input) {
+ return $("").html(input).text();
+ };
+});
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 0308ab6197..2665716ac4 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
@@ -371,7 +371,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. ", @@ -399,7 +399,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 ", @@ -436,7 +436,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
+ * dictionaryResource.deleteById(1234)
+ * .then(function() {
+ * alert('its gone!');
+ * });
+ *
+ *
+ * @param {Int} id id of dictionary item to delete
+ * @returns {Promise} resourcePromise object.
+ *
+ **/
+ function deleteById(id) {
+ return umbRequestHelper.resourcePromise(
+ $http.post(
+ umbRequestHelper.getApiUrl(
+ "dictionaryApiBaseUrl",
+ "DeleteById",
+ [{ id: id }])),
+ "Failed to delete item " + id);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.dictionaryResource#create
+ * @methodOf umbraco.resources.dictionaryResource
+ *
+ * @description
+ * Creates a dictionary item with the gieven key and parent id
+ *
+ * ##usage
+ *
+ * dictionaryResource.create(1234,"Item key")
+ * .then(function() {
+ * alert('its created!');
+ * });
+ *
+ *
+ * @param {Int} parentid the parentid of the new dictionary item
+ * @param {String} key the key of the new dictionary item
+ * @returns {Promise} resourcePromise object.
+ *
+ **/
+ function create(parentid, key) {
+ return umbRequestHelper.resourcePromise(
+ $http.post(
+ umbRequestHelper.getApiUrl(
+ "dictionaryApiBaseUrl",
+ "Create",
+ { parentId: parentid, key : key })),
+ "Failed to create item ");
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.dictionaryResource#deleteById
+ * @methodOf umbraco.resources.dictionaryResource
+ *
+ * @description
+ * Gets a dictionary item with a given id
+ *
+ * ##usage
+ *
+ * dictionaryResource.getById(1234)
+ * .then(function() {
+ * alert('Found it!');
+ * });
+ *
+ *
+ * @param {Int} id id of dictionary item to get
+ * @returns {Promise} resourcePromise object.
+ *
+ **/
+ function getById(id) {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl(
+ "dictionaryApiBaseUrl",
+ "GetById",
+ [{ id: id }])),
+ "Failed to get item " + id);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.dictionaryResource#save
+ * @methodOf umbraco.resources.dictionaryResource
+ *
+ * @description
+ * Updates a dictionary
+ *
+ * @param {Object} dictionary dictionary object to update
+ * @param {Bool} nameIsDirty set to true if the name has been changed
+ * @returns {Promise} resourcePromise object.
+ *
+ */
+ function save(dictionary, nameIsDirty) {
+
+ var saveModel = umbDataFormatter.formatDictionaryPostData(dictionary, nameIsDirty);
+
+ return umbRequestHelper.resourcePromise(
+ $http.post(umbRequestHelper.getApiUrl("dictionaryApiBaseUrl", "PostSave"), saveModel),
+ "Failed to save data for dictionary id " + dictionary.id);
+ }
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.dictionaryResource#getList
+ * @methodOf umbraco.resources.dictionaryResource
+ *
+ * @description
+ * Gets a list of all dictionary items
+ *
+ * ##usage
+ *
+ * dictionaryResource.getList()
+ * .then(function() {
+ * alert('Found it!');
+ * });
+ *
+ *
+ * @returns {Promise} resourcePromise object.
+ *
+ **/
+ function getList() {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl(
+ "dictionaryApiBaseUrl",
+ "getList")),
+ "Failed to get list");
+ }
+
+ var resource = {
+ deleteById: deleteById,
+ create: create,
+ getById: getById,
+ save: save,
+ getList : getList
+ };
+
+ return resource;
+
+
+}
+
+angular.module("umbraco.resources").factory("dictionaryResource", dictionaryResource);
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 5dd353d9e0..72f8ad5539 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
@@ -406,7 +406,7 @@ function entityResource($q, $http, umbRequestHelper) {
*
* ##usage
*
- * entityResource.getPagedDescendants(1234, "Content", {pageSize: 10, pageNumber: 2})
+ * entityResource.getPagedDescendants(1234, "Document", {pageSize: 10, pageNumber: 2})
* .then(function(contentArray) {
* var children = contentArray;
* alert('they are here!');
@@ -416,8 +416,8 @@ function entityResource($q, $http, umbRequestHelper) {
* @param {Int} parentid id of content item to return descendants of
* @param {string} type Object type name
* @param {Object} options optional options object
- * @param {Int} options.pageSize if paging data, number of nodes per page, default = 1
- * @param {Int} options.pageNumber if paging data, current page index, default = 100
+ * @param {Int} options.pageSize if paging data, number of nodes per page, default = 100
+ * @param {Int} options.pageNumber if paging data, current page index, default = 1
* @param {String} options.filter if provided, query will only return those with names matching the filter
* @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
* @param {String} options.orderBy property to order items by, default: `SortOrder`
@@ -427,8 +427,8 @@ function entityResource($q, $http, umbRequestHelper) {
getPagedDescendants: function (parentId, type, options) {
var defaults = {
- pageSize: 1,
- pageNumber: 100,
+ pageSize: 100,
+ pageNumber: 1,
filter: '',
orderDirection: "Ascending",
orderBy: "SortOrder"
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 572b2ba3fd..140995cd57 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
@@ -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/resources/package.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
index cb810c6edb..554134d017 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
@@ -57,7 +57,7 @@ function packageResource($q, $http, umbDataFormatter, umbRequestHelper) {
* @methodOf umbraco.resources.packageInstallResource
*
* @description
- * Downloads a package file from our.umbraco.org to the website server.
+ * Downloads a package file from our.umbraco.com to the website server.
*
* ##usage
*
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
index 72564398c0..0fd308ffd0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
@@ -280,7 +280,7 @@
* });
*
*
- * @param {Array} id user id.
+ * @param {Int} userId user id.
* @returns {Promise} resourcePromise object containing the user.
*
*/
@@ -406,6 +406,36 @@
"Failed to save user");
}
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.usersResource#deleteNonLoggedInUser
+ * @methodOf umbraco.resources.usersResource
+ *
+ * @description
+ * Deletes a user that hasn't already logged in (and hence we know has made no content updates that would create related records)
+ *
+ * ##usage
+ *
+ * usersResource.deleteNonLoggedInUser(1)
+ * .then(function() {
+ * alert("user was deleted");
+ * });
+ *
+ *
+ * @param {Int} userId user id.
+ * @returns {Promise} resourcePromise object.
+ *
+ */
+ function deleteNonLoggedInUser(userId) {
+
+ return umbRequestHelper.resourcePromise(
+ $http.post(
+ umbRequestHelper.getApiUrl(
+ "userApiBaseUrl",
+ "PostDeleteNonLoggedInUser", { id: userId })),
+ 'Failed to delete the user ' + userId);
+ }
+
var resource = {
disableUsers: disableUsers,
@@ -417,6 +447,7 @@
createUser: createUser,
inviteUser: inviteUser,
saveUser: saveUser,
+ deleteNonLoggedInUser: deleteNonLoggedInUser,
clearAvatar: clearAvatar
};
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/help.service.js b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
index 77621eee9c..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
@@ -2,8 +2,8 @@ angular.module('umbraco.services')
.factory('helpService', function ($http, $q, umbRequestHelper) {
var helpTopics = {};
- var defaultUrl = "http://our.umbraco.org/rss/help";
- var tvUrl = "http://umbraco.tv/feeds/help";
+ var defaultUrl = "https://our.umbraco.com/rss/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 2ffdc3f1dd..7c7e07db9a 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
@@ -270,12 +270,19 @@
for (var i = 0; selection.length > i; i++) {
var selectedItem = selection[i];
// if item.id is 2147483647 (int.MaxValue) use item.key
- if ((item.id !== 2147483647 && item.id === selectedItem.id) || item.key === selectedItem.key) {
+ if ((item.id !== 2147483647 && item.id === selectedItem.id) || (item.key && item.key === selectedItem.key)) {
isSelected = true;
}
}
if (!isSelected) {
- selection.push({ id: item.id, key: item.key });
+ var obj = {
+ id: item.id
+ };
+ if (item.key) {
+ obj.key = item.key;
+ }
+
+ selection.push(obj);
item.selected = true;
}
}
@@ -296,7 +303,7 @@
for (var i = 0; selection.length > i; i++) {
var selectedItem = selection[i];
// if item.id is 2147483647 (int.MaxValue) use item.key
- if ((item.id !== 2147483647 && item.id === selectedItem.id) || item.key === selectedItem.key) {
+ if ((item.id !== 2147483647 && item.id === selectedItem.id) || (item.key && item.key === selectedItem.key)) {
selection.splice(i, 1);
item.selected = false;
}
@@ -366,9 +373,15 @@
for (var i = 0; i < items.length; i++) {
var item = items[i];
+ var obj = {
+ id: item.id
+ };
+ if (item.key) {
+ obj.key = item.key
+ }
if (checkbox.checked) {
- selection.push({ id: item.id, key: item.key });
+ selection.push(obj);
} else {
clearSelection = true;
}
@@ -408,7 +421,7 @@
var selectedItem = selection[selectedIndex];
// if item.id is 2147483647 (int.MaxValue) use item.key
- if ((item.id !== 2147483647 && item.id === selectedItem.id) || item.key === selectedItem.key) {
+ if ((item.id !== 2147483647 && item.id === selectedItem.id) || (item.key && item.key === selectedItem.key)) {
numberOfSelectedItem++;
}
}
@@ -482,7 +495,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 {
@@ -491,7 +504,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/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index f775e35934..840066adef 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
@@ -641,7 +641,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
//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
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 86de5b586d..493d6faa17 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -6,811 +6,869 @@
* @description
* A service containing all logic for all of the Umbraco TinyMCE plugins
*/
-function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService) {
- return {
+function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macroService, $routeParams, umbRequestHelper, angularHelper, userService) {
+ return {
- /**
- * @ngdoc method
- * @name umbraco.services.tinyMceService#configuration
- * @methodOf umbraco.services.tinyMceService
- *
- * @description
- * Returns a collection of plugins available to the tinyMCE editor
- *
- */
- configuration: function () {
- return umbRequestHelper.resourcePromise(
- $http.get(
- umbRequestHelper.getApiUrl(
- "rteApiBaseUrl",
- "GetConfiguration"), { cache: true }),
- 'Failed to retrieve tinymce configuration');
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.tinyMceService#configuration
+ * @methodOf umbraco.services.tinyMceService
+ *
+ * @description
+ * Returns a collection of plugins available to the tinyMCE editor
+ *
+ */
+ configuration: function () {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl(
+ "rteApiBaseUrl",
+ "GetConfiguration"), {
+ cache: true
+ }),
+ 'Failed to retrieve tinymce configuration');
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.tinyMceService#defaultPrevalues
- * @methodOf umbraco.services.tinyMceService
- *
- * @description
- * Returns a default configration to fallback on in case none is provided
- *
- */
- defaultPrevalues: function () {
- var cfg = {};
- cfg.toolbar = ["code", "bold", "italic", "styleselect","alignleft", "aligncenter", "alignright", "bullist","numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"];
- cfg.stylesheets = [];
- cfg.dimensions = { height: 500 };
- cfg.maxImageSize = 500;
- return cfg;
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.tinyMceService#defaultPrevalues
+ * @methodOf umbraco.services.tinyMceService
+ *
+ * @description
+ * Returns a default configration to fallback on in case none is provided
+ *
+ */
+ defaultPrevalues: function () {
+ var cfg = {};
+ cfg.toolbar = ["code", "bold", "italic", "styleselect", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"];
+ cfg.stylesheets = [];
+ cfg.dimensions = {
+ height: 500
+ };
+ cfg.maxImageSize = 500;
+ return cfg;
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.tinyMceService#createInsertEmbeddedMedia
- * @methodOf umbraco.services.tinyMceService
- *
- * @description
- * Creates the umbrco insert embedded media tinymce plugin
- *
- * @param {Object} editor the TinyMCE editor instance
- * @param {Object} $scope the current controller scope
- */
- createInsertEmbeddedMedia: function (editor, scope, callback) {
- editor.addButton('umbembeddialog', {
- icon: 'custom icon-tv',
- tooltip: 'Embed',
- onclick: function () {
- if (callback) {
- callback();
+ /**
+ * @ngdoc method
+ * @name umbraco.services.tinyMceService#createInsertEmbeddedMedia
+ * @methodOf umbraco.services.tinyMceService
+ *
+ * @description
+ * Creates the umbrco insert embedded media tinymce plugin
+ *
+ * @param {Object} editor the TinyMCE editor instance
+ * @param {Object} $scope the current controller scope
+ */
+ createInsertEmbeddedMedia: function (editor, scope, callback) {
+ editor.addButton('umbembeddialog', {
+ icon: 'custom icon-tv',
+ tooltip: 'Embed',
+ onclick: function () {
+ if (callback) {
+ callback();
+ }
+ }
+ });
+ },
+
+ insertEmbeddedMediaInEditor: function (editor, preview) {
+ editor.insertContent(preview);
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.tinyMceService#createMediaPicker
+ * @methodOf umbraco.services.tinyMceService
+ *
+ * @description
+ * Creates the umbrco insert media tinymce plugin
+ *
+ * @param {Object} editor the TinyMCE editor instance
+ * @param {Object} $scope the current controller scope
+ */
+ createMediaPicker: function (editor, scope, callback) {
+ editor.addButton('umbmediapicker', {
+ icon: 'custom icon-picture',
+ tooltip: 'Media Picker',
+ stateSelector: 'img',
+ onclick: function () {
+
+ var selectedElm = editor.selection.getNode(),
+ currentTarget;
+
+
+ if (selectedElm.nodeName === 'IMG') {
+ var img = $(selectedElm);
+
+ var hasUdi = img.attr("data-udi") ? true : false;
+
+ currentTarget = {
+ altText: img.attr("alt"),
+ url: img.attr("src")
+ };
+
+ if (hasUdi) {
+ currentTarget["udi"] = img.attr("data-udi");
+ } else {
+ currentTarget["id"] = img.attr("rel");
+ }
+ }
+
+ userService.getCurrentUser().then(function (userData) {
+ if (callback) {
+ callback(currentTarget, userData);
+ }
+ });
+
+ }
+ });
+ },
+
+ insertMediaInEditor: function (editor, img) {
+ if (img) {
+
+ var hasUdi = img.udi ? true : false;
+
+ var data = {
+ alt: img.altText || "",
+ src: (img.url) ? img.url : "nothing.jpg",
+ id: '__mcenew'
+ };
+
+ if (hasUdi) {
+ data["data-udi"] = img.udi;
+ } else {
+ //Considering these fixed because UDI will now be used and thus
+ // we have no need for rel http://issues.umbraco.org/issue/U4-6228, http://issues.umbraco.org/issue/U4-6595
+ data["rel"] = img.id;
+ data["data-id"] = img.id;
+ }
+
+ editor.insertContent(editor.dom.createHTML('img', data));
+
+ $timeout(function () {
+ var imgElm = editor.dom.get('__mcenew');
+ var size = editor.dom.getSize(imgElm);
+
+ if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
+ var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
+
+ var s = "width: " + newSize.width + "px; height:" + newSize.height + "px;";
+ editor.dom.setAttrib(imgElm, 'style', s);
+
+ if (img.url) {
+ var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height;
+ editor.dom.setAttrib(imgElm, 'data-mce-src', src);
+ }
}
- }
- });
- },
-
- insertEmbeddedMediaInEditor: function(editor, preview) {
- editor.insertContent(preview);
- },
-
- /**
- * @ngdoc method
- * @name umbraco.services.tinyMceService#createMediaPicker
- * @methodOf umbraco.services.tinyMceService
- *
- * @description
- * Creates the umbrco insert media tinymce plugin
- *
- * @param {Object} editor the TinyMCE editor instance
- * @param {Object} $scope the current controller scope
- */
- createMediaPicker: function (editor, scope, callback) {
- editor.addButton('umbmediapicker', {
- icon: 'custom icon-picture',
- tooltip: 'Media Picker',
- stateSelector: 'img',
- onclick: function () {
-
- var selectedElm = editor.selection.getNode(),
- currentTarget;
-
-
- if(selectedElm.nodeName === 'IMG'){
- var img = $(selectedElm);
-
- var hasUdi = img.attr("data-udi") ? true : false;
-
- currentTarget = {
- altText: img.attr("alt"),
- url: img.attr("src")
- };
-
- if (hasUdi) {
- currentTarget["udi"] = img.attr("data-udi");
- }
- else {
- currentTarget["id"] = img.attr("rel");
- }
- }
-
- userService.getCurrentUser().then(function(userData) {
- if(callback) {
- callback(currentTarget, userData);
- }
- });
-
- }
- });
- },
-
- insertMediaInEditor: function(editor, img) {
- if(img) {
-
- var hasUdi = img.udi ? true : false;
-
- var data = {
- alt: img.altText || "",
- src: (img.url) ? img.url : "nothing.jpg",
- id: '__mcenew'
- };
-
- if (hasUdi) {
- data["data-udi"] = img.udi;
- }
- else {
- //Considering these fixed because UDI will now be used and thus
- // we have no need for rel http://issues.umbraco.org/issue/U4-6228, http://issues.umbraco.org/issue/U4-6595
- data["rel"] = img.id;
- data["data-id"] = img.id;
- }
-
- editor.insertContent(editor.dom.createHTML('img', data));
-
- $timeout(function () {
- var imgElm = editor.dom.get('__mcenew');
- var size = editor.dom.getSize(imgElm);
-
- if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
- var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
-
- var s = "width: " + newSize.width + "px; height:" + newSize.height + "px;";
- editor.dom.setAttrib(imgElm, 'style', s);
- editor.dom.setAttrib(imgElm, 'id', null);
-
- if (img.url) {
- var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height;
- editor.dom.setAttrib(imgElm, 'data-mce-src', src);
- }
- }
- }, 500);
- }
- },
-
- /**
- * @ngdoc method
- * @name umbraco.services.tinyMceService#createUmbracoMacro
- * @methodOf umbraco.services.tinyMceService
- *
- * @description
- * Creates the insert umbrco macro tinymce plugin
- *
- * @param {Object} editor the TinyMCE editor instance
- * @param {Object} $scope the current controller scope
- */
- createInsertMacro: function (editor, $scope, callback) {
-
- var createInsertMacroScope = this;
-
- /** Adds custom rules for the macro plugin and custom serialization */
- editor.on('preInit', function (args) {
- //this is requires so that we tell the serializer that a 'div' is actually allowed in the root, otherwise the cleanup will strip it out
- editor.serializer.addRules('div');
-
- /** This checks if the div is a macro container, if so, checks if its wrapped in a p tag and then unwraps it (removes p tag) */
- editor.serializer.addNodeFilter('div', function (nodes, name) {
- for (var i = 0; i < nodes.length; i++) {
- if (nodes[i].attr("class") === "umb-macro-holder" && nodes[i].parent && nodes[i].parent.name.toUpperCase() === "P") {
- nodes[i].parent.unwrap();
- }
- }
- });
-
- });
-
- /**
- * Because the macro gets wrapped in a P tag because of the way 'enter' works, this
- * method will return the macro element if not wrapped in a p, or the p if the macro
- * element is the only one inside of it even if we are deep inside an element inside the macro
- */
- function getRealMacroElem(element) {
- var e = $(element).closest(".umb-macro-holder");
- if (e.length > 0) {
- if (e.get(0).parentNode.nodeName === "P") {
- //now check if we're the only element
- if (element.parentNode.childNodes.length === 1) {
- return e.get(0).parentNode;
- }
- }
- return e.get(0);
- }
- return null;
- }
-
- /** Adds the button instance */
- editor.addButton('umbmacro', {
- icon: 'custom icon-settings-alt',
- tooltip: 'Insert macro',
- onPostRender: function () {
-
- var ctrl = this;
- var isOnMacroElement = false;
-
- /**
- if the selection comes from a different element that is not the macro's
- we need to check if the selection includes part of the macro, if so we'll force the selection
- to clear to the next element since if people can select part of the macro markup they can then modify it.
- */
- function handleSelectionChange() {
-
- if (!editor.selection.isCollapsed()) {
- var endSelection = tinymce.activeEditor.selection.getEnd();
- var startSelection = tinymce.activeEditor.selection.getStart();
- //don't proceed if it's an entire element selected
- if (endSelection !== startSelection) {
-
- //if the end selection is a macro then move the cursor
- //NOTE: we don't have to handle when the selection comes from a previous parent because
- // that is automatically taken care of with the normal onNodeChanged logic since the
- // evt.element will be the macro once it becomes part of the selection.
- var $testForMacro = $(endSelection).closest(".umb-macro-holder");
- if ($testForMacro.length > 0) {
-
- //it came from before so move after, if there is no after then select ourselves
- var next = $testForMacro.next();
- if (next.length > 0) {
- editor.selection.setCursorLocation($testForMacro.next().get(0));
- }
- else {
- selectMacroElement($testForMacro.get(0));
- }
-
- }
- }
- }
- }
-
- /** helper method to select the macro element */
- function selectMacroElement(macroElement) {
-
- // move selection to top element to ensure we can't edit this
- editor.selection.select(macroElement);
-
- // check if the current selection *is* the element (ie bug)
- var currentSelection = editor.selection.getStart();
- if (tinymce.isIE) {
- if (!editor.dom.hasClass(currentSelection, 'umb-macro-holder')) {
- while (!editor.dom.hasClass(currentSelection, 'umb-macro-holder') && currentSelection.parentNode) {
- currentSelection = currentSelection.parentNode;
- }
- editor.selection.select(currentSelection);
- }
- }
- }
-
- /**
- * Add a node change handler, test if we're editing a macro and select the whole thing, then set our isOnMacroElement flag.
- * If we change the selection inside this method, then we end up in an infinite loop, so we have to remove ourselves
- * from the event listener before changing selection, however, it seems that putting a break point in this method
- * will always cause an 'infinite' loop as the caret keeps changing.
- */
- function onNodeChanged(evt) {
-
- //set our macro button active when on a node of class umb-macro-holder
- var $macroElement = $(evt.element).closest(".umb-macro-holder");
-
- handleSelectionChange();
-
- //set the button active
- ctrl.active($macroElement.length !== 0);
-
- if ($macroElement.length > 0) {
- var macroElement = $macroElement.get(0);
-
- //remove the event listener before re-selecting
- editor.off('NodeChange', onNodeChanged);
-
- selectMacroElement(macroElement);
-
- //set the flag
- isOnMacroElement = true;
-
- //re-add the event listener
- editor.on('NodeChange', onNodeChanged);
- }
- else {
- isOnMacroElement = false;
- }
-
- }
-
- /** when the contents load we need to find any macros declared and load in their content */
- editor.on("LoadContent", function (o) {
-
- //get all macro divs and load their content
- $(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function() {
- createInsertMacroScope.loadMacroContent($(this), null, $scope);
- });
-
- });
-
- /** This prevents any other commands from executing when the current element is the macro so the content cannot be edited */
- editor.on('BeforeExecCommand', function (o) {
- if (isOnMacroElement) {
- if (o.preventDefault) {
- o.preventDefault();
- }
- if (o.stopImmediatePropagation) {
- o.stopImmediatePropagation();
- }
- return;
- }
- });
-
- /** This double checks and ensures you can't paste content into the rendered macro */
- editor.on("Paste", function (o) {
- if (isOnMacroElement) {
- if (o.preventDefault) {
- o.preventDefault();
- }
- if (o.stopImmediatePropagation) {
- o.stopImmediatePropagation();
- }
- return;
- }
- });
-
- //set onNodeChanged event listener
- editor.on('NodeChange', onNodeChanged);
-
- /**
- * Listen for the keydown in the editor, we'll check if we are currently on a macro element, if so
- * we'll check if the key down is a supported key which requires an action, otherwise we ignore the request
- * so the macro cannot be edited.
- */
- editor.on('KeyDown', function (e) {
- if (isOnMacroElement) {
- var macroElement = editor.selection.getNode();
-
- //get the 'real' element (either p or the real one)
- macroElement = getRealMacroElem(macroElement);
-
- //prevent editing
- e.preventDefault();
- e.stopPropagation();
-
- var moveSibling = function (element, isNext) {
- var $e = $(element);
- var $sibling = isNext ? $e.next() : $e.prev();
- if ($sibling.length > 0) {
- editor.selection.select($sibling.get(0));
- editor.selection.collapse(true);
- }
- else {
- //if we're moving previous and there is no sibling, then lets recurse and just select the next one
- if (!isNext) {
- moveSibling(element, true);
- return;
- }
-
- //if there is no sibling we'll generate a new p at the end and select it
- editor.setContent(editor.getContent() + "
");
- editor.selection.select($(editor.dom.getRoot()).children().last().get(0));
- editor.selection.collapse(true);
-
- }
- };
-
- //supported keys to move to the next or prev element (13-enter, 27-esc, 38-up, 40-down, 39-right, 37-left)
- //supported keys to remove the macro (8-backspace, 46-delete)
- //TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
- if ($.inArray(e.keyCode, [13, 40, 39]) !== -1) {
- //move to next element
- moveSibling(macroElement, true);
- }
- else if ($.inArray(e.keyCode, [27, 38, 37]) !== -1) {
- //move to prev element
- moveSibling(macroElement, false);
- }
- else if ($.inArray(e.keyCode, [8, 46]) !== -1) {
- //delete macro element
-
- //move first, then delete
- moveSibling(macroElement, false);
- editor.dom.remove(macroElement);
- }
- return ;
- }
- });
-
- },
-
- /** The insert macro button click event handler */
- onclick: function () {
-
- var dialogData = {
- //flag for use in rte so we only show macros flagged for the editor
- richTextEditor: true
- };
-
- //when we click we could have a macro already selected and in that case we'll want to edit the current parameters
- //so we'll need to extract them and submit them to the dialog.
- var macroElement = editor.selection.getNode();
- macroElement = getRealMacroElem(macroElement);
- if (macroElement) {
- //we have a macro selected so we'll need to parse it's alias and parameters
- var contents = $(macroElement).contents();
- var comment = _.find(contents, function(item) {
- return item.nodeType === 8;
- });
- if (!comment) {
- throw "Cannot parse the current macro, the syntax in the editor is invalid";
- }
- var syntax = comment.textContent.trim();
- var parsed = macroService.parseMacroSyntax(syntax);
- dialogData = {
- macroData: parsed
- };
- }
-
- if(callback) {
- callback(dialogData);
- }
-
- }
- });
- },
-
- insertMacroInEditor: function(editor, macroObject, $scope) {
-
- //put the macro syntax in comments, we will parse this out on the server side to be used
- //for persisting.
- var macroSyntaxComment = "";
- //create an id class for this element so we can re-select it after inserting
- var uniqueId = "umb-macro-" + editor.dom.uniqueId();
- var macroDiv = editor.dom.create('div',
- {
- 'class': 'umb-macro-holder ' + macroObject.macroAlias + ' mceNonEditable ' + uniqueId
- },
- macroSyntaxComment + 'Macro alias: ' + macroObject.macroAlias + '');
-
- editor.selection.setNode(macroDiv);
-
- var $macroDiv = $(editor.dom.select("div.umb-macro-holder." + uniqueId));
-
- //async load the macro content
- this.loadMacroContent($macroDiv, macroObject, $scope);
-
- },
-
- /** loads in the macro content async from the server */
- loadMacroContent: function($macroDiv, macroData, $scope) {
-
- //if we don't have the macroData, then we'll need to parse it from the macro div
- if (!macroData) {
- var contents = $macroDiv.contents();
- var comment = _.find(contents, function (item) {
- return item.nodeType === 8;
- });
- if (!comment) {
- throw "Cannot parse the current macro, the syntax in the editor is invalid";
- }
- var syntax = comment.textContent.trim();
- var parsed = macroService.parseMacroSyntax(syntax);
- macroData = parsed;
- }
-
- var $ins = $macroDiv.find("ins");
-
- //show the throbber
- $macroDiv.addClass("loading");
-
- var contentId = $routeParams.id;
-
- //need to wrap in safe apply since this might be occuring outside of angular
- angularHelper.safeApply($scope, function() {
- macroResource.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.macroParamsDictionary)
- .then(function (htmlResult) {
-
- $macroDiv.removeClass("loading");
- htmlResult = htmlResult.trim();
- if (htmlResult !== "") {
- $ins.html(htmlResult);
- }
- });
- });
-
- },
-
- createLinkPicker: function(editor, $scope, onClick) {
-
- function createLinkList(callback) {
- return function() {
- var linkList = editor.settings.link_list;
-
- if (typeof(linkList) === "string") {
- tinymce.util.XHR.send({
- url: linkList,
- success: function(text) {
- callback(tinymce.util.JSON.parse(text));
- }
- });
- } else {
- callback(linkList);
- }
- };
- }
-
- function showDialog(linkList) {
- var data = {}, selection = editor.selection, dom = editor.dom, selectedElm, anchorElm, initialText;
- var win, linkListCtrl, relListCtrl, targetListCtrl;
-
- function linkListChangeHandler(e) {
- var textCtrl = win.find('#text');
-
- if (!textCtrl.value() || (e.lastControl && textCtrl.value() === e.lastControl.text())) {
- textCtrl.value(e.control.text());
- }
-
- win.find('#href').value(e.control.value());
- }
-
- function buildLinkList() {
- var linkListItems = [{
- text: 'None',
- value: ''
+ editor.dom.setAttrib(imgElm, 'id', null);
+ }, 500);
+ }
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.tinyMceService#createUmbracoMacro
+ * @methodOf umbraco.services.tinyMceService
+ *
+ * @description
+ * Creates the insert umbrco macro tinymce plugin
+ *
+ * @param {Object} editor the TinyMCE editor instance
+ * @param {Object} $scope the current controller scope
+ */
+ createInsertMacro: function (editor, $scope, callback) {
+
+ var createInsertMacroScope = this;
+
+ /** Adds custom rules for the macro plugin and custom serialization */
+ editor.on('preInit', function (args) {
+ //this is requires so that we tell the serializer that a 'div' is actually allowed in the root, otherwise the cleanup will strip it out
+ editor.serializer.addRules('div');
+
+ /** This checks if the div is a macro container, if so, checks if its wrapped in a p tag and then unwraps it (removes p tag) */
+ editor.serializer.addNodeFilter('div', function (nodes, name) {
+ for (var i = 0; i < nodes.length; i++) {
+ if (nodes[i].attr("class") === "umb-macro-holder" && nodes[i].parent && nodes[i].parent.name.toUpperCase() === "P") {
+ nodes[i].parent.unwrap();
+ }
+ }
+ });
+
+ });
+
+ /**
+ * Because the macro gets wrapped in a P tag because of the way 'enter' works, this
+ * method will return the macro element if not wrapped in a p, or the p if the macro
+ * element is the only one inside of it even if we are deep inside an element inside the macro
+ */
+ function getRealMacroElem(element) {
+ var e = $(element).closest(".umb-macro-holder");
+ if (e.length > 0) {
+ if (e.get(0).parentNode.nodeName === "P") {
+ //now check if we're the only element
+ if (element.parentNode.childNodes.length === 1) {
+ return e.get(0).parentNode;
+ }
+ }
+ return e.get(0);
+ }
+ return null;
+ }
+
+ /** Adds the button instance */
+ editor.addButton('umbmacro', {
+ icon: 'custom icon-settings-alt',
+ tooltip: 'Insert macro',
+ onPostRender: function () {
+
+ var ctrl = this;
+ var isOnMacroElement = false;
+
+ /**
+ if the selection comes from a different element that is not the macro's
+ we need to check if the selection includes part of the macro, if so we'll force the selection
+ to clear to the next element since if people can select part of the macro markup they can then modify it.
+ */
+ function handleSelectionChange() {
+
+ if (!editor.selection.isCollapsed()) {
+ var endSelection = tinymce.activeEditor.selection.getEnd();
+ var startSelection = tinymce.activeEditor.selection.getStart();
+ //don't proceed if it's an entire element selected
+ if (endSelection !== startSelection) {
+
+ //if the end selection is a macro then move the cursor
+ //NOTE: we don't have to handle when the selection comes from a previous parent because
+ // that is automatically taken care of with the normal onNodeChanged logic since the
+ // evt.element will be the macro once it becomes part of the selection.
+ var $testForMacro = $(endSelection).closest(".umb-macro-holder");
+ if ($testForMacro.length > 0) {
+
+ //it came from before so move after, if there is no after then select ourselves
+ var next = $testForMacro.next();
+ if (next.length > 0) {
+ editor.selection.setCursorLocation($testForMacro.next().get(0));
+ } else {
+ selectMacroElement($testForMacro.get(0));
+ }
+
+ }
+ }
+ }
+ }
+
+ /** helper method to select the macro element */
+ function selectMacroElement(macroElement) {
+
+ // move selection to top element to ensure we can't edit this
+ editor.selection.select(macroElement);
+
+ // check if the current selection *is* the element (ie bug)
+ var currentSelection = editor.selection.getStart();
+ if (tinymce.isIE) {
+ if (!editor.dom.hasClass(currentSelection, 'umb-macro-holder')) {
+ while (!editor.dom.hasClass(currentSelection, 'umb-macro-holder') && currentSelection.parentNode) {
+ currentSelection = currentSelection.parentNode;
+ }
+ editor.selection.select(currentSelection);
+ }
+ }
+ }
+
+ /**
+ * Add a node change handler, test if we're editing a macro and select the whole thing, then set our isOnMacroElement flag.
+ * If we change the selection inside this method, then we end up in an infinite loop, so we have to remove ourselves
+ * from the event listener before changing selection, however, it seems that putting a break point in this method
+ * will always cause an 'infinite' loop as the caret keeps changing.
+ */
+ function onNodeChanged(evt) {
+
+ //set our macro button active when on a node of class umb-macro-holder
+ var $macroElement = $(evt.element).closest(".umb-macro-holder");
+
+ handleSelectionChange();
+
+ //set the button active
+ ctrl.active($macroElement.length !== 0);
+
+ if ($macroElement.length > 0) {
+ var macroElement = $macroElement.get(0);
+
+ //remove the event listener before re-selecting
+ editor.off('NodeChange', onNodeChanged);
+
+ selectMacroElement(macroElement);
+
+ //set the flag
+ isOnMacroElement = true;
+
+ //re-add the event listener
+ editor.on('NodeChange', onNodeChanged);
+ } else {
+ isOnMacroElement = false;
+ }
+
+ }
+
+ /** when the contents load we need to find any macros declared and load in their content */
+ editor.on("LoadContent", function (o) {
+
+ //get all macro divs and load their content
+ $(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function () {
+ createInsertMacroScope.loadMacroContent($(this), null, $scope);
+ });
+
+ });
+
+ /** This prevents any other commands from executing when the current element is the macro so the content cannot be edited */
+ editor.on('BeforeExecCommand', function (o) {
+ if (isOnMacroElement) {
+ if (o.preventDefault) {
+ o.preventDefault();
+ }
+ if (o.stopImmediatePropagation) {
+ o.stopImmediatePropagation();
+ }
+ return;
+ }
+ });
+
+ /** This double checks and ensures you can't paste content into the rendered macro */
+ editor.on("Paste", function (o) {
+ if (isOnMacroElement) {
+ if (o.preventDefault) {
+ o.preventDefault();
+ }
+ if (o.stopImmediatePropagation) {
+ o.stopImmediatePropagation();
+ }
+ return;
+ }
+ });
+
+ //set onNodeChanged event listener
+ editor.on('NodeChange', onNodeChanged);
+
+ /**
+ * Listen for the keydown in the editor, we'll check if we are currently on a macro element, if so
+ * we'll check if the key down is a supported key which requires an action, otherwise we ignore the request
+ * so the macro cannot be edited.
+ */
+ editor.on('KeyDown', function (e) {
+ if (isOnMacroElement) {
+ var macroElement = editor.selection.getNode();
+
+ //get the 'real' element (either p or the real one)
+ macroElement = getRealMacroElem(macroElement);
+
+ //prevent editing
+ e.preventDefault();
+ e.stopPropagation();
+
+ var moveSibling = function (element, isNext) {
+ var $e = $(element);
+ var $sibling = isNext ? $e.next() : $e.prev();
+ if ($sibling.length > 0) {
+ editor.selection.select($sibling.get(0));
+ editor.selection.collapse(true);
+ } else {
+ //if we're moving previous and there is no sibling, then lets recurse and just select the next one
+ if (!isNext) {
+ moveSibling(element, true);
+ return;
+ }
+
+ //if there is no sibling we'll generate a new p at the end and select it
+ editor.setContent(editor.getContent() + "
");
+ editor.selection.select($(editor.dom.getRoot()).children().last().get(0));
+ editor.selection.collapse(true);
+
+ }
+ };
+
+ //supported keys to move to the next or prev element (13-enter, 27-esc, 38-up, 40-down, 39-right, 37-left)
+ //supported keys to remove the macro (8-backspace, 46-delete)
+ //TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
+ if ($.inArray(e.keyCode, [13, 40, 39]) !== -1) {
+ //move to next element
+ moveSibling(macroElement, true);
+ } else if ($.inArray(e.keyCode, [27, 38, 37]) !== -1) {
+ //move to prev element
+ moveSibling(macroElement, false);
+ } else if ($.inArray(e.keyCode, [8, 46]) !== -1) {
+ //delete macro element
+
+ //move first, then delete
+ moveSibling(macroElement, false);
+ editor.dom.remove(macroElement);
+ }
+ return;
+ }
+ });
+
+ },
+
+ /** The insert macro button click event handler */
+ onclick: function () {
+
+ var dialogData = {
+ //flag for use in rte so we only show macros flagged for the editor
+ richTextEditor: true
+ };
+
+ //when we click we could have a macro already selected and in that case we'll want to edit the current parameters
+ //so we'll need to extract them and submit them to the dialog.
+ var macroElement = editor.selection.getNode();
+ macroElement = getRealMacroElem(macroElement);
+ if (macroElement) {
+ //we have a macro selected so we'll need to parse it's alias and parameters
+ var contents = $(macroElement).contents();
+ var comment = _.find(contents, function (item) {
+ return item.nodeType === 8;
+ });
+ if (!comment) {
+ throw "Cannot parse the current macro, the syntax in the editor is invalid";
+ }
+ var syntax = comment.textContent.trim();
+ var parsed = macroService.parseMacroSyntax(syntax);
+ dialogData = {
+ macroData: parsed
+ };
+ }
+
+ if (callback) {
+ callback(dialogData);
+ }
+
+ }
+ });
+ },
+
+ insertMacroInEditor: function (editor, macroObject, $scope) {
+
+ //put the macro syntax in comments, we will parse this out on the server side to be used
+ //for persisting.
+ var macroSyntaxComment = "";
+ //create an id class for this element so we can re-select it after inserting
+ var uniqueId = "umb-macro-" + editor.dom.uniqueId();
+ var macroDiv = editor.dom.create('div', {
+ 'class': 'umb-macro-holder ' + macroObject.macroAlias + ' mceNonEditable ' + uniqueId
+ },
+ macroSyntaxComment + 'Macro alias: ' + macroObject.macroAlias + '');
+
+ editor.selection.setNode(macroDiv);
+
+ var $macroDiv = $(editor.dom.select("div.umb-macro-holder." + uniqueId));
+
+ //async load the macro content
+ this.loadMacroContent($macroDiv, macroObject, $scope);
+
+ },
+
+ /** loads in the macro content async from the server */
+ loadMacroContent: function ($macroDiv, macroData, $scope) {
+
+ //if we don't have the macroData, then we'll need to parse it from the macro div
+ if (!macroData) {
+ var contents = $macroDiv.contents();
+ var comment = _.find(contents, function (item) {
+ return item.nodeType === 8;
+ });
+ if (!comment) {
+ throw "Cannot parse the current macro, the syntax in the editor is invalid";
+ }
+ var syntax = comment.textContent.trim();
+ var parsed = macroService.parseMacroSyntax(syntax);
+ macroData = parsed;
+ }
+
+ var $ins = $macroDiv.find("ins");
+
+ //show the throbber
+ $macroDiv.addClass("loading");
+
+ var contentId = $routeParams.id;
+
+ //need to wrap in safe apply since this might be occuring outside of angular
+ angularHelper.safeApply($scope, function () {
+ macroResource.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.macroParamsDictionary)
+ .then(function (htmlResult) {
+
+ $macroDiv.removeClass("loading");
+ htmlResult = htmlResult.trim();
+ if (htmlResult !== "") {
+ $ins.html(htmlResult);
+ }
+ });
+ });
+
+ },
+
+ createLinkPicker: function (editor, $scope, onClick) {
+
+ function createLinkList(callback) {
+ return function () {
+ var linkList = editor.settings.link_list;
+
+ if (typeof (linkList) === "string") {
+ tinymce.util.XHR.send({
+ url: linkList,
+ success: function (text) {
+ callback(tinymce.util.JSON.parse(text));
+ }
+ });
+ } else {
+ callback(linkList);
+ }
+ };
+ }
+
+ function showDialog(linkList) {
+ var data = {},
+ selection = editor.selection,
+ dom = editor.dom,
+ selectedElm, anchorElm, initialText;
+ var win, linkListCtrl, relListCtrl, targetListCtrl;
+
+ function linkListChangeHandler(e) {
+ var textCtrl = win.find('#text');
+
+ if (!textCtrl.value() || (e.lastControl && textCtrl.value() === e.lastControl.text())) {
+ textCtrl.value(e.control.text());
+ }
+
+ win.find('#href').value(e.control.value());
+ }
+
+ function buildLinkList() {
+ var linkListItems = [{
+ text: 'None',
+ value: ''
}];
- tinymce.each(linkList, function(link) {
- linkListItems.push({
- text: link.text || link.title,
- value: link.value || link.url,
- menu: link.menu
- });
- });
+ tinymce.each(linkList, function (link) {
+ linkListItems.push({
+ text: link.text || link.title,
+ value: link.value || link.url,
+ menu: link.menu
+ });
+ });
- return linkListItems;
- }
+ return linkListItems;
+ }
- function buildRelList(relValue) {
- var relListItems = [{
- text: 'None',
- value: ''
+ function buildRelList(relValue) {
+ var relListItems = [{
+ text: 'None',
+ value: ''
}];
- tinymce.each(editor.settings.rel_list, function(rel) {
- relListItems.push({
- text: rel.text || rel.title,
- value: rel.value,
- selected: relValue === rel.value
- });
- });
+ tinymce.each(editor.settings.rel_list, function (rel) {
+ relListItems.push({
+ text: rel.text || rel.title,
+ value: rel.value,
+ selected: relValue === rel.value
+ });
+ });
- return relListItems;
- }
+ return relListItems;
+ }
- function buildTargetList(targetValue) {
- var targetListItems = [{
- text: 'None',
- value: ''
+ function buildTargetList(targetValue) {
+ var targetListItems = [{
+ text: 'None',
+ value: ''
}];
- if (!editor.settings.target_list) {
- targetListItems.push({
- text: 'New window',
- value: '_blank'
- });
- }
+ if (!editor.settings.target_list) {
+ targetListItems.push({
+ text: 'New window',
+ value: '_blank'
+ });
+ }
- tinymce.each(editor.settings.target_list, function(target) {
- targetListItems.push({
- text: target.text || target.title,
- value: target.value,
- selected: targetValue === target.value
- });
- });
+ tinymce.each(editor.settings.target_list, function (target) {
+ targetListItems.push({
+ text: target.text || target.title,
+ value: target.value,
+ selected: targetValue === target.value
+ });
+ });
- return targetListItems;
- }
+ return targetListItems;
+ }
- function buildAnchorListControl(url) {
- var anchorList = [];
+ function buildAnchorListControl(url) {
+ var anchorList = [];
- tinymce.each(editor.dom.select('a:not([href])'), function(anchor) {
- var id = anchor.name || anchor.id;
+ tinymce.each(editor.dom.select('a:not([href])'), function (anchor) {
+ var id = anchor.name || anchor.id;
- if (id) {
- anchorList.push({
- text: id,
- value: '#' + id,
- selected: url.indexOf('#' + id) !== -1
- });
- }
- });
+ if (id) {
+ anchorList.push({
+ text: id,
+ value: '#' + id,
+ selected: url.indexOf('#' + id) !== -1
+ });
+ }
+ });
- if (anchorList.length) {
- anchorList.unshift({
- text: 'None',
- value: ''
- });
+ if (anchorList.length) {
+ anchorList.unshift({
+ text: 'None',
+ value: ''
+ });
- return {
- name: 'anchor',
- type: 'listbox',
- label: 'Anchors',
- values: anchorList,
- onselect: linkListChangeHandler
- };
- }
- }
+ return {
+ name: 'anchor',
+ type: 'listbox',
+ label: 'Anchors',
+ values: anchorList,
+ onselect: linkListChangeHandler
+ };
+ }
+ }
- function updateText() {
- if (!initialText && data.text.length === 0) {
- this.parent().parent().find('#text')[0].value(this.value());
- }
- }
+ function updateText() {
+ if (!initialText && data.text.length === 0) {
+ this.parent().parent().find('#text')[0].value(this.value());
+ }
+ }
- selectedElm = selection.getNode();
- anchorElm = dom.getParent(selectedElm, 'a[href]');
+ selectedElm = selection.getNode();
+ anchorElm = dom.getParent(selectedElm, 'a[href]');
- data.text = initialText = anchorElm ? (anchorElm.innerText || anchorElm.textContent) : selection.getContent({format: 'text'});
- data.href = anchorElm ? dom.getAttrib(anchorElm, 'href') : '';
- data.target = anchorElm ? dom.getAttrib(anchorElm, 'target') : '';
- data.rel = anchorElm ? dom.getAttrib(anchorElm, 'rel') : '';
+ data.text = initialText = anchorElm ? (anchorElm.innerText || anchorElm.textContent) : selection.getContent({
+ format: 'text'
+ });
+ data.href = anchorElm ? dom.getAttrib(anchorElm, 'href') : '';
+ data.target = anchorElm ? dom.getAttrib(anchorElm, 'target') : '';
+ data.rel = anchorElm ? dom.getAttrib(anchorElm, 'rel') : '';
- if (selectedElm.nodeName === "IMG") {
- data.text = initialText = " ";
- }
+ if (selectedElm.nodeName === "IMG") {
+ data.text = initialText = " ";
+ }
- if (linkList) {
- linkListCtrl = {
- type: 'listbox',
- label: 'Link list',
- values: buildLinkList(),
- onselect: linkListChangeHandler
- };
- }
+ if (linkList) {
+ linkListCtrl = {
+ type: 'listbox',
+ label: 'Link list',
+ values: buildLinkList(),
+ onselect: linkListChangeHandler
+ };
+ }
- if (editor.settings.target_list !== false) {
- targetListCtrl = {
- name: 'target',
- type: 'listbox',
- label: 'Target',
- values: buildTargetList(data.target)
- };
- }
+ if (editor.settings.target_list !== false) {
+ targetListCtrl = {
+ name: 'target',
+ type: 'listbox',
+ label: 'Target',
+ values: buildTargetList(data.target)
+ };
+ }
- if (editor.settings.rel_list) {
- relListCtrl = {
- name: 'rel',
- type: 'listbox',
- label: 'Rel',
- values: buildRelList(data.rel)
- };
- }
+ if (editor.settings.rel_list) {
+ relListCtrl = {
+ name: 'rel',
+ type: 'listbox',
+ label: 'Rel',
+ values: buildRelList(data.rel)
+ };
+ }
- var injector = angular.element(document.getElementById("umbracoMainPageBody")).injector();
- var dialogService = injector.get("dialogService");
- var currentTarget = null;
+ var currentTarget = null;
- //if we already have a link selected, we want to pass that data over to the dialog
- if(anchorElm){
- var anchor = $(anchorElm);
- currentTarget = {
- name: anchor.attr("title"),
- url: anchor.attr("href"),
- target: anchor.attr("target")
- };
+ //if we already have a link selected, we want to pass that data over to the dialog
+ if (anchorElm) {
+ var anchor = $(anchorElm);
+ currentTarget = {
+ name: anchor.attr("title"),
+ url: anchor.attr("href"),
+ target: anchor.attr("target")
+ };
- //locallink detection, we do this here, to avoid poluting the dialogservice
- //so the dialog service can just expect to get a node-like structure
- if (currentTarget.url.indexOf("localLink:") > 0) {
- var linkId = currentTarget.url.substring(currentTarget.url.indexOf(":") + 1, currentTarget.url.length - 1);
- //we need to check if this is an INT or a UDI
- var parsedIntId = parseInt(linkId, 10);
- if (isNaN(parsedIntId)) {
- //it's a UDI
- currentTarget.udi = linkId;
- }
- else {
- currentTarget.id = linkId;
- }
- }
- }
+ // drop the lead char from the anchor text, if it has a value
+ var anchorVal = anchor[0].dataset.anchor;
+ if (anchorVal) {
+ currentTarget.anchor = anchorVal.substring(1);
+ }
- if(onClick) {
- onClick(currentTarget, anchorElm);
- }
+ //locallink detection, we do this here, to avoid poluting the dialogservice
+ //so the dialog service can just expect to get a node-like structure
+ if (currentTarget.url.indexOf("localLink:") > 0) {
+ // if the current link has an anchor, it needs to be considered when getting the udi/id
+ // if an anchor exists, reduce the substring max by its length plus two to offset the removed prefix and trailing curly brace
+ var linkId = currentTarget.url.substring(currentTarget.url.indexOf(":") + 1, currentTarget.url.lastIndexOf("}"));
- }
+ //we need to check if this is an INT or a UDI
+ var parsedIntId = parseInt(linkId, 10);
+ if (isNaN(parsedIntId)) {
+ //it's a UDI
+ currentTarget.udi = linkId;
+ } else {
+ currentTarget.id = linkId;
+ }
+ }
+ }
- editor.addButton('link', {
- icon: 'link',
- tooltip: 'Insert/edit link',
- shortcut: 'Ctrl+K',
- onclick: createLinkList(showDialog),
- stateSelector: 'a[href]'
- });
+ if (onClick) {
+ onClick(currentTarget, anchorElm);
+ }
- editor.addButton('unlink', {
- icon: 'unlink',
- tooltip: 'Remove link',
- cmd: 'unlink',
- stateSelector: 'a[href]'
- });
+ }
- editor.addShortcut('Ctrl+K', '', createLinkList(showDialog));
- this.showDialog = showDialog;
+ editor.addButton('link', {
+ icon: 'link',
+ tooltip: 'Insert/edit link',
+ shortcut: 'Ctrl+K',
+ onclick: createLinkList(showDialog),
+ stateSelector: 'a[href]'
+ });
- editor.addMenuItem('link', {
- icon: 'link',
- text: 'Insert link',
- shortcut: 'Ctrl+K',
- onclick: createLinkList(showDialog),
- stateSelector: 'a[href]',
- context: 'insert',
- prependToContext: true
- });
+ editor.addButton('unlink', {
+ icon: 'unlink',
+ tooltip: 'Remove link',
+ cmd: 'unlink',
+ stateSelector: 'a[href]'
+ });
- },
+ editor.addShortcut('Ctrl+K', '', createLinkList(showDialog));
+ this.showDialog = showDialog;
- insertLinkInEditor: function(editor, target, anchorElm) {
+ editor.addMenuItem('link', {
+ icon: 'link',
+ text: 'Insert link',
+ shortcut: 'Ctrl+K',
+ onclick: createLinkList(showDialog),
+ stateSelector: 'a[href]',
+ context: 'insert',
+ prependToContext: true
+ });
- var href = target.url;
- // We want to use the Udi. If it is set, we use it, else fallback to id, and finally to null
- var hasUdi = target.udi ? true : false;
- var id = hasUdi ? target.udi : (target.id ? target.id : null);
+ },
- //Create a json obj used to create the attributes for the tag
- function createElemAttributes() {
- var a = {
- href: href,
- title: target.name,
- target: target.target ? target.target : null,
- rel: target.rel ? target.rel : null
- };
- if (hasUdi) {
- a["data-udi"] = target.udi;
- }
- else if (target.id) {
- a["data-id"] = target.id;
- }
- return a;
- }
+ /**
+ * @ngdoc method
+ * @name umbraco.services.tinyMceService#getAnchorNames
+ * @methodOf umbraco.services.tinyMceService
+ *
+ * @description
+ * From the given string, generates a string array where each item is the id attribute value from a named anchor
+ * 'some string with a named anchor' returns ['anchor']
+ *
+ * @param {string} input the string to parse
+ */
+ getAnchorNames: function (input) {
+ if (!input) return [];
+
+ var anchorPattern = //gi;
+ var matches = input.match(anchorPattern);
+ var anchors = [];
- function insertLink() {
- if (anchorElm) {
- editor.dom.setAttribs(anchorElm, createElemAttributes());
+ if (matches) {
+ anchors = matches.map(function (v) {
+ return v.substring(v.indexOf('"') + 1, v.lastIndexOf('\\'));
+ });
+ }
- editor.selection.select(anchorElm);
- editor.execCommand('mceEndTyping');
- }
- else {
- editor.execCommand('mceInsertLink', false, createElemAttributes());
- }
- }
+ return anchors.filter(function(val, i, self) {
+ return self.indexOf(val) === i;
+ });
+ },
- if (!href) {
- editor.execCommand('unlink');
- return;
- }
+ insertLinkInEditor: function (editor, target, anchorElm) {
- //if we have an id, it must be a locallink:id, aslong as the isMedia flag is not set
- if(id && (angular.isUndefined(target.isMedia) || !target.isMedia)){
-
- href = "/{localLink:" + id + "}";
+ var href = target.url;
+ // We want to use the Udi. If it is set, we use it, else fallback to id, and finally to null
+ var hasUdi = target.udi ? true : false;
+ var id = hasUdi ? target.udi : (target.id ? target.id : null);
- insertLink();
- return;
- }
+ // if an anchor exists, check that it is appropriately prefixed
+ if (target.anchor && target.anchor[0] !== '?' && target.anchor[0] !== '#') {
+ target.anchor = (target.anchor.indexOf('=') === -1 ? '#' : '?') + target.anchor;
+ }
+
+ // the href might be an external url, so check the value for an anchor/qs
+ // href has the anchor re-appended later, hence the reset here to avoid duplicating the anchor
+ if (!target.anchor) {
+ var urlParts = href.split(/(#|\?)/);
+ if (urlParts.length === 3) {
+ href = urlParts[0];
+ target.anchor = urlParts[1] + urlParts[2];
+ }
+ }
+
+ //Create a json obj used to create the attributes for the tag
+ function createElemAttributes() {
+ var a = {
+ href: href,
+ title: target.name,
+ target: target.target ? target.target : null,
+ rel: target.rel ? target.rel : null
+ };
- // Is email and not //user@domain.com
- if (href.indexOf('@') > 0 && href.indexOf('//') === -1 && href.indexOf('mailto:') === -1) {
- href = 'mailto:' + href;
- insertLink();
- return;
- }
+ if (hasUdi) {
+ a["data-udi"] = target.udi;
+ } else if (target.id) {
+ a["data-id"] = target.id;
+ }
- // Is www. prefixed
- if (/^\s*www\./i.test(href)) {
- href = 'http://' + href;
- insertLink();
- return;
- }
+ if (target.anchor) {
+ a["data-anchor"] = target.anchor;
+ a.href = a.href + target.anchor;
+ } else {
+ a["data-anchor"] = null;
+ }
- insertLink();
+ return a;
+ }
- }
+ function insertLink() {
+ if (anchorElm) {
+ editor.dom.setAttribs(anchorElm, createElemAttributes());
- };
+ editor.selection.select(anchorElm);
+ editor.execCommand('mceEndTyping');
+ } else {
+ editor.execCommand('mceInsertLink', false, createElemAttributes());
+ }
+ }
+
+ if (!href) {
+ editor.execCommand('unlink');
+ return;
+ }
+
+ //if we have an id, it must be a locallink:id, aslong as the isMedia flag is not set
+ if (id && (angular.isUndefined(target.isMedia) || !target.isMedia)) {
+
+ href = "/{localLink:" + id + "}";
+
+ insertLink();
+ return;
+ }
+
+ // Is email and not //user@domain.com
+ if (href.indexOf('@') > 0 && href.indexOf('//') === -1 && href.indexOf('mailto:') === -1) {
+ href = 'mailto:' + href;
+ insertLink();
+ return;
+ }
+
+ // Is www. prefixed
+ if (/^\s*www\./i.test(href)) {
+ href = 'http://' + href;
+ insertLink();
+ return;
+ }
+
+ insertLink();
+
+ }
+
+ };
}
angular.module('umbraco.services').factory('tinyMceService', tinyMceService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
index 888a067a66..9adde2fd97 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
@@ -50,7 +50,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
parentNode.cssClasses = [];
}
parentNode.cssClasses.push("no-access");
- }
+ }
//create a method outside of the loop to return the parent - otherwise jshint blows up
var funcParent = function() {
@@ -263,7 +263,12 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
if (args.node.children && args.node.children.length > 0) {
args.node.expanded = true;
args.node.hasChildren = true;
+
+ if (angular.isFunction(args.node.updateNodeData)) {
+ args.node.updateNodeData();
+ }
}
+
return data;
}, function(reason) {
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 78dec2f065..2d0768e50e 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
@@ -99,6 +99,28 @@
return saveModel;
},
+ /** formats the display model used to display the dictionary to the model used to save the dictionary */
+ formatDictionaryPostData : function(dictionary, nameIsDirty) {
+ var saveModel = {
+ parentId: dictionary.parentId,
+ id: dictionary.id,
+ name: dictionary.name,
+ nameIsDirty: nameIsDirty,
+ translations: [],
+ key : dictionary.key
+ };
+
+ for(var i = 0; i < dictionary.translations.length; i++) {
+ saveModel.translations.push({
+ isoCode: dictionary.translations[i].isoCode,
+ languageId: dictionary.translations[i].languageId,
+ translation: dictionary.translations[i].translation
+ });
+ }
+
+ return saveModel;
+ },
+
/** formats the display model used to display the user to the model used to save the user */
formatUserPostData: function (displayModel) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
index 21fe84ff8d..6e20ce91ac 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
@@ -8,7 +8,8 @@
{ "value": 0, "name": "Active", "key": "Active", "color": "success" },
{ "value": 1, "name": "Disabled", "key": "Disabled", "color": "danger" },
{ "value": 2, "name": "Locked out", "key": "LockedOut", "color": "danger" },
- { "value": 3, "name": "Invited", "key": "Invited", "color": "warning" }
+ { "value": 3, "name": "Invited", "key": "Invited", "color": "warning" },
+ { "value": 4, "name": "Inactive", "key": "Inactive", "color": "warning" }
];
angular.forEach(userStates, function (userState) {
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index efbb13fad4..a174de1271 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -21,7 +21,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
"At least 2 people have named their cat 'Umbraco'",
'On an average day, more than 1000 people download Umbraco',
'umbraco.tv is the premier source of Umbraco video tutorials to get you started',
- 'You can find the world\'s friendliest CMS community at our.umbraco.org',
+ 'You can find the world\'s friendliest CMS community at our.umbraco.com',
'You can become a certified Umbraco developer by attending one of the official courses',
'Umbraco works really well on tablets',
'You have 100% control over your markup and design when crafting a website in Umbraco',
@@ -121,7 +121,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
}
},
- //loads available packages from our.umbraco.org
+ //loads available packages from our.umbraco.com
getPackages : function(){
return $http.get(Umbraco.Sys.ServerVariables.installApiBaseUrl + "GetPackages");
},
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html
index 3ced6ed678..ad9b1c9cc1 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html
@@ -3,7 +3,7 @@
In order to run umbraco, you'll need to update your permission settings.
Detailed information about the correct file & folder permissions for Umbraco can be found
- here.
+ here.
The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation.
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
index 0b9e22a0f3..1ffbdb205b 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
@@ -12,7 +12,7 @@
-
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 dae428c18a..110d3700d0 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/application/grid.less b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
index 2671adba32..ff795d5ff4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
@@ -248,13 +248,13 @@ body.umb-drawer-is-visible #mainwrapper{
#applications-tray {
left: 60px;
}
- #navigation {
+ #navigation, #umb-notifications-wrapper {
left: 60px;
}
- #contentwrapper, #contentcolumn, #umb-notifications-wrapper {
+ #contentwrapper, #contentcolumn {
left: 30px;
}
- #umbracoMainPageBody .umb-modal-left.fade.in {
+ #umbracoMainPageBody .umb-modal-left.fade.in {
margin-left: 61px;
}
}
@@ -277,12 +277,13 @@ body.umb-drawer-is-visible #mainwrapper{
#applications-tray {
left: 40px;
}
- #navigation {
+ #navigation, #umb-notifications-wrapper {
left: 40px;
}
- #contentwrapper, #contentcolumn, #umb-notifications-wrapper {
+ #contentwrapper, #contentcolumn {
left: 20px;
}
+
#umbracoMainPageBody .umb-modal-left.fade.in {
margin-left: 41px;
width: 85%!important;
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 90521e1ec7..a391e16635 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -114,6 +114,8 @@
@import "components/umb-grid.less";
@import "components/umb-empty-state.less";
@import "components/umb-property-editor.less";
+@import "components/umb-color-swatches.less";
+@import "components/check-circle.less";
@import "components/umb-iconpicker.less";
@import "components/umb-insert-code-box.less";
@import "components/umb-packages.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
index 0fae291e72..3c979135fb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
@@ -55,12 +55,13 @@
/* Our badge - should be moved */
.umb-help-badge {
- padding: 10px 20px 10px 35px;
+ padding: 10px 20px 10px 55px;
background: @white;
position: relative;
overflow: hidden;
border-radius: 3px;
display: block;
+ margin-bottom:5px;
}
.umb-help-badge:hover,
@@ -74,10 +75,10 @@
}
.umb-help-badge__icon {
- font-size: 40px;
+ font-size: 36px;
transform: translate(0,-50%);
position: absolute;
- left: -15px;
+ left: 10px;
top: 50%;
color: @red-l3;
}
@@ -128,6 +129,14 @@
align-items: center;
}
+/* the outer container for each help type - tours, video etc */
+.umb-help-section + .umb-help-section {
+ margin-top:20px;
+}
+
+.umb-help-section__title {
+ margin:0 0 10px;
+}
/* Help list */
@@ -135,12 +144,12 @@
list-style: none;
margin-left: 0;
margin-bottom: 0;
- background: @white;
+ background: @white;
border-radius: 3px;
-}
-
-.umb-help-list:last-child {
- border-bottom: none;
+
+ [data-element*="help-tours"] & {
+ margin-bottom:5px;
+ }
}
.umb-help-list-item {
@@ -149,20 +158,28 @@
border-bottom: 1px solid @gray-9;
}
-.umb-help-list-item > a,
+.umb-help-list-item__group-title i {
+ margin-right:2px;
+ text-decoration: none;
+}
+
.umb-help-list-item__content {
display: flex;
align-items: center;
- padding: 10px 20px;
+ padding: 10px 20px 10px 10px;
+ text-decoration: none;
}
+.umb-help-list-item:hover,
+.umb-help-list-item:focus,
+.umb-help-list-item:active,
.umb-help-list-item > a:hover,
.umb-help-list-item > a:focus,
.umb-help-list-item > a:active {
text-decoration: none;
.umb-help-list-item__title {
- text-decoration: underline !important;
+ text-decoration: underline;
}
}
@@ -191,4 +208,8 @@
.umb-help-list-item:hover .umb-help-list-item__group-title {
text-decoration: underline;
+}
+
+[data-element*="tour-"].umb-help-list-item:hover .umb-help-list-item__title {
+ text-decoration:none;
}
\ No newline at end of file
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
new file mode 100644
index 0000000000..a4c3a89c99
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
@@ -0,0 +1,20 @@
+.check_circle {
+ display: flex;
+ opacity: 0;
+ width: 20px;
+ height: 20px;
+ margin: 0 auto;
+
+ .icon {
+ background-color: rgba(0,0,0,.15);
+ border-radius: 50%;
+ color: @white;
+ font-size: 1em;
+ display: flex;
+ width: 100%;
+ height: 100%;
+ align-items: center;
+ justify-content: center;
+ float: left;
+ }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index b94055a0d2..fb71016f90 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -1,12 +1,18 @@
.umb-editor-sub-header {
- padding: 15px 0;
- margin-bottom: 30px;
- background: @white;
- display: flex;
- justify-content: space-between;
- margin-top: -30px;
- position: relative;
- top: 0;
+ padding: 15px 0;
+ margin-bottom: 30px;
+ background: @white;
+ display: flex;
+ justify-content: space-between;
+ margin-top: -30px;
+ position: relative;
+ top: 0;
+
+ &.nested {
+ margin-top: 0;
+ margin-bottom: 0;
+ background: @gray-10;
+ }
}
.umb-editor-sub-header.-umb-sticky-bar {
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
new file mode 100644
index 0000000000..e27bd0d654
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
@@ -0,0 +1,37 @@
+.umb-color-swatches {
+
+ .umb-color-box {
+ border: none;
+ color: white;
+ cursor: pointer;
+ padding: 5px;
+ text-align: center;
+ text-decoration: none;
+ display: inline-block;
+ margin: 5px;
+ border-radius: 3px;
+ width: 30px;
+ height: 30px;
+ transition: box-shadow .3s;
+
+ &:hover, &:focus {
+ 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;
+
+ .check_circle {
+ width: 25px;
+ height: 25px;
+ }
+ }
+ }
+}
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 107c14ad86..49f0892bb0 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
@@ -537,15 +537,11 @@
.umb-grid textarea.textstring {
display: block;
overflow: hidden;
- border: none;
background: @white;
outline: none;
resize: none;
color: @gray-3;
-}
-
-.umb-grid .umb-cell-rte textarea.mceNoEditor {
- display: none !important;
+ min-width: 100%;
}
.umb-grid .umb-cell-media .caption {
@@ -567,11 +563,6 @@
width: 100%;
}
-.umb-grid .umb-cell-rte {
- border-color: transparent;
-}
-
-
// ICONS
// -------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index a341c69129..50eb3c622b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -530,6 +530,13 @@ input.umb-group-builder__group-title-input {
overflow: hidden;
}
+ .editor-validation-pattern{
+ border: 1px solid @gray-7;
+ margin: 10px 0 0;
+ padding: 6px;
+ max-height: 32px;
+ }
+
.umb-dropdown {
width: 100%;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
index 0ecdd4f824..aa1dd8c9e7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
@@ -27,11 +27,18 @@
}
.umb-iconpicker-item a:hover,
-.umb-iconpicker-item a:focus{
+.umb-iconpicker-item a:focus {
background: @gray-10;
outline: none;
}
+.umb-iconpicker-item.-selected {
+ background: @gray-10;
+ border: solid 1px @turquoise-d1;
+ border-radius: @baseBorderRadius;
+ box-sizing: border-box;
+}
+
.umb-iconpicker-item a:active {
background: @gray-10;
}
@@ -39,3 +46,32 @@
.umb-iconpicker-item i {
font-size: 30px;
}
+
+
+// Color swatch
+ .button {
+ border: none;
+ color: white;
+ padding: 5px;
+ text-align: center;
+ text-decoration: none;
+ display: inline-block;
+ margin: 5px;
+ border-radius: 3px;
+ }
+
+ // Hide Circle when not active
+ i.small{
+ display: none;
+ }
+
+ // Circle behind the checkmark
+ i.small.active{
+ font-size: 14px;
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: rgba(0,0,0,.15);
+ float: right;
+ }
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 4f24fcf504..514a73407c 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,142 +56,170 @@
-o-user-select: none;
}
-.nested-content__heading
-{
- float: left;
+.umb-nested-content__heading {
line-height: 20px;
+ position: relative;
+
+ &.-with-icon {
+ padding-left: 20px;
+ }
+
+ i {
+ color: @gray-2;
+ position: absolute;
+ left: 0;
+ }
+
+ .umb-nested-content__item-name {
+ max-height: 20px;
+ text-align: left;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+ }
}
-.nested-content__heading i
-{
- vertical-align: text-top;
- color: #999; /* same icon color as the icons in the item type picker */
- margin-right: 10px;
-}
-
-.nested-content__icons
-{
- margin: -6px 0;
+.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;
+ padding: 5px;
+
+ &:before {
+ content: ' ';
+ position: absolute;
+ display: block;
+ width: 30px;
+ left: -30px;
+ top: 0;
+ bottom: 0;
+ 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%);
}
+
+
+// this resolves the layout issue introduced in nested content in 7.12 with the addition of the input for link anchors
+// the attribute selector ensures the change only applies to the linkpicker overlay
+.form-horizontal .umb-nested-content--narrow [ng-controller*="Umbraco.Overlays.LinkPickerController"] .controls-row {
+ margin-left:0!important;
+
+ .umb-textarea, .umb-textstring {
+ width:100%;
+ }
+}
\ No newline at end of file
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 9e038bd571..3d1015f972 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
@@ -1,11 +1,14 @@
.umb-node-preview {
padding: 5px 0;
display: flex;
- max-width: 66.6%;
box-sizing: border-box;
border-bottom: 1px solid @gray-9;
}
+.umb-editor-wrapper .umb-node-preview {
+ max-width: 66.6%;
+}
+
.umb-node-preview:last-of-type {
border-bottom: none;
}
@@ -89,7 +92,6 @@
color: @turquoise-d1;
font-weight: bold;
padding: 5px 15px;
- max-width: 66.6%;
box-sizing: border-box;
}
@@ -97,6 +99,10 @@
color: @turquoise-d1;
}
+.umb-editor-wrapper .umb-node-preview-add {
+ max-width: 66.6%;
+}
+
.umb-overlay,
.umb-modal {
.umb-node-preview {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index 1bd2c5563d..7679fd3c24 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -93,7 +93,7 @@ input.umb-table__input {
cursor: pointer;
font-size: 14px;
position: relative;
- min-height: 32px;
+ min-height: 52px;
&:hover {
background-color: @gray-10;
}
@@ -271,4 +271,4 @@ input.umb-table__input {
font-size: 20px;
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
index cba4219b0c..e6773a3eb0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
@@ -1,6 +1,6 @@
.umb-nav-tabs {
position: absolute;
- z-index: 10;
+ z-index: 999;
}
.umb-nav-tabs.-padding-left {
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 faed098fc8..9447a48217 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
@@ -16,6 +16,7 @@
.umb-permission__content {
display: flex;
flex-direction: column;
+ justify-content: center;
flex: 1 1 auto;
cursor: pointer;
}
@@ -23,4 +24,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/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 1a1f3bb93e..5926ea2163 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -544,6 +544,9 @@ input[type="checkbox"][readonly] {
padding-left: 5px;
}
+div.help {
+ margin-top: 5px;
+}
// INPUT GROUPS
diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less
index 29035213a2..18439b554c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/hacks.less
+++ b/src/Umbraco.Web.UI.Client/src/less/hacks.less
@@ -20,12 +20,17 @@
}
.thumbnail {
- border-radius: 0px;
-}
+ border-radius: 0;
+ min-width: 150px;
-.thumbnail img {
- max-width: 100% !important;
- width: 100%;
+ > a {
+ display: block;
+ }
+
+ img {
+ max-width: 100% !important;
+ width: 100%;
+ }
}
#mapCanvas img {
diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index d2393efb11..284de6e844 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -157,6 +157,10 @@
/* TEMP */
+.umb-minilistview {
+ .umb-table-row.not-allowed { opacity: 0.6; cursor: not-allowed; }
+}
+
.umb-listview .table-striped tbody td {
position: relative
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 210af19355..b16e437cc2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -182,6 +182,14 @@ h5.-black {
margin-left: 0;
}
+label[for=""] {
+ cursor: default;
+}
+
+label:not([for]) {
+ cursor: default;
+}
+
/* CONTROL VALIDATION */
.umb-control-required {
color: @controlRequiredColor;
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
index c6fd3dde01..0a8c6913e8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/navs.less
@@ -126,6 +126,14 @@
// Make the list-items overlay the bottom border
.nav-tabs > li {
margin-bottom: -1px;
+
+ &.dropdown {
+ margin-bottom: -3px;
+
+ >.dropdown-toggle {
+ padding-bottom: 2px;
+ }
+ }
}
// Actual tabs (as links)
.nav-tabs > li > a {
diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/login.less b/src/Umbraco.Web.UI.Client/src/less/pages/login.less
index 5443134dd2..87a34962ab 100644
--- a/src/Umbraco.Web.UI.Client/src/less/pages/login.less
+++ b/src/Umbraco.Web.UI.Client/src/less/pages/login.less
@@ -5,7 +5,7 @@
width: 100%;
height: 100%;
position: absolute;
- z-index: 10000;
+ z-index: 65537;
top: 0;
left: 0;
margin: 0 !important;
@@ -117,37 +117,31 @@
}
.password-toggle {
- position: relative;
- display: block;
+ position: relative;
+ text-align: right;
user-select: none;
- input::-ms-clear, input::-ms-reveal {
- display: none;
- }
-
a {
opacity: .5;
cursor: pointer;
display: inline-block;
- position: absolute;
- height: 1px;
- width: 45px;
- height: 75%;
- font-size: 0;
- background-repeat: no-repeat;
- background-size: 50%;
- background-position: center;
- top: 0;
- margin-left: -45px;
z-index: 1;
-webkit-tap-highlight-color: transparent;
- }
- [type="text"] + a {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M29.6.4C29 0 28 0 27.4.4L21 6.8c-1.4-.5-3-.8-5-.8C9 6 3 10 0 16c1.3 2.6 3 4.8 5.4 6.5l-5 5c-.5.5-.5 1.5 0 2 .3.4.7.5 1 .5s1 0 1.2-.4l27-27C30 2 30 1 29.6.4zM13 10c1.3 0 2.4 1 2.8 2L12 15.8c-1-.4-2-1.5-2-2.8 0-1.7 1.3-3 3-3zm-9.6 6c1.2-2 2.8-3.5 4.7-4.7l.7-.2c-.4 1-.6 2-.6 3 0 1.8.6 3.4 1.6 4.7l-2 2c-1.6-1.2-3-2.7-4-4.4zM24 13.8c0-.8 0-1.7-.4-2.4l-10 10c.7.3 1.6.4 2.4.4 4.4 0 8-3.6 8-8z'/%3E%3Cpath fill='%23444' d='M26 9l-2.2 2.2c2 1.3 3.6 3 4.8 4.8-1.2 2-2.8 3.5-4.7 4.7-2.7 1.5-5.4 2.3-8 2.3-1.4 0-2.6 0-3.8-.4L10 25c2 .6 4 1 6 1 7 0 13-4 16-10-1.4-2.8-3.5-5.2-6-7z'/%3E%3C/svg%3E");
- }
+ .password-text {
+ background-repeat: no-repeat;
+ background-size: 18px;
+ background-position: left center;
+ padding-left: 26px;
- [type="password"] + a {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M16 6C9 6 3 10 0 16c3 6 9 10 16 10s13-4 16-10c-3-6-9-10-16-10zm8 5.3c1.8 1.2 3.4 2.8 4.6 4.7-1.2 2-2.8 3.5-4.7 4.7-3 1.5-6 2.3-8 2.3s-6-.8-8-2.3C6 19.5 4 18 3 16c1.5-2 3-3.5 5-4.7l.6-.2C8 12 8 13 8 14c0 4.5 3.5 8 8 8s8-3.5 8-8c0-1-.3-2-.6-2.6l.4.3zM16 13c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3 3 1.3 3 3z'/%3E%3C/svg%3E");
+ &.show {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M16 6C9 6 3 10 0 16c3 6 9 10 16 10s13-4 16-10c-3-6-9-10-16-10zm8 5.3c1.8 1.2 3.4 2.8 4.6 4.7-1.2 2-2.8 3.5-4.7 4.7-3 1.5-6 2.3-8 2.3s-6-.8-8-2.3C6 19.5 4 18 3 16c1.5-2 3-3.5 5-4.7l.6-.2C8 12 8 13 8 14c0 4.5 3.5 8 8 8s8-3.5 8-8c0-1-.3-2-.6-2.6l.4.3zM16 13c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3 3 1.3 3 3z'/%3E%3C/svg%3E");
+ }
+
+ &.hide {
+ display: none;
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M29.6.4C29 0 28 0 27.4.4L21 6.8c-1.4-.5-3-.8-5-.8C9 6 3 10 0 16c1.3 2.6 3 4.8 5.4 6.5l-5 5c-.5.5-.5 1.5 0 2 .3.4.7.5 1 .5s1 0 1.2-.4l27-27C30 2 30 1 29.6.4zM13 10c1.3 0 2.4 1 2.8 2L12 15.8c-1-.4-2-1.5-2-2.8 0-1.7 1.3-3 3-3zm-9.6 6c1.2-2 2.8-3.5 4.7-4.7l.7-.2c-.4 1-.6 2-.6 3 0 1.8.6 3.4 1.6 4.7l-2 2c-1.6-1.2-3-2.7-4-4.4zM24 13.8c0-.8 0-1.7-.4-2.4l-10 10c.7.3 1.6.4 2.4.4 4.4 0 8-3.6 8-8z'/%3E%3Cpath fill='%23444' d='M26 9l-2.2 2.2c2 1.3 3.6 3 4.8 4.8-1.2 2-2.8 3.5-4.7 4.7-2.7 1.5-5.4 2.3-8 2.3-1.4 0-2.6 0-3.8-.4L10 25c2 .6 4 1 6 1 7 0 13-4 16-10-1.4-2.8-3.5-5.2-6-7z'/%3E%3C/svg%3E");
+ }
+ }
}
}
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 2d317fa4a0..1855a3a6b0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -1,885 +1,981 @@
-//
-// Container styles
-// --------------------------------------------------
-.umb-editor {
- min-width:66.6%;
-}
-
-.umb-editor-tiny {
- width: 60px;
-}
-
-.umb-editor-small {
- width: 90px;
-}
-
-.umb-modal .umb-editor {
- width: 95%;
-}
-
-.umb-dialog .umb-editor {
- width: 95%;
-}
-.umb-dialog .umb-control-group .help-block {
- width: 95%;
-}
-
-.umb-codeeditor{
- width: 99%;
-}
-
-//
-// Content picker
-// --------------------------------------------------
-.umb-contentpicker li a:hover .hover-hide, .umb-contentpicker li a .hover-show{
- display: none;
-}
-.umb-contentpicker li a:hover .hover-show{display: inline-block;}
-
-.umb-contentpicker-popover .search-holder {
- padding: 10px;
-}
-
-.umb-contentpicker__min-max-help {
- font-size: 13px;
- margin-top: 5px;
- color: @gray-4;
-}
-
-.show-validation .umb-contentpicker__min-max-help {
- display: none;
-}
-
-.umb-contentpicker small {
-
- &:not(:last-child) {
- padding-right: 3px;
- border-right: 1px solid @gray-5;
- }
-
- a {
- color: @gray-3;
- }
-}
-
-/* CODEMIRROR DATATYPE */
-div.umb-codeeditor {
- border: 1px solid @gray-8;
-}
-div.umb-codeeditor .umb-el-wrap {
- padding: 0px;
-}
-div.umb-codeeditor .umb-btn-toolbar {
- padding: 0px;
- margin: 0px;
- border-bottom: @gray-8 1px solid;
- background: @gray-10;
-}
-
-
-//
-// RTE
-// --------------------------------------------------
-.mce-tinymce{border: 1px solid @gray-8 !important; border-radius: 0px !important;}
-.mce-panel{background: @gray-10 !important; border-color: @gray-8 !important;}
-.mce-btn-group, .mce-btn{border: none !important; background: none !important;}
-.mce-ico{font-size: 12px !important; color: @gray-1 !important;}
-/* Special case to support helviticons for the tiny mce button controls */
-.mce-ico.mce-i-custom[class^="icon-"],
-.mce-ico.mce-i-custom[class*=" icon-"] {
- font-family: icomoon;
- font-size:16px !important;
-}
-
-/* pre-value editor */
-.rte-editor-preval .control-group .controls > div > label .mce-ico { line-height: 20px; }
-
-
-//
-// Color picker
-// --------------------------------------------------
-ul.color-picker li {
- padding: 2px;
- margin: 3px;
- border: 2px solid transparent;
- width: 60px;
-}
-ul.color-picker li.active {
- border: 2px dashed @gray-8;
-}
-ul.color-picker li a {
- height: 50px;
- display:block;
- cursor:pointer;
-}
-
-.control-group.color-picker-preval .thumbnail {
- width:30px;
- border:none;
-}
-
-/* pre-value editor */
-/*.control-group.color-picker-preval:before {
- content: "";
- display: inline-block;
- vertical-align: middle;
- height: 100%;
-}*/
-
-/*.control-group.color-picker-preval div.thumbnail {
- display: inline-block;
- vertical-align: middle;
-}*/
-.control-group.color-picker-preval div.color-picker-prediv {
- display: inline-block;
- width: 60%;
-}
-
-.control-group.color-picker-preval pre {
- display: inline;
- margin-right: 20px;
- margin-left: 10px;
- width: 50%;
- white-space: nowrap;
- overflow: hidden;
- margin-bottom: 0;
- vertical-align: middle;
-}
-
-.control-group.color-picker-preval btn {
- //vertical-align: middle;
-}
-
-.control-group.color-picker-preval input[type="text"] {
- min-width: 40%;
- width: 40%;
- display: inline-block;
- margin-right: 20px;
- margin-top: 1px;
-}
-
-.control-group.color-picker-preval label {
- border: solid @white 1px;
- padding: 6px;
-}
-
-
-//
-// Media picker
-// --------------------------------------------------
-.umb-mediapicker .add-link {
- display: flex;
- justify-content:center;
- align-items:center;
- width: 120px;
- text-align: center;
- color: @gray-8;
- border: 2px @gray-8 dashed;
- text-decoration: none;
-
- transition: all 150ms ease-in-out;
-
- &:hover {
- color: @turquoise-d1;
- border-color: @turquoise;
- }
-}
-
-.umb-mediapicker .picked-image {
- position: absolute;
- bottom: 10px;
- right: 10px;
- opacity: 0.5;
-
- font-size: 24px;
- color: @red;
- background: @white;
-
- line-height: 36px;
- text-align: center;
- -moz-border-radius: 15px;
- border-radius: 15px;
-
- height: 32px;
- width: 32px;
- overflow: hidden;
- display: none;
- text-decoration: none;
-}
-
-.umb-mediapicker .add-link-square {
- height: 120px;
-}
-
-
-
-.umb-thumbnails {
- position: relative;
- display: flex;
- -ms-flex-direction: row;
- -webkit-flex-direction: row;
- flex-direction: row;
- -ms-flex-wrap: wrap;
- -webkit-flex-wrap: wrap;
- flex-wrap: wrap;
- justify-content: flex-start;
-}
-
-.umb-thumbnails > li.icon {
- width: 14%;
- text-align: center;
-}
-
-.umb-thumbnails i{margin: auto;}
-.umb-thumbnails a{
- outline: none;
- border:none !important;
- box-shadow:none !important;
-}
-
-
-.umb-sortable-thumbnails {
- list-style-type: none;
- margin: 0;
- padding: 0;
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
-}
-
-
-.umb-sortable-thumbnails li {
- position: relative;
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- flex-wrap: wrap;
- padding: 2px;
- margin: 5px;
- background: @white;
- border: 1px solid @gray-10;
- max-width: 100%;
-}
-
-
-.umb-mediapicker .umb-sortable-thumbnails li {
- flex-direction: column;
- margin: 0 5px 5px 0;
- padding: 5px;
-}
-
-.umb-sortable-thumbnails li:hover a {
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.umb-sortable-thumbnails li img {
- max-width:100%;
- max-height:100%;
- margin:auto;
- display:block;
- background-image: url(../img/checkered-background.png);
-}
-
-.umb-sortable-thumbnails li img.trashed {
- opacity:0.3;
-}
-
-.umb-sortable-thumbnails li img.noScale {
- max-width: none !important;
- max-height: none !important;
-}
-
-.umb-sortable-thumbnails .umb-icon-holder {
- text-align: center;
-}
-
-.umb-sortable-thumbnails .umb-icon-holder .icon{
- font-size: 40px;
- line-height: 50px;
- color: @gray-3;
- display: block;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
- width: 124px;
- height: 124px;
- overflow: hidden;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__actions {
- position: absolute;
- bottom: 10px;
- right: 10px;
- text-decoration: none;
- display: flex;
- flex-direction: row;
- opacity: 0;
- visibility: hidden;
-}
-
-.umb-sortable-thumbnails.ui-sortable:not(.ui-sortable-disabled) {
- > li:not(.unsortable) {
- cursor: move;
- }
-}
-
-.umb-sortable-thumbnails li:hover .umb-sortable-thumbnails__actions {
- opacity: 1;
- visibility: visible;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__action {
- font-size: 16px;
- background: @white;
- height: 25px;
- width: 25px;
- border-radius: 15px;
- color: @gray-1;
- display: flex;
- justify-content: center;
- align-items: center;
- margin-left: 5px;
- text-decoration: none;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {
- color: @red;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__action:hover {
- text-decoration: none;
-}
-
-
-//
-// Cropper
-// -------------------------------------------------
-
-.umb-cropper{
- position: relative;
-}
-
-.umb-cropper img, .umb-cropper-gravity img{
- position: relative;
- max-width: 100%;
- height: auto;
- top: 0;
- left: 0;
- }
-
- .umb-cropper img {
- max-width: none;
- }
-
- .umb-cropper .overlay, .umb-cropper-gravity .overlay {
- top: 0;
- left: 0;
- cursor: move;
- z-index: @zindexCropperOverlay;
- position: absolute;
-}
-
-.umb-cropper .viewport{
- overflow: hidden;
- position: relative;
- margin: auto;
- max-width: 100%;
- height: auto;
- }
-
-.umb-cropper-gravity .viewport{
- overflow: hidden;
- position: relative;
- width: 100%;
- height: 100%;
-}
-
-
-.umb-cropper .viewport:after {
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: @zindexCropperOverlay - 1;
- -moz-opacity: .75;
- opacity: .75;
- filter: alpha(opacity=7);
- -webkit-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
- -moz-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
- box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
-}
-
-.umb-cropper-gravity .overlay{
- width: 14px;
- height: 14px;
- text-align: center;
- border-radius: 20px;
- background: @turquoise;
- border: 3px solid @white;
- opacity: 0.8;
-}
-
-.umb-cropper-gravity .overlay i {
- font-size: 26px;
- line-height: 26px;
- opacity: 0.8 !important;
-}
-
-.umb-cropper .crop-container {
- text-align: center;
-}
-
-.umb-cropper .crop-slider {
- padding: 10px;
- border-top: 1px solid @gray-10;
- margin-top: 10px;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-wrap: wrap;
- @media (min-width: 769px) {
- padding: 10px 50px 10px 50px;
- }
-}
-
-.umb-cropper .crop-slider i {
- color: @gray-3;
- flex: 0 0 25px;
- padding: 0 5px;
- box-sizing: border-box;
-}
-
-.umb-cropper .crop-slider i:first-of-type {
- text-align: right;
-}
-
-.umb-cropper .crop-slider input {
- flex: 0 1 auto;
-}
- .umb-cropper-gravity .viewport, .umb-cropper-gravity, .umb-cropper-imageholder {
- display: inline-block;
- max-width: 100%;
- }
-
- .umb-cropper-imageholder {
- float: left;
- }
-
- .cropList {
- display: inline-block;
- position: relative;
- vertical-align: top;
- }
-
- .gravity-container .viewport {
- max-width: 600px;
- }
-
- .gravity-container .viewport:hover {
- cursor: pointer;
- }
-
- .imagecropper {
- display: flex;
- align-items: flex-start;
- flex-direction: row;
-
- @media (max-width: 768px) {
- flex-direction: column;
- float: left;
- max-width: 100%;
- }
- }
-
- .imagecropper .umb-cropper__container {
- position: relative;
- margin-bottom: 10px;
- max-width: 100%;
- border: 1px solid @gray-10;
-
- @media (min-width: 769px) {
- width: 600px;
- }
- }
-
- .umb-close-cropper {
- position: absolute;
- top: 3px;
- right: 3px;
- cursor: pointer;
- z-index: 1;
- }
-
- .umb-close-cropper:hover {
- opacity: .9;
- background: @gray-10;
- }
-
- .imagecropper .umb-sortable-thumbnails {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- }
-
- .imagecropper .umb-sortable-thumbnails li {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- padding: 8px;
- margin-top: 0;
- }
-
- .imagecropper .umb-sortable-thumbnails li.current {
- border-color: @gray-8;
- background: @gray-10;
- color: @black;
- cursor: pointer;
- }
-
- .imagecropper .umb-sortable-thumbnails li:hover,
- .imagecropper .umb-sortable-thumbnails li.current:hover {
- border-color: @gray-8;
- background: @gray-10;
- color: @black;
- cursor: pointer;
- opacity: .95;
- }
-
- .imagecropper .umb-sortable-thumbnails li .crop-name,
- .imagecropper .umb-sortable-thumbnails li .crop-size {
- display: block;
- text-align: left;
- font-size: 13px;
- line-height: 1;
- }
-
- .imagecropper .umb-sortable-thumbnails li .crop-name {
- font-weight: bold;
- margin: 10px 0 5px;
- }
-
- .imagecropper .umb-sortable-thumbnails li .crop-size {
- font-size: 10px;
- font-style: italic;
- margin: 0 0 5px;
- }
-
- .btn-crop-delete {
- display: block;
- text-align: left;
- }
-
-//
-// folder-browser
-// --------------------------------------------------
-.umb-folderbrowser .add-link{
- display: inline-block;
- height: 120px;
- width: 120px;
- text-align: center;
- border: 1px @gray-10 dashed;
- 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;
- bottom: 0;
- height: 100%;
- width: 100%;
-}
-
-
-
-//
-// 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
-// --------------------------------------------------
-.umb-fileupload .preview {
- border-radius: 5px;
- border: 1px solid @gray-6;
- padding: 3px;
- background: @gray-9;
- float: left;
- margin-right: 30px;
- margin-bottom: 30px;
-}
-
-.umb-fileupload ul {
- list-style: none;
- vertical-align: middle;
- margin-bottom: 0px;
-}
-
-.umb-fileupload label {
- vertical-align: middle;
- padding-left: 7px;
- font-weight: normal;
-}
-
-.umb-fileupload .preview-file {
- color: @gray-4;
- height: 45px;
- width: 55px;
- text-align: center;
- text-transform: uppercase;
- font-size: 10px;
- padding-top: 27px;
-}
-
-.umb-fileupload .file-icon {
- text-align: center;
- display: block;
- position: relative;
- padding: 5px 0;
-
- > .icon {
- font-size: 70px;
- line-height: 110%;
- color: @gray-4;
- text-align: center;
- }
-
- > span {
- color: @white;
- background: @gray-4;
- padding: 1px 3px;
- font-size: 12px;
- line-height: 130%;
- position: absolute;
- top: 45px;
- left: 110px;
- }
-}
-
-.umb-fileupload input {
- font-size: 12px;
- line-height: 1;
-}
-
-//
-// Member group picker
-// --------------------------------------------------
-
-.umb-member-group-box {
- width: 45%;
-}
-.umb-member-group-box:nth-child(1){
- float:left;
-}
-.umb-member-group-box:nth-child(2){
- float:right;
-}
-
-//
-// Related links
-// --------------------------------------------------
-.umb-relatedlinks table > tr > td { word-wrap:break-word; word-break: break-all; border-bottom: 1px solid transparent; }
-.umb-relatedlinks .handle { cursor:move; }
-.umb-relatedlinks table > tbody > tr.unsortable .handle { cursor:default; }
-
-.umb-relatedlinks table td.col-sort { width: 20px; }
-.umb-relatedlinks table td.col-caption { min-width: 200px; }
-.umb-relatedlinks table td.col-link { min-width: 200px; }
-.umb-relatedlinks table td.col-actions { min-width: 120px; }
-
-.umb-relatedlinks table td.col-caption .control-wrapper,
-.umb-relatedlinks table td.col-link .control-wrapper { display: flex; }
-
-.umb-relatedlinks table td.col-caption .control-wrapper input[type="text"],
-.umb-relatedlinks table td.col-link .control-wrapper input[type="text"] { width: auto; flex: 1; }
-
-/* sortable placeholder */
-.umb-relatedlinks .sortable-placeholder {
- background-color: @tableBackgroundAccent;
- display: table-row;
-}
-.umb-relatedlinks .sortable-placeholder > td {
- display: table-cell;
- padding: 8px;
-}
-.umb-relatedlinks .ui-sortable-helper {
- display: table-row;
- background-color: @white;
- opacity: 0.7;
-}
-.umb-relatedlinks .ui-sortable-helper > td {
- display: table-cell;
- border-bottom: 1px solid @tableBorder;
-}
-
-
-//
-// Tags
-// --------------------------------------------------
-.umb-tags{border: @gray-10 solid 1px; padding: 10px; font-size: 13px; text-shadow: none;}
-.umb-tags .tag{cursor: pointer; margin: 7px; padding: 7px; background: @turquoise}
-.umb-tags .tag i{padding: 2px;}
-.umb-tags input{border: none; background: @white}
-
-//
-// Date/time picker
-// --------------------------------------------------
-.bootstrap-datetimepicker-widget .btn{padding: 0;}
-.bootstrap-datetimepicker-widget .picker-switch .btn{ background: none; border: none;}
-.umb-datepicker .input-append .add-on{cursor: pointer;}
-.umb-datepicker p {margin-top:10px;}
-.umb-datepicker p a{color: @gray-3;}
-
-//
-// Code mirror - even though this isn't a proprety editor right now, it could be so I'm putting the styles here
-// --------------------------------------------------
-
-.CodeMirror, .CodeMirror-scroll {
- height: 100%;
- min-height:200px;
-}
-
-//
-// Nested boolean (e.g. list view bulk action permissions)
-// ---------------------=====-----------------------------
-.umb-nested-boolean label {margin-bottom: 8px; float: left; width: 320px;}
-.umb-nested-boolean label span {float: left; width: 80%;}
-.umb-nested-boolean label input[type='checkbox'] {margin-right: 10px; float: left;}
+//
+// Container styles
+// --------------------------------------------------
+.umb-editor {
+ min-width:66.6%;
+
+ &-pull {
+ float:left;
+ width:66.6%;
+ }
+
+ &-push {
+ float:right;
+ }
+}
+
+.umb-editor-tiny {
+ width: 60px;
+
+ &.umb-editor-push {
+ width:30%;
+ min-width:0;
+ }
+}
+
+.umb-editor-small {
+ width: 90px;
+}
+
+.umb-modal .umb-editor {
+ width: 95%;
+}
+
+.umb-dialog .umb-editor {
+ width: 95%;
+}
+.umb-dialog .umb-control-group .help-block {
+ width: 95%;
+}
+
+.umb-codeeditor{
+ width: 99%;
+}
+
+// displays property inline with preceeding
+.umb-property {
+ &--pull {
+ float:left;
+ width:60%;
+ }
+
+ &--push {
+ float:right;
+ width:35%;
+ }
+
+ &--pull, &--push {
+ .umb-editor {
+ min-width:0;
+ width:100%;
+ }
+ }
+}
+
+
+//
+// Content picker
+// --------------------------------------------------
+.umb-contentpicker li a:hover .hover-hide, .umb-contentpicker li a .hover-show{
+ display: none;
+}
+.umb-contentpicker li a:hover .hover-show{display: inline-block;}
+
+.umb-contentpicker-popover .search-holder {
+ padding: 10px;
+}
+
+.umb-contentpicker__min-max-help {
+ font-size: 13px;
+ margin-top: 5px;
+ color: @gray-4;
+}
+
+.show-validation .umb-contentpicker__min-max-help {
+ display: none;
+}
+
+.umb-contentpicker small {
+
+ &:not(:last-child) {
+ padding-right: 3px;
+ border-right: 1px solid @gray-5;
+ }
+
+ a {
+ color: @gray-3;
+ }
+}
+
+/* CODEMIRROR DATATYPE */
+div.umb-codeeditor {
+ border: 1px solid @gray-8;
+}
+div.umb-codeeditor .umb-el-wrap {
+ padding: 0px;
+}
+div.umb-codeeditor .umb-btn-toolbar {
+ padding: 0px;
+ margin: 0px;
+ border-bottom: @gray-8 1px solid;
+ background: @gray-10;
+}
+
+
+//
+// RTE
+// --------------------------------------------------
+.mce-tinymce{border: 1px solid @gray-8 !important; border-radius: 0px !important;}
+.mce-panel{background: @gray-10 !important; border-color: @gray-8 !important;}
+.mce-btn-group, .mce-btn{border: none !important; background: none !important;}
+.mce-ico{font-size: 12px !important; color: @gray-1 !important;}
+/* Special case to support helviticons for the tiny mce button controls */
+.mce-ico.mce-i-custom[class^="icon-"],
+.mce-ico.mce-i-custom[class*=" icon-"] {
+ font-family: icomoon;
+ font-size:16px !important;
+}
+
+/* pre-value editor */
+.rte-editor-preval .control-group .controls > div > label .mce-ico { line-height: 20px; }
+
+
+//
+// Color picker
+// --------------------------------------------------
+ul.color-picker li {
+ padding: 2px;
+ margin: 3px;
+ border: 2px solid transparent;
+ width: 60px;
+
+ &.active {
+ .check_circle {
+ opacity: 1;
+ }
+ }
+
+ .thumbnail{
+ min-width: auto;
+ width: inherit;
+ padding: 0;
+ }
+
+ a {
+ height: 50px;
+ display:flex;
+ align-items: center;
+ justify-content: center;
+ cursor:pointer;
+ margin: 0 0 5px;
+ }
+}
+
+/* pre-value editor */
+.control-group.color-picker-preval {
+ .thumbnail {
+ width: 36px;
+ min-width: auto;
+ border: none;
+ cursor: move;
+ border-radius: 3px;
+ }
+
+ .handle {
+ float: left;
+ display: inline-flex;
+ margin: 5px 3px 5px 0;
+ }
+
+ div.color-picker-prediv {
+ display: inline-flex;
+ align-items: center;
+ max-width: 80%;
+
+ pre {
+ display: inline-flex;
+ font-family: monospace;
+ margin-right: 10px;
+ margin-left: 10px;
+ white-space: nowrap;
+ overflow: hidden;
+ margin-bottom: 0;
+ vertical-align: middle;
+ 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"] {
+ 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;
+ }
+
+ label {
+ border: 1px solid #fff;
+ padding: 7px 10px;
+ font-family: monospace;
+ border: 1px solid #dfdfe1;
+ background: #f7f7f7;
+ margin: 0 15px 0 0;
+ border-radius: 3px;
+ }
+}
+
+
+//
+// Media picker
+// --------------------------------------------------
+.umb-mediapicker .add-link {
+ display: flex;
+ justify-content:center;
+ align-items:center;
+ width: 120px;
+ text-align: center;
+ color: @gray-8;
+ border: 2px @gray-8 dashed;
+ text-decoration: none;
+
+ transition: all 150ms ease-in-out;
+
+ &:hover {
+ color: @turquoise-d1;
+ border-color: @turquoise;
+ }
+}
+
+.umb-mediapicker .picked-image {
+ position: absolute;
+ bottom: 10px;
+ right: 10px;
+ opacity: 0.5;
+
+ font-size: 24px;
+ color: @red;
+ background: @white;
+
+ line-height: 36px;
+ text-align: center;
+ -moz-border-radius: 15px;
+ border-radius: 15px;
+
+ height: 32px;
+ width: 32px;
+ overflow: hidden;
+ display: none;
+ text-decoration: none;
+}
+
+.umb-mediapicker .add-link-square {
+ height: 120px;
+}
+
+
+
+.umb-thumbnails {
+ position: relative;
+ display: flex;
+ -ms-flex-direction: row;
+ -webkit-flex-direction: row;
+ flex-direction: row;
+ -ms-flex-wrap: wrap;
+ -webkit-flex-wrap: wrap;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+}
+
+.umb-thumbnails > li.icon {
+ width: 14%;
+ text-align: center;
+}
+
+.umb-thumbnails i{margin: auto;}
+.umb-thumbnails a{
+ outline: none;
+ border:none !important;
+ box-shadow:none !important;
+}
+
+
+.umb-sortable-thumbnails {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+}
+
+
+.umb-sortable-thumbnails li {
+ position: relative;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ flex-wrap: wrap;
+ padding: 2px;
+ margin: 5px;
+ background: @white;
+ border: 1px solid @gray-10;
+ max-width: 100%;
+}
+
+
+.umb-mediapicker .umb-sortable-thumbnails li {
+ flex-direction: column;
+ margin: 0 5px 5px 0;
+ padding: 5px;
+}
+
+.umb-sortable-thumbnails li:hover a {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.umb-sortable-thumbnails li img {
+ max-width:100%;
+ max-height:100%;
+ margin:auto;
+ display:block;
+ background-image: url(../img/checkered-background.png);
+}
+
+.umb-sortable-thumbnails li img.trashed {
+ opacity:0.3;
+}
+
+.umb-sortable-thumbnails li img.noScale {
+ max-width: none !important;
+ max-height: none !important;
+}
+
+.umb-sortable-thumbnails .umb-icon-holder {
+ text-align: center;
+}
+
+.umb-sortable-thumbnails .umb-icon-holder .icon{
+ font-size: 40px;
+ line-height: 50px;
+ color: @gray-3;
+ display: block;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
+ width: 124px;
+ height: 124px;
+ overflow: hidden;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__actions {
+ position: absolute;
+ bottom: 10px;
+ right: 10px;
+ text-decoration: none;
+ display: flex;
+ flex-direction: row;
+ opacity: 0;
+ visibility: hidden;
+}
+
+.umb-sortable-thumbnails.ui-sortable:not(.ui-sortable-disabled) {
+ > li:not(.unsortable) {
+ cursor: move;
+ }
+}
+
+.umb-sortable-thumbnails li:hover .umb-sortable-thumbnails__actions {
+ opacity: 1;
+ visibility: visible;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__action {
+ font-size: 16px;
+ background: @white;
+ height: 25px;
+ width: 25px;
+ border-radius: 15px;
+ color: @gray-1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-left: 5px;
+ text-decoration: none;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {
+ color: @red;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__action:hover {
+ text-decoration: none;
+}
+
+
+//
+// Cropper
+// -------------------------------------------------
+
+.umb-cropper{
+ position: relative;
+}
+
+.umb-cropper img, .umb-cropper-gravity img{
+ position: relative;
+ max-width: 100%;
+ height: auto;
+ top: 0;
+ left: 0;
+ }
+
+ .umb-cropper img {
+ max-width: none;
+ }
+
+ .umb-cropper .overlay, .umb-cropper-gravity .overlay {
+ top: 0;
+ left: 0;
+ cursor: move;
+ z-index: @zindexCropperOverlay;
+ position: absolute;
+}
+
+.umb-cropper .viewport{
+ overflow: hidden;
+ position: relative;
+ margin: auto;
+ max-width: 100%;
+ height: auto;
+ }
+
+.umb-cropper-gravity .viewport{
+ overflow: hidden;
+ position: relative;
+ width: 100%;
+ height: 100%;
+}
+
+
+.umb-cropper .viewport:after {
+ content: "";
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: @zindexCropperOverlay - 1;
+ -moz-opacity: .75;
+ opacity: .75;
+ filter: alpha(opacity=7);
+ -webkit-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+ -moz-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+ box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+}
+
+.umb-cropper-gravity .overlay{
+ width: 14px;
+ height: 14px;
+ text-align: center;
+ border-radius: 20px;
+ background: @turquoise;
+ border: 3px solid @white;
+ opacity: 0.8;
+}
+
+.umb-cropper-gravity .overlay i {
+ font-size: 26px;
+ line-height: 26px;
+ opacity: 0.8 !important;
+}
+
+.umb-cropper .crop-container {
+ text-align: center;
+}
+
+.umb-cropper .crop-slider {
+ padding: 10px;
+ border-top: 1px solid @gray-10;
+ margin-top: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-wrap: wrap;
+ @media (min-width: 769px) {
+ padding: 10px 50px 10px 50px;
+ }
+}
+
+.umb-cropper .crop-slider i {
+ color: @gray-3;
+ flex: 0 0 25px;
+ padding: 0 5px;
+ box-sizing: border-box;
+}
+
+.umb-cropper .crop-slider i:first-of-type {
+ text-align: right;
+}
+
+.umb-cropper .crop-slider input {
+ flex: 0 1 auto;
+}
+ .umb-cropper-gravity .viewport, .umb-cropper-gravity, .umb-cropper-imageholder {
+ display: inline-block;
+ max-width: 100%;
+ }
+
+ .umb-cropper-imageholder {
+ float: left;
+ }
+
+ .cropList {
+ display: inline-block;
+ position: relative;
+ vertical-align: top;
+ }
+
+ .gravity-container .viewport {
+ max-width: 600px;
+ }
+
+ .gravity-container .viewport:hover {
+ cursor: pointer;
+ }
+
+ .imagecropper {
+ display: flex;
+ align-items: flex-start;
+ flex-direction: row;
+
+ @media (max-width: 768px) {
+ flex-direction: column;
+ float: left;
+ max-width: 100%;
+ }
+ }
+
+ .imagecropper .umb-cropper__container {
+ position: relative;
+ margin-bottom: 10px;
+ max-width: 100%;
+ border: 1px solid @gray-10;
+
+ @media (min-width: 769px) {
+ width: 600px;
+ }
+ }
+
+ .umb-close-cropper {
+ position: absolute;
+ top: 3px;
+ right: 3px;
+ cursor: pointer;
+ z-index: 1;
+ }
+
+ .umb-close-cropper:hover {
+ opacity: .9;
+ background: @gray-10;
+ }
+
+ .imagecropper .umb-sortable-thumbnails {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ }
+
+ .imagecropper .umb-sortable-thumbnails li {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding: 8px;
+ margin-top: 0;
+ }
+
+ .imagecropper .umb-sortable-thumbnails li.current {
+ border-color: @gray-8;
+ background: @gray-10;
+ color: @black;
+ cursor: pointer;
+ }
+
+ .imagecropper .umb-sortable-thumbnails li:hover,
+ .imagecropper .umb-sortable-thumbnails li.current:hover {
+ border-color: @gray-8;
+ background: @gray-10;
+ color: @black;
+ cursor: pointer;
+ opacity: .95;
+ }
+
+ .imagecropper .umb-sortable-thumbnails li .crop-name,
+ .imagecropper .umb-sortable-thumbnails li .crop-size {
+ display: block;
+ text-align: left;
+ font-size: 13px;
+ line-height: 1;
+ }
+
+ .imagecropper .umb-sortable-thumbnails li .crop-name {
+ font-weight: bold;
+ margin: 10px 0 5px;
+ }
+
+ .imagecropper .umb-sortable-thumbnails li .crop-size {
+ font-size: 10px;
+ font-style: italic;
+ margin: 0 0 5px;
+ }
+
+ .btn-crop-delete {
+ display: block;
+ text-align: left;
+ }
+
+//
+// folder-browser
+// --------------------------------------------------
+.umb-folderbrowser .add-link{
+ display: inline-block;
+ height: 120px;
+ width: 120px;
+ text-align: center;
+ border: 1px @gray-10 dashed;
+ 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;
+ bottom: 0;
+ height: 100%;
+ width: 100%;
+}
+
+
+
+//
+// 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
+// --------------------------------------------------
+.umb-fileupload .preview {
+ border-radius: 5px;
+ border: 1px solid @gray-6;
+ padding: 3px;
+ background: @gray-9;
+ float: left;
+ margin-right: 30px;
+ margin-bottom: 30px;
+}
+
+.umb-fileupload ul {
+ list-style: none;
+ vertical-align: middle;
+ margin-bottom: 0px;
+}
+
+.umb-fileupload label {
+ vertical-align: middle;
+ padding-left: 7px;
+ font-weight: normal;
+}
+
+.umb-fileupload .preview-file {
+ color: @gray-4;
+ height: 45px;
+ width: 55px;
+ text-align: center;
+ text-transform: uppercase;
+ font-size: 10px;
+ padding-top: 27px;
+}
+
+.umb-fileupload .file-icon {
+ text-align: center;
+ display: block;
+ position: relative;
+ padding: 5px 0;
+
+ > .icon {
+ font-size: 70px;
+ line-height: 110%;
+ color: @gray-4;
+ text-align: center;
+ }
+
+ > span {
+ color: @white;
+ background: @gray-4;
+ padding: 1px 3px;
+ font-size: 12px;
+ line-height: 130%;
+ position: absolute;
+ top: 45px;
+ left: 110px;
+ }
+}
+
+.umb-fileupload input {
+ font-size: 12px;
+ line-height: 1;
+}
+
+//
+// Member group picker
+// --------------------------------------------------
+
+.umb-member-group-box {
+ width: 45%;
+}
+.umb-member-group-box:nth-child(1){
+ float:left;
+}
+.umb-member-group-box:nth-child(2){
+ float:right;
+}
+
+//
+// Related links
+// --------------------------------------------------
+.umb-relatedlinks table > tr > td { word-wrap:break-word; word-break: break-all; border-bottom: 1px solid transparent; }
+.umb-relatedlinks .handle { cursor:move; }
+.umb-relatedlinks table > tbody > tr.unsortable .handle { cursor:default; }
+
+.umb-relatedlinks table td.col-sort { width: 20px; }
+.umb-relatedlinks table td.col-caption { min-width: 200px; }
+.umb-relatedlinks table td.col-link { min-width: 200px; }
+.umb-relatedlinks table td.col-actions { min-width: 120px; }
+
+.umb-relatedlinks table td.col-caption .control-wrapper,
+.umb-relatedlinks table td.col-link .control-wrapper { display: flex; }
+
+.umb-relatedlinks table td.col-caption .control-wrapper input[type="text"],
+.umb-relatedlinks table td.col-link .control-wrapper input[type="text"] { width: auto; flex: 1; }
+
+/* sortable placeholder */
+.umb-relatedlinks .sortable-placeholder {
+ background-color: @tableBackgroundAccent;
+ display: table-row;
+}
+.umb-relatedlinks .sortable-placeholder > td {
+ display: table-cell;
+ padding: 8px;
+}
+.umb-relatedlinks .ui-sortable-helper {
+ display: table-row;
+ background-color: @white;
+ opacity: 0.7;
+}
+.umb-relatedlinks .ui-sortable-helper > td {
+ display: table-cell;
+ border-bottom: 1px solid @tableBorder;
+}
+
+
+//
+// Tags
+// --------------------------------------------------
+.umb-tags{
+ border: @gray-10 solid 1px;
+ padding: 10px;
+ font-size: 13px;
+ text-shadow: none;
+
+ .tag{
+ cursor: default;
+ margin: 7px;
+ padding: 10px;
+ background: @turquoise;
+ position: relative;
+
+ .icon-trash{
+ cursor: pointer;
+ padding: 2px;
+ font-size: 12px;
+ position: relative;
+ right: -6px;
+ }
+
+ .umb_confirm-action__overlay.-left{
+ top: 6px;
+ left: auto;
+ right: 15px;
+ }
+ }
+
+ input{
+ border: none;
+ background: @white;
+ }
+}
+
+//
+// Date/time picker
+// --------------------------------------------------
+.bootstrap-datetimepicker-widget .btn{padding: 0;}
+.bootstrap-datetimepicker-widget .picker-switch .btn{ background: none; border: none;}
+.umb-datepicker .input-append .add-on{cursor: pointer;}
+.umb-datepicker p {margin-top:10px;}
+.umb-datepicker p a{color: @gray-3;}
+
+//
+// Code mirror - even though this isn't a proprety editor right now, it could be so I'm putting the styles here
+// --------------------------------------------------
+
+.CodeMirror, .CodeMirror-scroll {
+ height: 100%;
+ min-height:200px;
+}
+
+//
+// Nested boolean (e.g. list view bulk action permissions)
+// ---------------------=====-----------------------------
+.umb-nested-boolean label {margin-bottom: 8px; float: left; width: 320px;}
+.umb-nested-boolean label span {float: left; width: 80%;}
+.umb-nested-boolean label input[type='checkbox'] {margin-right: 10px; float: left;}
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index c9ab44ea21..acba5f1ac8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -174,7 +174,7 @@
}
.umb-tree-icon {
- cursor: pointer;
+ cursor: pointer;
}
.umb-tree i.noSpr {
@@ -202,7 +202,7 @@
.umb-tree div.umb-search-group {
position: inherit;
- display: inherit;
+ display: inherit;
}
.umb-tree div.umb-search-group:hover {
@@ -549,4 +549,4 @@ body.touch .umb-tree li div.l div {
body.touch .umb-actions a {
padding: 7px 25px 7px 20px;
font-size: 110%;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index d72a9085ec..3ea09e02fd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -1,442 +1,509 @@
-//
-// Variables
-// --------------------------------------------------
-
-
-// Global values
-// --------------------------------------------------
-
-
-// Grays
-// -------------------------
-@black: #000;
-@blackLight: #1d1d1d;
-@grayDarker: #222;
-@grayDark: #343434;
-@gray: #555;
-@grayMed: #7f7f7f;
-@grayLight: #d9d9d9;
-@grayLighter: #f8f8f8;
-@white: #fff;
-
-
-// Accent colors
-// -------------------------
-@blue: #2e8aea;
-@blueDark: #0064cd;
-@blueLight: #add8e6;
-@green: #46a546;
-@red: #9d261d;
-@yellow: #ffc40d;
-@orange: #DF7F48;
-@pink: #c3325f;
-
-
-// Colors
-// -------------------------
-
-@turquoise-d1: #00AEA2;
-@turquoise: #03BFB3;
-@turquoise-l1: #42CFC5;
-@turquoise-l2: #81DED8;
-@turquoise-l3: #C0F0ED;
-@turquoise-washed: #F3FDFC;
-
-@purple-d2: #1D1333;
-@purple-d1: #2E2246;
-@purple: #413659;
-@purple-l1: #675E7A;
-@purple-l2: #8D869B;
-@purple-l3: #B3AFBD;
-@purple-washed: #F6F3FD;
-
-// UI Colors
-@red-d1: #F02E28;
-@red: #FE3E39;
-@red-l1: #FE6561;
-@red-l2: #FE8B88;
-@red-l3: #FFB2B0;
-@red-washed: #FFECEB;
-
-@yellow-d2: #F0AC00;
-@yellow-d1: #FFC011;
-@yellow: #FFCE38;
-@yellow-l1: #FFD861;
-@yellow-l2: #FFE28A;
-@yellow-l3: #FFECB0;
-@yellow-washed: #FFFAEB;
-
-@green-d1: #1FB572;
-@green: #35C786;
-@green-l1: #4ECF95;
-@green-l2: #79E1B2;
-@green-l3: #A6F0CF;
-@green-washed: #EBFFF6;
-
-// Grayscale
-@gray-1: #1E1C1C;
-@gray-2: #303033;
-@gray-3: #515054;
-@gray-4: #68676B;
-@gray-5: #817F85;
-@gray-6: #A2A1A6;
-@gray-7: #BBBABF;
-@gray-8: #D8D7D9;
-@gray-9: #E9E9EB;
-@gray-10: #F3F3F5;
-
-
-.red{color: @red;}
-.blue{color: @blue;}
-.black{color: @black;}
-.turquoise{color: @turquoise;}
-.turquoise-d1{color: @turquoise-d1;}
-
-
-//icon colors for tree icons
-.color-red, .color-red i{color: @red-d1 !important;}
-.color-blue, .color-blue i{color: @turquoise-d1 !important;}
-.color-orange, .color-orange i{color: #d9631e !important;}
-.color-green, .color-green i{color: @green-d1 !important;}
-.color-yellow, .color-yellow i{color: @yellow-d1 !important;}
-
-/* Colors based on http://zavoloklom.github.io/material-design-color-palette/colors.html */
-.color-black, .color-black i { color: #000 !important; }
-.color-blue-grey, .color-blue-grey i { color: #607d8b !important; }
-.color-grey, .color-grey i { color: #9e9e9e !important; }
-.color-brown, .color-brown i { color: #795548 !important; }
-.color-blue, .color-blue i { color: #2196f3 !important; }
-.color-light-blue, .color-light-blue i {color: #03a9f4 !important; }
-.color-cyan, .color-cyan i { color: #00bcd4 !important; }
-.color-green, .color-green i { color: #4caf50 !important; }
-.color-light-green, .color-light-green i {color: #8bc34a !important; }
-.color-lime, .color-lime i { color: #cddc39 !important; }
-.color-yellow, .color-yellow i { color: #ffeb3b !important; }
-.color-amber, .color-amber i { color: #ffc107 !important; }
-.color-orange, .color-orange i { color: #ff9800 !important; }
-.color-deep-orange, .color-deep-orange i { color: #ff5722 !important; }
-.color-red, .color-red i { color: #f44336 !important; }
-.color-pink, .color-pink i { color: #e91e63 !important; }
-.color-purple,.color-purple i { color: #9c27b0 !important; }
-.color-deep-purple, .color-deep-purple i { color: #673ab7 !important; }
-.color-indigo, .color-indigo i { color: #3f51b5 !important; }
-
-
-// Scaffolding
-// -------------------------
-@bodyBackground: @white;
-@textColor: @gray-2;
-
-
-// Links
-// -------------------------
-@linkColor: @black;
-@linkColorHover: darken(@linkColor, 15%);
-
-// Typography
-// -------------------------
-@sansFontFamily: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
-@serifFontFamily: Georgia, "Times New Roman", Times, serif;
-@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
-
-@baseFontSize: 15px;
-@baseFontFamily: @sansFontFamily;
-@baseLineHeight: 20px;
-@altFontFamily: @serifFontFamily;
-
-@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
-@headingsFontWeight: 500; // instead of browser default, bold
-@headingsColor: inherit; // empty to use BS default, @textColor
-
-
-// Component sizing
-// -------------------------
-// Based on 14px font-size and 20px line-height
-
-@fontSizeLarge: @baseFontSize * 1.25; // ~18px
-@fontSizeMedium: @baseFontSize * 1.15; // ~14px
-@fontSizeSmall: @baseFontSize * 0.85; // ~12px
-@fontSizeMini: @baseFontSize * 0.75; // ~11px
-
-@paddingLarge: 11px 19px; // 44px
-@paddingSmall: 2px 10px; // 26px
-@paddingMini: 0 6px; // 22px
-
-
-// Disabled this to keep consistency throughout the backoffice UI. Untill a better solution is thought up, this will do.
-@baseBorderRadius: 3px; // 2px;
-@borderRadiusLarge: 3px; // 6px;
-@borderRadiusSmall: 3px; // 3px;
-
-
-// Tables
-// -------------------------
-@tableBackground: transparent; // overall background-color
-@tableBackgroundAccent: @gray-10; // for striping
-@tableBackgroundHover: @gray-10; // for hover
-@tableBorder: @gray-8; // table and cell border
-
-// Buttons
-// -------------------------
-@btnBackground: @gray-9;
-@btnBackgroundHighlight: @gray-9;
-@btnBorder: @gray-9;
-
-@btnPrimaryBackground: @green;
-@btnPrimaryBackgroundHighlight: @green;
-
-@btnInfoBackground: @purple-l1;
-@btnInfoBackgroundHighlight: @purple-l1;
-
-@btnSuccessBackground: @green;
-@btnSuccessBackgroundHighlight: @green;
-
-@btnWarningBackground: @red-l1;
-@btnWarningBackgroundHighlight: @red-l1;
-
-@btnDangerBackground: @red-l1;
-@btnDangerBackgroundHighlight: @red-l1;
-
-@btnInverseBackground: @gray-2;
-@btnInverseBackgroundHighlight: @gray-2;
-
-@btnNeutralBackground: @gray-9;
-@btnNeutralBackgroundHighlight: @gray-9;
-
-
-// Forms
-// -------------------------
-@inputBackground: @white;
-@inputBorder: @gray-7;
-@inputBorderRadius: 0;
-@inputDisabledBackground: @gray-10;
-@formActionsBackground: @gray-9;
-@inputHeight: @baseLineHeight + 12px; // base line-height + 8px vertical padding + 2px top/bottom border
-@controlRequiredColor: @red;
-
-
-// Tabs
-// -------------------------
-
-@tabsBorderRadius: @baseBorderRadius;
-
-// Dropdowns
-// -------------------------
-@dropdownBackground: @white;
-@dropdownBorder: @gray-8;
-@dropdownDividerTop: @gray-8;
-@dropdownDividerBottom: @white;
-
-@dropdownLinkColor: @gray-2;
-@dropdownLinkColorHover: @white;
-@dropdownLinkColorActive: @white;
-
-@dropdownLinkBackgroundActive: @linkColor;
-@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
-
-
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-// Drawer
-@drawerWidth: 400px;
-
-
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-@zindexDropdown: 1000;
-@zindexPopover: 1010;
-@zindexTooltip: 1030;
-@zindexFixedNavbar: 1030;
-@zindexModalBackdrop: 1040;
-@zindexModal: 1050;
-
-@zindexUmbOverlay: 7500;
-@zindexOverlayBackdrop: 2000;
-
-// Sticky bar has a z-index of "500", which is set from javascript in directive
-// so set z-index of cropper should be lower to be behind sticky bar.
-@zindexCropperOverlay: 499;
-
-// Sprite icons path
-// -------------------------
-@iconSpritePath: "../img/glyphicons-halflings.png";
-@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
-
-
-// Input placeholder text color
-// -------------------------
-@placeholderText: @gray-8;
-
-
-// Hr border color
-// -------------------------
-@hrBorder: @gray-10;
-
-
-// Horizontal forms & lists
-// -------------------------
-@horizontalComponentOffset: 180px;
-
-
-// Wells
-// -------------------------
-@wellBackground: @gray-10;
-
-
-// Navbar
-// -------------------------
-@navbarCollapseWidth: 979px;
-@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
-
-@navbarHeight: 40px;
-@navbarBackgroundHighlight: @white;
-@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
-@navbarBorder: darken(@navbarBackground, 12%);
-
-@navbarText: @gray-4;
-@navbarLinkColor: @gray-4;
-@navbarLinkColorHover: @gray-2;
-@navbarLinkColorActive: @gray-3;
-@navbarLinkBackgroundHover: transparent;
-@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
-
-@navbarBrandColor: @navbarLinkColor;
-
-// Inverted navbar
-@navbarInverseBackground: @gray-1;
-@navbarInverseBackgroundHighlight: @gray-2;
-@navbarInverseBorder: @gray-2;
-
-@navbarInverseText: @gray-8;
-@navbarInverseLinkColor: @gray-8;
-@navbarInverseLinkColorHover: @white;
-@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
-@navbarInverseLinkBackgroundHover: transparent;
-@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
-
-@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
-@navbarInverseSearchBackgroundFocus: @white;
-@navbarInverseSearchBorder: @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor: @gray-7;
-
-@navbarInverseBrandColor: @navbarInverseLinkColor;
-
-
-// Pagination
-// -------------------------
-@paginationBackground: @white;
-@paginationBorder: @gray-8;
-@paginationActiveBackground: @gray-10;
-
-
-// Hero unit
-// -------------------------
-@heroUnitBackground: @gray-10;
-@heroUnitHeadingColor: inherit;
-@heroUnitLeadColor: inherit;
-
-
-// alerts
-// -------------------------
-@warningText: @white;
-@warningBackground: @yellow-d2;
-@warningBorder: transparent;
-
-@errorText: @white;
-@errorBackground: @red-d1;
-@errorBorder: transparent;
-
-@successText: @white;
-@successBackground: @green-d1;
-@successBorder: transparent;
-
-@infoText: @white;
-@infoBackground: @turquoise-d1;
-@infoBorder: transparent;
-
-@alertBorderRadius: 0;
-
-// SD: Had to duplicate the above but prefix with 'form' inversed colors
-// because we cannot share the above alert colors with forms otherwise we end up with white
-// text and giant red backgrounds.
-
-// Form states
-// -------------------------
-@formWarningText: @warningBackground;
-@formWarningBackground: lighten(@warningBackground, 38%);
-@formWarningBorder: darken(spin(@warningBackground, -10), 3%);
-
-@formErrorText: @errorBackground;
-@formErrorBackground: lighten(@errorBackground, 55%);
-@formErrorBorder: darken(spin(@errorBackground, -10), 3%);
-
-@formSuccessText: @successBackground;
-@formSuccessBackground: lighten(@successBackground, 48%);
-@formSuccessBorder: darken(spin(@successBackground, -10), 5%);
-
-@formInfoText: @infoBackground;
-@formInfoBackground: lighten(@infoBackground, 41%);
-@formInfoBorder: darken(spin(@infoBackground, -10), 7%);
-
-
-// Tooltips and popovers
-// -------------------------
-@tooltipColor: @white;
-@tooltipBackground: @black;
-@tooltipArrowWidth: 5px;
-@tooltipArrowColor: @tooltipBackground;
-
-@popoverBackground: @white;
-@popoverArrowWidth: 10px;
-@popoverArrowColor: @white;
-@popoverTitleBackground: darken(@popoverBackground, 3%);
-
-// Special enhancement for popovers
-@popoverArrowOuterWidth: @popoverArrowWidth + 1;
-@popoverArrowOuterColor: @gray-7;
-
-
-
-// GRID
-// --------------------------------------------------
-
-
-// Default 940px grid
-// -------------------------
-@gridColumns: 12;
-@gridColumnWidth: 60px;
-@gridGutterWidth: 0px;
-@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-
-// 1200px min
-@gridColumnWidth1200: 70px;
-@gridGutterWidth1200: 30px;
-@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
-
-// 768px-979px
-@gridColumnWidth768: 42px;
-@gridGutterWidth768: 20px;
-@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
-
-
-// Fluid grid
-// -------------------------
-@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
-@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
-
-// 1200px min
-@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
-@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
-
-// 768px-979px
-@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
-@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
-
-// SORTABLE
-// --------------------------------------------------
-@sortableHelperBg: @turquoise-l2;
-@sortablePlaceholderBg : @turquoise;
+//
+// Variables
+// --------------------------------------------------
+
+
+// Global values
+// --------------------------------------------------
+
+
+// Grays
+// -------------------------
+@black: #000;
+@blackLight: #1D1D1D;
+@grayDarker: #222;
+@grayDark: #343434;
+@gray: #555;
+@grayMed: #7F7F7F;
+@blueGrey: #607D8B;
+@grayLight: #D9D9D9;
+@grayLighter: #F8F8F8;
+@white: #FFF;
+@grayIcon: #9E9E9E;
+
+// Accent colors
+// -------------------------
+
+
+
+@blue: #2E8AEA;
+@blueDark: #0064CD;
+@blueLight: #ADD8E6;
+@green: #46A546;
+@red: #9D261D;
+@yellow: #FFC40D;
+@orange: #DF7F48;
+@pink: #C3325F;
+
+
+// Colors
+// -------------------------
+
+@turquoise-d1: #00AEA2;
+@turquoise: #03BFB3;
+@turquoise-l1: #42CFC5;
+@turquoise-l2: #81DED8;
+@turquoise-l3: #C0F0ED;
+@turquoise-washed: #F3FDFC;
+
+@purple-d2: #1D1333;
+@purple-d1: #2E2246;
+@purple: #413659;
+@purple-l1: #675E7A;
+@purple-l2: #8D869B;
+@purple-l3: #B3AFBD;
+@purple-washed: #F6F3FD;
+
+// UI Colors
+@red-d1: #F02E28;
+@red: #FE3E39;
+@red-l1: #FE6561;
+@red-l2: #FE8B88;
+@red-l3: #FFB2B0;
+@red-washed: #FFECEB;
+
+@yellow-d2: #F0AC00;
+@yellow-d1: #FFC011;
+@yellow: #FFCE38;
+@yellow-l1: #FFD861;
+@yellow-l2: #FFE28A;
+@yellow-l3: #FFECB0;
+@yellow-washed: #FFFAEB;
+
+@green-d1: #1FB572;
+@green: #35C786;
+@green-l1: #4ECF95;
+@green-l2: #79E1B2;
+@green-l3: #A6F0CF;
+@green-washed: #EBFFF6;
+
+// Grayscale
+@gray-1: #1E1C1C;
+@gray-2: #303033;
+@gray-3: #515054;
+@gray-4: #68676B;
+@gray-5: #817F85;
+@gray-6: #A2A1A6;
+@gray-7: #BBBABF;
+@gray-8: #D8D7D9;
+@gray-9: #E9E9EB;
+@gray-10: #F3F3F5;
+
+
+// Additional Icon Colours
+@brownIcon: #795548;
+@blueIcon: #2196F3;
+@lightBlueIcon: #03A9F4;
+@cyanIcon: #00BCD4;
+@greenIcon: #4CAF50;
+@lightGreenIcon: #8BC34A;
+@limeIcon: #CDDC39;
+@yellowIcon: #FFEB3B;
+@amberIcon: #FFC107;
+@orangeIcon: #FF9800;
+@deepOrangeIcon: #FF5722;
+@redIcon: #F44336;
+@pinkIcon: #E91E63;
+@purpleIcon: #9C27B0;
+@deepPurpleIcon: #673AB7;
+@indigoIcon: #3F51B5;
+
+
+
+
+
+.red{color: @red;}
+.blue{color: @blue;}
+.black{color: @black;}
+.turquoise{color: @turquoise;}
+.turquoise-d1{color: @turquoise-d1;}
+
+
+//icon colors for tree icons
+.color-red, .color-red i{color: @red-d1 !important;}
+.color-blue, .color-blue i{color: @turquoise-d1 !important;}
+.color-orange, .color-orange i{color: @orange !important;}
+.color-green, .color-green i{color: @green-d1 !important;}
+.color-yellow, .color-yellow i{color: @yellowIcon !important;}
+
+/* Colors based on https://zavoloklom.github.io/material-design-color-palette/colors.html */
+.btn-color-black {background-color: @black;}
+.color-black i { color: @black;}
+
+
+.btn-color-blue-grey {background-color: @blueGrey;}
+.color-blue-grey, .color-blue-grey i { color: @blueGrey !important;}
+
+
+.btn-color-grey{background-color: @grayIcon;}
+.color-grey, .color-grey i { color: @grayIcon !important; }
+
+
+.btn-color-brown{background-color: @brownIcon;}
+.color-brown, .color-brown i { color: @brownIcon !important; }
+
+.btn-color-blue{background-color: @blueIcon;}
+.color-blue, .color-blue i { color: @blueIcon !important; }
+
+.btn-color-light-blue{background-color: @lightBlueIcon;}
+.color-light-blue, .color-light-blue i {color: @lightBlueIcon !important;}
+
+.btn-color-cyan{background-color: @cyanIcon;}
+.color-cyan, .color-cyan i { color: @cyanIcon !important; }
+
+.btn-color-green{background-color: @greenIcon;}
+.color-green, .color-green i { color: @greenIcon !important; }
+
+.btn-color-light-green{background-color: @lightGreenIcon;}
+.color-light-green, .color-light-green i {color: @lightGreenIcon !important; }
+
+.btn-color-lime{background-color: @limeIcon;}
+.color-lime, .color-lime i { color: @limeIcon !important; }
+
+.btn-color-yellow{background-color: @yellowIcon;}
+.color-yellow, .color-yellow i { color: @yellowIcon !important; }
+
+.btn-color-amber{background-color: @amberIcon;}
+.color-amber, .color-amber i { color: @amberIcon !important; }
+
+.btn-color-orange{background-color: @orangeIcon;}
+.color-orange, .color-orange i { color: @orangeIcon !important; }
+
+.btn-color-deep-orange{background-color: @deepOrangeIcon;}
+.color-deep-orange, .color-deep-orange i { color: @deepOrangeIcon !important; }
+
+.btn-color-red{background-color: @redIcon;}
+.color-red, .color-red i { color: @redIcon !important; }
+
+.btn-color-pink{background-color: @pinkIcon;}
+.color-pink, .color-pink i { color: @pinkIcon !important; }
+
+.btn-color-purple{background-color: @purpleIcon;}
+.color-purple, .color-purple i { color: @purpleIcon !important; }
+
+.btn-color-deep-purple{background-color: @deepPurpleIcon;}
+.color-deep-purple, .color-deep-purple i { color: @deepPurpleIcon !important; }
+
+.btn-color-indigo{background-color: @indigoIcon;}
+.color-indigo, .color-indigo i { color: @indigoIcon !important; }
+
+
+
+// Scaffolding
+// -------------------------
+@bodyBackground: @white;
+@textColor: @gray-2;
+
+
+// Links
+// -------------------------
+@linkColor: @black;
+@linkColorHover: darken(@linkColor, 15%);
+
+// Typography
+// -------------------------
+@sansFontFamily: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily: Georgia, "Times New Roman", Times, serif;
+@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
+
+@baseFontSize: 15px;
+@baseFontFamily: @sansFontFamily;
+@baseLineHeight: 20px;
+@altFontFamily: @serifFontFamily;
+
+@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight: 500; // instead of browser default, bold
+@headingsColor: inherit; // empty to use BS default, @textColor
+
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge: @baseFontSize * 1.25; // ~18px
+@fontSizeMedium: @baseFontSize * 1.15; // ~14px
+@fontSizeSmall: @baseFontSize * 0.85; // ~12px
+@fontSizeMini: @baseFontSize * 0.75; // ~11px
+
+@paddingLarge: 11px 19px; // 44px
+@paddingSmall: 2px 10px; // 26px
+@paddingMini: 0 6px; // 22px
+
+
+// Disabled this to keep consistency throughout the backoffice UI. Untill a better solution is thought up, this will do.
+@baseBorderRadius: 3px; // 2px;
+@borderRadiusLarge: 3px; // 6px;
+@borderRadiusSmall: 3px; // 3px;
+
+
+// Tables
+// -------------------------
+@tableBackground: transparent; // overall background-color
+@tableBackgroundAccent: @gray-10; // for striping
+@tableBackgroundHover: @gray-10; // for hover
+@tableBorder: @gray-8; // table and cell border
+
+// Buttons
+// -------------------------
+@btnBackground: @gray-9;
+@btnBackgroundHighlight: @gray-9;
+@btnBorder: @gray-9;
+
+@btnPrimaryBackground: @green;
+@btnPrimaryBackgroundHighlight: @green;
+
+@btnInfoBackground: @purple-l1;
+@btnInfoBackgroundHighlight: @purple-l1;
+
+@btnSuccessBackground: @green;
+@btnSuccessBackgroundHighlight: @green;
+
+@btnWarningBackground: @red-l1;
+@btnWarningBackgroundHighlight: @red-l1;
+
+@btnDangerBackground: @red-l1;
+@btnDangerBackgroundHighlight: @red-l1;
+
+@btnInverseBackground: @gray-2;
+@btnInverseBackgroundHighlight: @gray-2;
+
+@btnNeutralBackground: @gray-9;
+@btnNeutralBackgroundHighlight: @gray-9;
+
+
+// Forms
+// -------------------------
+@inputBackground: @white;
+@inputBorder: @gray-7;
+@inputBorderRadius: 0;
+@inputDisabledBackground: @gray-10;
+@formActionsBackground: @gray-9;
+@inputHeight: @baseLineHeight + 12px; // base line-height + 8px vertical padding + 2px top/bottom border
+@controlRequiredColor: @red;
+
+
+// Tabs
+// -------------------------
+
+@tabsBorderRadius: @baseBorderRadius;
+
+// Dropdowns
+// -------------------------
+@dropdownBackground: @white;
+@dropdownBorder: @gray-8;
+@dropdownDividerTop: @gray-8;
+@dropdownDividerBottom: @white;
+
+@dropdownLinkColor: @gray-2;
+@dropdownLinkColorHover: @white;
+@dropdownLinkColorActive: @white;
+
+@dropdownLinkBackgroundActive: @linkColor;
+@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+// Drawer
+@drawerWidth: 400px;
+
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown: 1000;
+@zindexPopover: 1010;
+@zindexTooltip: 1030;
+@zindexFixedNavbar: 1030;
+@zindexModalBackdrop: 1040;
+@zindexModal: 1050;
+
+@zindexUmbOverlay: 7500;
+@zindexOverlayBackdrop: 2000;
+
+// Sticky bar has a z-index of "500", which is set from javascript in directive
+// so set z-index of cropper should be lower to be behind sticky bar.
+@zindexCropperOverlay: 499;
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath: "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
+
+
+// Input placeholder text color
+// -------------------------
+@placeholderText: @gray-8;
+
+
+// Hr border color
+// -------------------------
+@hrBorder: @gray-10;
+
+
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset: 180px;
+
+
+// Wells
+// -------------------------
+@wellBackground: @gray-10;
+
+
+// Navbar
+// -------------------------
+@navbarCollapseWidth: 979px;
+@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
+
+@navbarHeight: 40px;
+@navbarBackgroundHighlight: @white;
+@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
+@navbarBorder: darken(@navbarBackground, 12%);
+
+@navbarText: @gray-4;
+@navbarLinkColor: @gray-4;
+@navbarLinkColorHover: @gray-2;
+@navbarLinkColorActive: @gray-3;
+@navbarLinkBackgroundHover: transparent;
+@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
+
+@navbarBrandColor: @navbarLinkColor;
+
+// Inverted navbar
+@navbarInverseBackground: @gray-1;
+@navbarInverseBackgroundHighlight: @gray-2;
+@navbarInverseBorder: @gray-2;
+
+@navbarInverseText: @gray-8;
+@navbarInverseLinkColor: @gray-8;
+@navbarInverseLinkColorHover: @white;
+@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
+@navbarInverseLinkBackgroundHover: transparent;
+@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
+
+@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
+@navbarInverseSearchBackgroundFocus: @white;
+@navbarInverseSearchBorder: @navbarInverseBackground;
+@navbarInverseSearchPlaceholderColor: @gray-7;
+
+@navbarInverseBrandColor: @navbarInverseLinkColor;
+
+
+// Pagination
+// -------------------------
+@paginationBackground: @white;
+@paginationBorder: @gray-8;
+@paginationActiveBackground: @gray-10;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground: @gray-10;
+@heroUnitHeadingColor: inherit;
+@heroUnitLeadColor: inherit;
+
+
+// alerts
+// -------------------------
+@warningText: @white;
+@warningBackground: @yellow-d2;
+@warningBorder: transparent;
+
+@errorText: @white;
+@errorBackground: @red-d1;
+@errorBorder: transparent;
+
+@successText: @white;
+@successBackground: @green-d1;
+@successBorder: transparent;
+
+@infoText: @white;
+@infoBackground: @turquoise-d1;
+@infoBorder: transparent;
+
+@alertBorderRadius: 0;
+
+// SD: Had to duplicate the above but prefix with 'form' inversed colors
+// because we cannot share the above alert colors with forms otherwise we end up with white
+// text and giant red backgrounds.
+
+// Form states
+// -------------------------
+@formWarningText: @warningBackground;
+@formWarningBackground: lighten(@warningBackground, 38%);
+@formWarningBorder: darken(spin(@warningBackground, -10), 3%);
+
+@formErrorText: @errorBackground;
+@formErrorBackground: lighten(@errorBackground, 55%);
+@formErrorBorder: darken(spin(@errorBackground, -10), 3%);
+
+@formSuccessText: @successBackground;
+@formSuccessBackground: lighten(@successBackground, 48%);
+@formSuccessBorder: darken(spin(@successBackground, -10), 5%);
+
+@formInfoText: @infoBackground;
+@formInfoBackground: lighten(@infoBackground, 41%);
+@formInfoBorder: darken(spin(@infoBackground, -10), 7%);
+
+
+// Tooltips and popovers
+// -------------------------
+@tooltipColor: @white;
+@tooltipBackground: @black;
+@tooltipArrowWidth: 5px;
+@tooltipArrowColor: @tooltipBackground;
+
+@popoverBackground: @white;
+@popoverArrowWidth: 10px;
+@popoverArrowColor: @white;
+@popoverTitleBackground: darken(@popoverBackground, 3%);
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth: @popoverArrowWidth + 1;
+@popoverArrowOuterColor: @gray-7;
+
+
+
+// GRID
+// --------------------------------------------------
+
+
+// Default 940px grid
+// -------------------------
+@gridColumns: 12;
+@gridColumnWidth: 60px;
+@gridGutterWidth: 0px;
+@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// 1200px min
+@gridColumnWidth1200: 70px;
+@gridGutterWidth1200: 30px;
+@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
+
+// 768px-979px
+@gridColumnWidth768: 42px;
+@gridGutterWidth768: 20px;
+@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
+
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
+@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
+
+// 1200px min
+@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
+
+// 768px-979px
+@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
+@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
+
+// SORTABLE
+// --------------------------------------------------
+@sortableHelperBg: @turquoise-l2;
+@sortablePlaceholderBg : @turquoise;
diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
index 3fc4d3f78e..2f1a7583b4 100644
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ b/src/Umbraco.Web.UI.Client/src/routes.js
@@ -31,11 +31,11 @@ app.config(function ($routeProvider) {
userService.getCurrentUser({ broadcastEvent: broadcast }).then(function (user) {
//is auth, check if we allow or reject
if (isRequired) {
-
+
//This checks the current section and will force a redirect to 'content' as the default
if ($route.current.params.section.toLowerCase() === "default" || $route.current.params.section.toLowerCase() === "umbraco" || $route.current.params.section === "") {
$route.current.params.section = "content";
- }
+ }
// U4-5430, Benjamin Howarth
// We need to change the current route params if the user only has access to a single section
@@ -141,13 +141,32 @@ app.config(function ($routeProvider) {
resolve: canRoute(true)
})
.when('/:section/:tree/:method', {
- templateUrl: function (rp) {
+ //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.
+ controller: function ($scope, $route, $routeParams, treeService) {
- //if there is no method registered for this then show the dashboard
- if (!rp.method)
- return "views/common/dashboard.html";
-
- return ('views/' + rp.tree + '/' + rp.method + '.html');
+ if (!$routeParams.method) {
+ $scope.templateUrl = "views/common/dashboard.html";
+ }
+
+ // Here we need to figure out if this route is for a package tree and if so then we need
+ // to change it's convention view path to:
+ // /App_Plugins/{mypackage}/backoffice/{treetype}/{method}.html
+
+ // otherwise if it is a core tree we use the core paths:
+ // views/{treetype}/{method}.html
+
+ var packageTreeFolder = treeService.getTreePackageFolder($routeParams.tree);
+
+ if (packageTreeFolder) {
+ $scope.templateUrl = (Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
+ "/" + packageTreeFolder +
+ "/backoffice/" + $routeParams.tree + "/" + $routeParams.method + ".html");
+ }
+ else {
+ $scope.templateUrl = ('views/' + $routeParams.tree + '/' + $routeParams.method + '.html');
+ }
},
resolve: canRoute(true)
})
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
index b9428fb242..be985652b9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
@@ -22,8 +22,8 @@
-
-
+
+
- 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' : ''}}
+
+ -
-
-
go to our.umbraco.org + +go to our.umbraco.com The friendliest community
@@ -46,7 +46,7 @@
-
-
+
go to umbraco.tvThe best Umbraco video tutorials @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js index dbb86e87ec..1fd870b42d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js @@ -10,16 +10,22 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper) { /** changes the view to edit the params of the selected macro */ - function editParams() { + /** if there is pnly one macro, and it has parameters - editor can skip selecting the Macro **/ + function editParams(insertIfNoParameters) { + //whether to insert the macro in the rich text editor when editParams is called and there are no parameters see U4-10537 + insertIfNoParameters = (typeof insertIfNoParameters !== 'undefined') ? insertIfNoParameters : true; //get the macro params if there are any macroResource.getMacroParameters($scope.selectedMacro.id) .then(function (data) { //go to next page if there are params otherwise we can just exit if (!angular.isArray(data) || data.length === 0) { - //we can just exist! - submitForm(); - + //we can just exist! + if (insertIfNoParameters) { + submitForm(); + } else { + $scope.wizardStep = 'macroSelect'; + } } else { $scope.wizardStep = "paramSelect"; $scope.macroParams = data; @@ -117,7 +123,7 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi formHelper.resetForm({ scope: $scope }); if ($scope.wizardStep === "macroSelect") { - editParams(); + editParams(true); } else { submitForm(); @@ -155,12 +161,19 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi if (found) { //select the macro and go to next screen $scope.selectedMacro = found; - editParams(); + editParams(true); return; } } - //we don't have a pre-selected macro so ensure the correct step is set - $scope.wizardStep = "macroSelect"; + //if there is only one macro in the site and it has parameters, let's not make the editor choose it from a selection of one macro (unless there are no parameters - then weirdly it's a better experience to make that selection) + if ($scope.macros.length == 1) { + $scope.selectedMacro = $scope.macros[0]; + editParams(false); + } + else { + //we don't have a pre-selected macro so ensure the correct step is set + $scope.wizardStep = 'macroSelect'; + } }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js index 81b86fc969..9cfd4845b6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js @@ -16,7 +16,7 @@ function LegacyDeleteController($scope, legacyResource, treeService, navigationS legacyResource.deleteItem({ nodeId: $scope.currentNode.id, nodeType: $scope.currentNode.nodeType, - alias: $scope.currentNode.name, + alias: $scope.currentNode.name }).then(function () { $scope.currentNode.loading = false; //TODO: Need to sync tree, etc... diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js index e76db90f47..5d6a3bf12c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js @@ -1,149 +1,170 @@ //used for the media picker dialog angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController", - function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService) { - var dialogOptions = $scope.dialogOptions; + function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) { + var dialogOptions = $scope.dialogOptions; - var searchText = "Search..."; - localizationService.localize("general_search").then(function (value) { - searchText = value + "..."; - }); + var searchText = "Search..."; + localizationService.localize("general_search").then(function (value) { + searchText = value + "..."; + }); - $scope.dialogTreeEventHandler = $({}); - $scope.target = {}; - $scope.searchInfo = { - searchFromId: null, - searchFromName: null, - showSearch: false, - results: [], - selectedSearchResults: [] - } + $scope.dialogTreeEventHandler = $({}); + $scope.target = {}; + $scope.searchInfo = { + searchFromId: null, + searchFromName: null, + showSearch: false, + results: [], + selectedSearchResults: [] + } - if (dialogOptions.currentTarget) { - $scope.target = dialogOptions.currentTarget; + if (dialogOptions.currentTarget) { + $scope.target = dialogOptions.currentTarget; - //if we have a node ID, we fetch the current node to build the form data - if ($scope.target.id || $scope.target.udi) { + //if we have a node ID, we fetch the current node to build the form data + if ($scope.target.id || $scope.target.udi) { - var id = $scope.target.udi ? $scope.target.udi : $scope.target.id; + var id = $scope.target.udi ? $scope.target.udi : $scope.target.id; - if (!$scope.target.path) { - entityResource.getPath(id, "Document").then(function (path) { - $scope.target.path = path; - //now sync the tree to this path - $scope.dialogTreeEventHandler.syncTree({ path: $scope.target.path, tree: "content" }); - }); - } + if (!$scope.target.path) { + entityResource.getPath(id, "Document").then(function (path) { + $scope.target.path = path; + //now sync the tree to this path + $scope.dialogTreeEventHandler.syncTree({ + path: $scope.target.path, + tree: "content" + }); + }); + } - contentResource.getNiceUrl(id).then(function (url) { - $scope.target.url = url; - }); - } - } + // if a link exists, get the properties to build the anchor name list + contentResource.getById(id).then(function (resp) { + $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties)); + $scope.target.url = resp.urls[0]; + }); + } else if ($scope.target.url.length) { + // a url but no id/udi indicates an external link - trim the url to remove the anchor/qs + // only do the substring if there's a # or a ? + var indexOfAnchor = $scope.target.url.search(/(#|\?)/); + if (indexOfAnchor > -1) { + // populate the anchor + $scope.target.anchor = $scope.target.url.substring(indexOfAnchor); + // then rewrite the model and populate the link + $scope.target.url = $scope.target.url.substring(0, indexOfAnchor); + } + } + } - function nodeSelectHandler(ev, args) { - args.event.preventDefault(); - args.event.stopPropagation(); + if (dialogOptions.anchors) { + $scope.anchorValues = dialogOptions.anchors; + } - if (args.node.metaData.listViewNode) { - //check if list view 'search' node was selected + function nodeSelectHandler(ev, args) { + args.event.preventDefault(); + args.event.stopPropagation(); - $scope.searchInfo.showSearch = true; - $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id; - $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name; - } - else { - eventsService.emit("dialogs.linkPicker.select", args); + if (args.node.metaData.listViewNode) { + //check if list view 'search' node was selected - if ($scope.currentNode) { - //un-select if there's a current one selected - $scope.currentNode.selected = false; - } + $scope.searchInfo.showSearch = true; + $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id; + $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name; + } else { + eventsService.emit("dialogs.linkPicker.select", args); - $scope.currentNode = args.node; - $scope.currentNode.selected = true; - $scope.target.id = args.node.id; - $scope.target.udi = args.node.udi; - $scope.target.name = args.node.name; + if ($scope.currentNode) { + //un-select if there's a current one selected + $scope.currentNode.selected = false; + } - if (args.node.id < 0) { - $scope.target.url = "/"; - } - else { - contentResource.getNiceUrl(args.node.id).then(function (url) { - $scope.target.url = url; - }); - } + $scope.currentNode = args.node; + $scope.currentNode.selected = true; + $scope.target.id = args.node.id; + $scope.target.udi = args.node.udi; + $scope.target.name = args.node.name; - if (!angular.isUndefined($scope.target.isMedia)) { - delete $scope.target.isMedia; - } - } - } + if (args.node.id < 0) { + $scope.target.url = "/"; + } else { + contentResource.getById(args.node.id).then(function (resp) { + $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties)); + $scope.target.url = resp.urls[0]; + }); + } - function nodeExpandedHandler(ev, args) { - if (angular.isArray(args.children)) { + if (!angular.isUndefined($scope.target.isMedia)) { + delete $scope.target.isMedia; + } + } + } - //iterate children - _.each(args.children, function (child) { - //check if any of the items are list views, if so we need to add a custom - // child: A node to activate the search - if (child.metaData.isContainer) { - child.hasChildren = true; - child.children = [ - { - level: child.level + 1, - hasChildren: false, - name: searchText, - metaData: { - listViewNode: child, - }, - cssClass: "icon umb-tree-icon sprTree icon-search", - cssClasses: ["not-published"] + function nodeExpandedHandler(ev, args) { + if (angular.isArray(args.children)) { + + //iterate children + _.each(args.children, function (child) { + //check if any of the items are list views, if so we need to add a custom + // child: A node to activate the search + if (child.metaData.isContainer) { + child.hasChildren = true; + child.children = [ + { + level: child.level + 1, + hasChildren: false, + name: searchText, + metaData: { + listViewNode: child + }, + cssClass: "icon umb-tree-icon sprTree icon-search", + cssClasses: ["not-published"] } ]; - } - }); - } - } + } + }); + } + } - $scope.switchToMediaPicker = function () { - userService.getCurrentUser().then(function (userData) { - dialogService.mediaPicker({ - startNodeId: userData.startMediaIds.length == 0 ? -1 : userData.startMediaIds[0], - callback: function(media) { - $scope.target.id = media.id; - $scope.target.isMedia = true; - $scope.target.name = media.name; - $scope.target.url = mediaHelper.resolveFile(media); - } - }); - }); - }; + $scope.switchToMediaPicker = function () { + userService.getCurrentUser().then(function (userData) { + dialogService.mediaPicker({ + startNodeId: userData.startMediaIds.length == 0 ? -1 : userData.startMediaIds[0], + callback: function (media) { + $scope.target.id = media.id; + $scope.target.isMedia = true; + $scope.target.name = media.name; + $scope.target.url = mediaHelper.resolveFile(media); + } + }); + }); + }; - $scope.hideSearch = function () { - $scope.searchInfo.showSearch = false; - $scope.searchInfo.searchFromId = null; - $scope.searchInfo.searchFromName = null; - $scope.searchInfo.results = []; - } + $scope.hideSearch = function () { + $scope.searchInfo.showSearch = false; + $scope.searchInfo.searchFromId = null; + $scope.searchInfo.searchFromName = null; + $scope.searchInfo.results = []; + } - // method to select a search result - $scope.selectResult = function (evt, result) { - result.selected = result.selected === true ? false : true; - nodeSelectHandler(evt, {event: evt, node: result}); - }; + // method to select a search result + $scope.selectResult = function (evt, result) { + result.selected = result.selected === true ? false : true; + nodeSelectHandler(evt, { + event: evt, + node: result + }); + }; - //callback when there are search results - $scope.onSearchResults = function (results) { - $scope.searchInfo.results = results; - $scope.searchInfo.showSearch = true; - }; + //callback when there are search results + $scope.onSearchResults = function (results) { + $scope.searchInfo.results = results; + $scope.searchInfo.showSearch = true; + }; - $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler); - $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler); + $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler); + $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler); - $scope.$on('$destroy', function () { - $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); - $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler); - }); - }); \ No newline at end of file + $scope.$on('$destroy', function () { + $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); + $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler); + }); + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html index 442357edcc..3b02853127 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html @@ -1,15 +1,27 @@- - - ++ + + ++ + + + New password {{invitedUserPasswordModel.passwordPolicyText}} - + Your new password cannot be blank! Minimum {{invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters @@ -30,7 +30,7 @@- +@@ -149,8 +149,12 @@Required The confirmed password doesn't match the new password! +diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js index 6dae664a3d..9397a63448 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js @@ -31,7 +31,7 @@ angular.module("umbraco").controller('Umbraco.Dialogs.Template.QueryBuilderContr sort:{ property:{ alias: "", - name: "", + name: "" }, direction: "ascending" } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js index 740791abf9..b0521dc930 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js @@ -93,7 +93,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", }, name: searchText, metaData: { - listViewNode: child, + listViewNode: child }, cssClass: "icon-search", cssClasses: ["not-published"] diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js index 4d2b43c078..1f2daff083 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js @@ -43,15 +43,17 @@ setSectionName(); userService.getCurrentUser().then(function (user) { - + vm.userType = user.userType; vm.userLang = user.locale; + vm.hasAccessToSettings = _.contains(user.allowedSections, 'settings'); + evts.push(eventsService.on("appState.treeState.changed", function (e, args) { handleSectionChange(); })); - findHelp(vm.section, vm.tree, vm.usertype, vm.userLang); + findHelp(vm.section, vm.tree, vm.userType, vm.userLang); }); @@ -76,17 +78,20 @@ vm.tree = $routeParams.tree; setSectionName(); - findHelp(vm.section, vm.tree, vm.usertype, vm.userLang); + findHelp(vm.section, vm.tree, vm.userType, vm.userLang); } }); } function findHelp(section, tree, usertype, userLang) { + + if (vm.hasAccessToSettings) { + helpService.getContextHelpForPage(section, tree).then(function (topics) { + vm.topics = topics; + }); + } - helpService.getContextHelpForPage(section, tree).then(function (topics) { - vm.topics = topics; - }); var rq = {}; rq.section = vm.section; @@ -108,10 +113,12 @@ rq.path = rq.section + "/" + $routeParams.tree + "/" + $routeParams.method; } - helpService.findVideos(rq).then(function(videos){ - vm.videos = videos; - }); - + + if (vm.hasAccessToSettings) { + helpService.findVideos(rq).then(function (videos) { + vm.videos = videos; + }); + } } function setSectionName() { 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 4829c8964a..2d1f23a4f9 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 @@ -8,16 +8,17 @@- +-Tours
+Tours
-+- -+ +
+ {{tourGroup.group}} Other
@@ -49,7 +50,7 @@ -+@@ -61,11 +62,11 @@--diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index 0dfdfbc3fe..e7e9ea338b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -44,12 +44,12 @@ function startUpDynamicContentController($timeout, $scope, dashboardResource, as { title: "Documentation", description: "Find the answers to your Umbraco questions", - url: "https://our.umbraco.org/documentation/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=documentation/" + url: "https://our.umbraco.com/documentation/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=documentation/" }, { title: "Community", description: "Find the answers or ask your Umbraco questions", - url: "https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=our_forum" + url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=our_forum" }, { title: "Umbraco.tv", @@ -75,7 +75,7 @@ function startUpDynamicContentController($timeout, $scope, dashboardResource, as title: "Our Umbraco - The Friendliest Community", description: "Our Umbraco - the official community site is your one stop for everything Umbraco. Whether you need a question answered or looking for cool plugins, the world's best and friendliest community is just a click away.", img: "views/dashboard/default/ourumbraco.jpg", - url: "https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our", + url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our", altText: "Our Umbraco", buttonText: "Visit Our Umbraco" } 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 478688f585..6bf63051f8 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 @@Articles
++-Articles
-diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html index 5afd3012eb..356864546a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html @@ -1,9 +1,11 @@Videos
++-Videos
- +-+@@ -33,11 +35,10 @@Visit umbraco.tv@@ -102,9 +103,9 @@ - + -Visit our.umbraco.org+Visit our.umbraco.comThe friendliest community @@ -127,4 +128,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.controller.js new file mode 100644 index 0000000000..885df4b3a9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.controller.js @@ -0,0 +1,9 @@ +angular.module("umbraco").controller("Umbraco.Notifications.ConfirmUnpublishController", + function ($scope, notificationsService, eventsService) { + + $scope.confirm = function(not, action){ + eventsService.emit('content.confirmUnpublish', action); + notificationsService.remove(not); + }; + + }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.html b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.html new file mode 100644 index 0000000000..4bd3e2b964 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.html @@ -0,0 +1,6 @@ ++\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html index 027f6cfc2d..d1833a5af0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html @@ -7,9 +7,6 @@
+Are you sure?
+ + +Unpublishing will remove this page and all its descendants from the site diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html index 0fa236fd7f..090c5a35f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html @@ -6,6 +6,7 @@ @@ -15,7 +16,8 @@-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 new file mode 100644 index 0000000000..eae299e579 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html @@ -0,0 +1,9 @@ +diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html index ecfdd24828..8390ee4e37 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html @@ -15,8 +15,8 @@+ + + +diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html index c34c3f9283..f4e4dff3af 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html @@ -6,11 +6,11 @@ '-left': direction === 'left'}" on-outside-click="clickCancel()"> - + - +Akk {{itemLabel}}sare added + \ No newline at end of file +-diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index 9959d7b345..90a72d117e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -1,4 +1,4 @@ -+diff --git a/src/Umbraco.Web.UI.Client/src/views/content/notify.html b/src/Umbraco.Web.UI.Client/src/views/content/notify.html new file mode 100644 index 0000000000..ec9b3d2b0d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/content/notify.html @@ -0,0 +1,44 @@ +\ No newline at end of file +@@ -61,7 +61,7 @@-+ ng-class="{'-selected':child.selected, 'not-allowed':!child.allowed}">+diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html index d04de47757..2f49e36b2f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html @@ -2,7 +2,7 @@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 211060c03f..c5572fad27 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,6 +37,12 @@-{{ name }}+{{ name }}{{ description }}+ ++You can drag files here to upload + +-
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 34c5db4d3c..35b5a5c068 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -28,8 +28,7 @@
class="input-block-level umb-textstring textstring"
required
val-server-field="oldPassword"
- no-dirty-check
- autocomplete="off" />
+ no-dirty-check />
Required
@@ -40,8 +39,7 @@
required
val-server-field="password"
ng-minlength="{{$parent.config.minPasswordLength}}"
- no-dirty-check
- autocomplete="off" />
+ no-dirty-check />
Required
Minimum {{$parent.config.minPasswordLength}} characters
@@ -51,8 +49,7 @@
+ no-dirty-check />
The confirmed password doesn't match the new password! diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js index fa2d831eac..0cd217c3a8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js @@ -20,13 +20,20 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController", } $scope.treeModel = { hideHeader: false - } + } + $scope.toggle = toggleHandler; userService.getCurrentUser().then(function (userData) { - $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1; + $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1; }); var node = dialogOptions.currentNode; + function treeLoadedHandler(ev, args) { + if (node && node.path) { + $scope.dialogTreeEventHandler.syncTree({ path: node.path, activate: false }); + } + } + function nodeSelectHandler(ev, args) { if(args && args.event) { @@ -51,7 +58,27 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController", if (args.node.metaData.isContainer) { openMiniListView(args.node); } - } + } + + function toggleHandler(type){ + // If the relateToOriginal toggle is clicked + if(type === "relate"){ + if($scope.relateToOriginal){ + $scope.relateToOriginal = false; + return; + } + $scope.relateToOriginal = true; + } + + // If the recurvise toggle is clicked + if(type === "recursive"){ + if($scope.recursive){ + $scope.recursive = false; + return; + } + $scope.recursive = true; + } + } $scope.hideSearch = function () { $scope.searchInfo.showSearch = false; @@ -110,10 +137,12 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController", }); }; + $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler); $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler); $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler); $scope.$on('$destroy', function () { + $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler); $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler); }); @@ -131,5 +160,5 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController", function openMiniListView(node) { $scope.miniListView = node; } - + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js index 984c147ee4..c6b3ce0561 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js @@ -25,6 +25,12 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController", var node = dialogOptions.currentNode; + function treeLoadedHandler(ev, args) { + if (node && node.path) { + $scope.dialogTreeEventHandler.syncTree({ path: node.path, activate: false }); + } + } + function nodeSelectHandler(ev, args) { if(args && args.event) { @@ -111,10 +117,12 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController", }); }; + $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler); $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler); $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler); $scope.$on('$destroy', function () { + $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler); $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js new file mode 100644 index 0000000000..c5b2781dd4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js @@ -0,0 +1,47 @@ +(function () { + function CreateNotifyController( + $scope, + contentResource, + navigationService, + angularHelper) { + var vm = this; + var currentForm; + vm.notifyOptions = []; + vm.save = save; + vm.cancel = cancel; + vm.message = { + name: $scope.currentNode.name + };; + function onInit() { + vm.loading = true; + contentResource.getNotifySettingsById($scope.currentNode.id).then(function (options) { + currentForm = angularHelper.getCurrentForm($scope); + vm.loading = false; + vm.notifyOptions = options; + }); + } + function cancel() { + navigationService.hideMenu(); + }; + function save(notifyOptions) { + vm.saveState = "busy"; + vm.saveError = false; + vm.saveSuccces = false; + var selectedString = ""; + angular.forEach(notifyOptions, function (option) { + if (option.checked === true && option.notifyCode) { + selectedString += option.notifyCode; + } + }) + contentResource.setNotifySettingsById($scope.currentNode.id, selectedString).then(function () { + vm.saveState = "success"; + vm.saveSuccces = true; + }, function (error) { + vm.saveState = "error"; + vm.saveError = error; + }); + } + onInit(); + } + angular.module("umbraco").controller("Umbraco.Editors.Content.CreateNotifyController", CreateNotifyController); +}()); diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js index c9124bf956..62eaa6fca6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController", - function ($scope, relationResource, contentResource, navigationService, appState, treeService) { + function ($scope, relationResource, contentResource, navigationService, appState, treeService, localizationService) { var dialogOptions = $scope.dialogOptions; var node = dialogOptions.currentNode; @@ -12,9 +12,9 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController" if (data.length == 0) { $scope.success = false; $scope.error = { - errorMsg: "Cannot automatically restore this item", + errorMsg: localizationService.localize('recycleBin_itemCannotBeRestored'), data: { - Message: "There is no 'restore' relation found for this node. Use the Move menu item to move it manually." + Message: localizationService.localize('recycleBin_noRestoreRelation') } } return; @@ -32,9 +32,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController" // make sure the target item isn't in the recycle bin if($scope.target.path.indexOf("-20") !== -1) { $scope.error = { - errorMsg: "Cannot automatically restore this item", + errorMsg: localizationService.localize('recycleBin_itemCannotBeRestored'), data: { - Message: "The item you want to restore it under (" + $scope.target.name + ") is in the recycle bin. Use the Move menu item to move the item manually." + Message: localizationService.localize('recycleBin_restoreUnderRecycled').then(function (value) { + value.replace('%0%', $scope.target.name); + }) } }; $scope.success = false; @@ -80,4 +82,4 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController" $scope.error = err; }); }; - }); \ No newline at end of file + }); 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 ca7714c284..e02855ea8f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html @@ -68,13 +68,13 @@- + - @@ -90,4 +90,4 @@- + + Copy +diff --git a/src/Umbraco.Web.UI.Client/src/views/content/restore.html b/src/Umbraco.Web.UI.Client/src/views/content/restore.html index 8564a80bf7..e99e2eb251 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/restore.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/restore.html @@ -2,9 +2,9 @@+ + ++-- - Restore {{currentNode.name}} under {{target.name}}? -
++
Restore {{currentNode.name}}under {{target.name}}? +{{error.errorMsg}}@@ -12,15 +12,15 @@-{{currentNode.name}} was moved underneath {{target.name}}
- +{{currentNode.name}}
+was moved underneath {{target.name}}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 9b7f1433e3..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 -
- 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 +
- 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
- Drag the files and folders you wish to upload directly into the Desktop Media Uploader application
- Click Upload to start uploading -
- Learn about how to protect pages of your site from this Wiki entry +
- Learn about how to protect pages of your site from this Wiki entry
- 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 +
- 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
- + + + + + + +
- @@ -51,6 +62,33 @@
- - - -
- + + +
- + + +
-
-
+ + ++
-
+ class="preview-rows columns" style="margin-top: 5px; margin-bottom: 25px; float:left">- -+ ++ ng-class="{last:$last}" + ng-repeat="area in layout.areas | filter:zeroWidthFilter" + ng-style="{width: percentage(area.grid) + '%', 'max-width': '100%'}">- -diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js index 0cd199ae4d..216f1555e2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js @@ -4,6 +4,9 @@ function includePropsPreValsController($rootScope, $scope, localizationService, $scope.model.value = []; } + $scope.hasError = false; + $scope.errorMsg = ""; + $scope.propertyAliases = []; $scope.selectedField = null; $scope.systemFields = [ @@ -45,6 +48,11 @@ function includePropsPreValsController($rootScope, $scope, localizationService, return alias; } + $scope.changeField = function () { + $scope.hasError = false; + $scope.errorMsg = ""; + } + $scope.removeField = function(e) { $scope.model.value = _.reject($scope.model.value, function (x) { return x.alias === e.alias; @@ -123,19 +131,34 @@ function includePropsPreValsController($rootScope, $scope, localizationService, $scope.addField = function () { var val = $scope.selectedField; - var isSystem = val.startsWith("_system_"); - if (isSystem) { - val = val.trimStart("_system_"); - } + if (val) { + var isSystem = val.startsWith("_system_"); + if (isSystem) { + val = val.trimStart("_system_"); + } - var exists = _.find($scope.model.value, function (i) { - return i.alias === val; - }); - if (!exists) { - $scope.model.value.push({ - alias: val, - isSystem: isSystem ? 1 : 0 + var exists = _.find($scope.model.value, function (i) { + return i.alias === val; }); + + if (!exists) { + $scope.hasError = false; + $scope.errorMsg = ""; + + $scope.model.value.push({ + alias: val, + isSystem: isSystem ? 1 : 0 + }); + } + else { + //there was an error, do the highlight (will be set back by the directive) + $scope.hasError = true; + $scope.errorMsg = "Property is already added"; + } + } + else { + $scope.hasError = true; + $scope.errorMsg = "No property selected"; } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html index 2e210e635f..749d5b5cb0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html @@ -1,7 +1,7 @@
{{area.maxItems}}
@@ -95,15 +95,13 @@--- + + -+ + + + + + + +-- --
+ - -- + +
-
-- + + --
-- + + Password reset requested
@@ -939,12 +969,12 @@ To manage your website, simply open the Umbraco back office and start adding con-
@@ -956,22 +986,22 @@ To manage your website, simply open the Umbraco back office and start adding con %1% -- + + Click this link to reset your password - - + +
-
+- - - - - - + + + + + + + -
+ - +- + + -
-- - - +- -+ -+ + + +-
- + +
-
+- + + --
@@ -1250,6 +1280,7 @@ To manage your website, simply open the Umbraco back office and start adding con- + + Hi %0%,
-+
This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%'
-- - @@ -1071,7 +1101,7 @@ To manage your website, simply open the Umbraco back office and start adding con+ + EDIT Update summary:
%6% -
+Have a nice day!
@@ -1083,10 +1113,10 @@ To manage your website, simply open the Umbraco back office and start adding con
+
You have picked a media item currently deleted or in the recycle bin You have picked media items currently deleted or in the recycle bin Deleted item +Trashed enter external link @@ -1419,6 +1450,9 @@ To manage your website, simply open the Umbraco back office and start adding conAn error occurred while unlocking the user Member was exported to file An error occurred while exporting the member +User %0% was deleted +Invite user +Invitation has been re-sent to %0% Uses CSS syntax ex: h1, .redHeader, .blueTex @@ -1650,9 +1684,9 @@ To manage your website, simply open the Umbraco back office and start adding conHide this property value from content editors that don't have access to view sensitive information Show on member profile Allow this property value to be displayed on the member profile page - +tab has no sort order - +Where is this composition used? This composition is currently used in the composition of the following content types: @@ -1907,41 +1941,41 @@ To manage your website, simply open the Umbraco back office and start adding conUmbraco: Invitation - - - - - - + + + + + + + -
+- + + -
-- - - -- -+ + -+ + ++ +-
+ - -- + +
-
-- + + --
-- + + Hi %0%,
@@ -1959,12 +1993,12 @@ To manage your website, simply open the Umbraco back office and start adding con-
@@ -1979,33 +2013,36 @@ To manage your website, simply open the Umbraco back office and start adding con %3% -- + + Click this link to accept the invite - - + +
-
+Invite +Resending invitation... +Delete User +Are you sure you wish to delete this user account? Validation -Validate as email +Validate as an email address Validate as a number -Validate as a Url +Validate as a URL ...or enter a custom validation Field is mandatory Enter a regular expression @@ -2059,6 +2096,10 @@ To manage your website, simply open the Umbraco back office and start adding conMedia - Total XML: %0%, Total: %1%, Total invalid: %2% Content - Total XML: %0%, Total published: %1%, Total invalid: %2% +Database - The database schema is correct for this version of Umbraco +%0% problems were detected with your database schema (Check the log for details) +Some errors were detected while validating the database schema against the current version of Umbraco. +Your website's certificate is valid. Certificate validation error: '%0%' Your website's SSL certificate has expired. @@ -2162,4 +2203,11 @@ To manage your website, simply open the Umbraco back office and start adding concharacters left + +Trashed content with Id: {0} related to original parent content with Id: {1} +Trashed media with Id: {0} related to original parent media item with Id: {1} +Cannot automatically restore this item +There is no 'restore' relation found for this node. Use the Move menu item to move it manually. +The item you want to restore it under ('%0%') is in the recycle bin. Use the Move menu item to move the item manually. + diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 5f453075bd..b018a562fc 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -2,7 +2,7 @@The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesCulture and Hostnames @@ -46,6 +46,7 @@Set permissions Unlock Create Content Template +Resend Invitation Content @@ -100,9 +101,6 @@Domains - -Viewing for -Clear selection Select @@ -140,7 +138,32 @@Save and generate models Undo Redo +Delete tag +Cancel +Confirm + +Viewing for +Delete Content performed by user +UnPublish performed by user +Save and Publish performed by user +Save Content performed by user +Move Content performed by user +Copy Content performed by user +Content rollback performed by user +Content Send To Publish performed by user +Content Send To Translation performed by user +Copy +Publish +Move +Save +Delete +Unpublish +Rollback +Send To Publish +Send To Translation + +To change the document type for the selected content, first select from the list of valid types for this location. Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. @@ -222,7 +245,7 @@Child items Target This translates to the following time on the server: -What does this mean?]]> +What does this mean?]]> Are you sure you want to delete this item? Property %0% uses editor %1% which is not supported by Nested Content. Add another text box @@ -245,6 +268,7 @@Drop your files here... Link to media or click here to choose files +You can drag files here to upload Only allowed file types are Cannot upload this file, it does not have an approved file type Max file size is @@ -286,6 +310,7 @@Discard changes You have unsaved changes Are you sure you want to navigate away from this page? - you have unsaved changes +Unpublishing will remove this page and all its descendants from the site. Done @@ -318,6 +343,7 @@Link title Link +Anchor / querystring Name Close this window Are you sure you want to delete @@ -417,6 +443,7 @@ The key '%0%' already exists. ]]> +Dictionary overview Enter your username @@ -434,6 +461,7 @@Enter your email... Enter a message... Your username is usually your email +#value or ?key=value Allow at root @@ -629,6 +657,7 @@Submit Type Type to search... +under Up Update Upgrade @@ -730,7 +759,7 @@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.
]]>
+ done.
More information on editing web.config here.@@ -885,6 +914,8 @@ To manage your website, simply open the Umbraco back office and start adding con Forgotten password? An email will be sent to the address specified with a link to reset your password An email with password reset instructions will be sent to the specified address if it matched our records +Show password +Hide password Return to login form Please provide a new password Your Password has been updated @@ -892,41 +923,41 @@ To manage your website, simply open the Umbraco back office and start adding conUmbraco: Reset Password - - - - - - + + + + + + + -
+ - +- + + -
-- - - -- -+ + -+ + ++ +-
+ - -- + +
-
-- + + --
-- + + Password reset requested
@@ -936,12 +967,12 @@ To manage your website, simply open the Umbraco back office and start adding con-
@@ -953,22 +984,22 @@ To manage your website, simply open the Umbraco back office and start adding con %1% -- + + Click this link to reset your password - - + +
-
+
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/developer/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html index 1204af7ca4..864d1930e9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html @@ -9,7 +9,7 @@diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html index d59d10d393..54bcf19abe 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html @@ -5,10 +5,10 @@The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. - You can add your own health checks, have a look at the documentation for more information about custom health checks.
+ You can add your own health checks, have a look at the documentation for more information about custom health checks.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 @@\ No newline at end of file +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 @@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/membersdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html index d42d3ebf7c..c29b52d96e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html @@ -6,5 +6,5 @@More about members
-
-
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 @@
Find out more:
-
-
- diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html index 09390cdb81..f05b8a6c79 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html @@ -1,4 +1,4 @@ -- +- -+Required -+ -{{content.id}}+ {{content.key}} ++ ++ +-Required +- +{{content.selectedEditor}}-+ -{{content.selectedEditor}}++ - +- + +diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html new file mode 100644 index 0000000000..5b73df3f86 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html @@ -0,0 +1,19 @@ ++ +\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html new file mode 100644 index 0000000000..61c26c09a7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html @@ -0,0 +1,12 @@ +++ +
+Create an item under {{currentNode.name}}+ +++\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js new file mode 100644 index 0000000000..f47244bb10 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js @@ -0,0 +1,44 @@ +/** + * @ngdoc controller + * @name Umbraco.Editors.Dictionary.CreateController + * @function + * + * @description + * The controller for creating dictionary items + */ +function DictionaryCreateController($scope, $location, dictionaryResource, navigationService, notificationsService, formHelper, appState) { + var vm = this; + + vm.itemKey = ""; + + function createItem() { + + var node = $scope.dialogOptions.currentNode; + + dictionaryResource.create(node.id, vm.itemKey).then(function (data) { + navigationService.hideMenu(); + + // set new item as active in tree + var currPath = node.path ? node.path : "-1"; + navigationService.syncTree({ tree: "dictionary", path: currPath + "," + data, forceReload: true, activate: true }); + + // reset form state + formHelper.resetForm({ scope: $scope }); + + // navigate to edit view + var currentSection = appState.getSectionState("currentSection"); + $location.path("/" + currentSection + "/dictionary/edit/" + data); + + + }, function (err) { + if (err.data && err.data.message) { + notificationsService.error(err.data.message); + navigationService.hideMenu(); + } + }); + } + + vm.createItem = createItem; +} + +angular.module("umbraco").controller("Umbraco.Editors.Dictionary.CreateController", DictionaryCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js new file mode 100644 index 0000000000..43d6bac401 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js @@ -0,0 +1,50 @@ +/** + * @ngdoc controller + * @name Umbraco.Editors.Dictionary.DeleteController + * @function + * + * @description + * The controller for deleting dictionary items + */ +function DictionaryDeleteController($scope, $location, dictionaryResource, treeService, navigationService, appState) { + var vm = this; + + function cancel() { + navigationService.hideDialog(); + } + + function performDelete() { + // stop from firing again on double-click + if ($scope.busy) { return false; } + + //mark it for deletion (used in the UI) + $scope.currentNode.loading = true; + $scope.busy = true; + + dictionaryResource.deleteById($scope.currentNode.id).then(function () { + $scope.currentNode.loading = false; + + // get the parent id + var parentId = $scope.currentNode.parentId; + + treeService.removeNode($scope.currentNode); + + navigationService.hideMenu(); + + var currentSection = appState.getSectionState("currentSection"); + if (parentId !== "-1") { + // set the view of the parent item + $location.path("/" + currentSection + "/dictionary/edit/" + parentId); + } else { + // we have no parent, so redirect to section + $location.path("/" + currentSection + "/"); + } + + }); + } + + vm.cancel = cancel; + vm.performDelete = performDelete; +} + +angular.module("umbraco").controller("Umbraco.Editors.Dictionary.DeleteController", DictionaryDeleteController); diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js new file mode 100644 index 0000000000..1b9d5c3f4c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js @@ -0,0 +1,115 @@ +/** + * @ngdoc controller + * @name Umbraco.Editors.Dictionary.EditController + * @function + * + * @description + * The controller for editing dictionary items + */ +function DictionaryEditController($scope, $routeParams, dictionaryResource, treeService, navigationService, appState, editorState, contentEditingHelper, formHelper, notificationsService, localizationService) { + var vm = this; + + //setup scope vars + vm.nameDirty = false; + vm.page = {}; + vm.page.loading = false; + vm.page.nameLocked = false; + vm.page.menu = {}; + vm.page.menu.currentSection = appState.getSectionState("currentSection"); + vm.page.menu.currentNode = null; + vm.description = ""; + + function loadDictionary() { + + vm.page.loading = true; + + //we are editing so get the content item from the server + dictionaryResource.getById($routeParams.id) + .then(function (data) { + + bindDictionary(data); + + vm.page.loading = false; + }); + } + + function createTranslationProperty(translation) { + return { + alias: translation.isoCode, + label: translation.displayName, + hideLabel : false + } + } + + function bindDictionary(data) { + localizationService.localize("dictionaryItem_description").then(function (value) { + vm.description = value.replace("%0%", data.name); + }); + + // create data for umb-property displaying + for (var i = 0; i < data.translations.length; i++) { + data.translations[i].property = createTranslationProperty(data.translations[i]); + } + + contentEditingHelper.handleSuccessfulSave({ + scope: $scope, + savedContent: data + }); + + // set content + vm.content = data; + + //share state + editorState.set(vm.content); + + navigationService.syncTree({ tree: "dictionary", path: data.path, forceReload: true }).then(function (syncArgs) { + vm.page.menu.currentNode = syncArgs.node; + }); + } + + function onInit() { + loadDictionary(); + } + + function saveDictionary() { + if (formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) { + + vm.page.saveButtonState = "busy"; + + dictionaryResource.save(vm.content, vm.nameDirty) + .then(function (data) { + + formHelper.resetForm({ scope: $scope, notifications: data.notifications }); + + bindDictionary(data); + + + vm.page.saveButtonState = "success"; + }, + function (err) { + + contentEditingHelper.handleSaveError({ + redirectOnFailure: false, + err: err + }); + + notificationsService.error(err.data.message); + + vm.page.saveButtonState = "error"; + }); + } + } + + vm.save = saveDictionary; + + $scope.$watch("vm.content.name", function (newVal, oldVal) { + //when the value changes, we need to set the name dirty + if (newVal && (newVal !== oldVal) && typeof(oldVal) !== "undefined") { + vm.nameDirty = true; + } + }); + + onInit(); +} + +angular.module("umbraco").controller("Umbraco.Editors.Dictionary.EditController", DictionaryEditController); diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js new file mode 100644 index 0000000000..35739b3db7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js @@ -0,0 +1,47 @@ +/** + * @ngdoc controller + * @name Umbraco.Editors.Dictionary.ListController + * @function + * + * @description + * The controller for listting dictionary items + */ +function DictionaryListController($scope, $location, dictionaryResource, localizationService, appState) { + var vm = this; + vm.title = "Dictionary overview"; + vm.loading = false; + vm.items = []; + + function loadList() { + + vm.loading = true; + + dictionaryResource.getList() + .then(function (data) { + + vm.items = data; + + vm.loading = false; + }); + } + + function clickItem(id) { + var currentSection = appState.getSectionState("currentSection"); + $location.path("/" + currentSection + "/dictionary/edit/" + id); + } + + vm.clickItem = clickItem; + + function onInit() { + localizationService.localize("dictionaryItem_overviewTitle").then(function (value) { + vm.title = value; + }); + + loadList(); + } + + onInit(); +} + + +angular.module("umbraco").controller("Umbraco.Editors.Dictionary.ListController", DictionaryListController); diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html new file mode 100644 index 0000000000..c016d37eca --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html @@ -0,0 +1,43 @@ ++ +++
+ +Are you sure you want to delete {{currentNode.name}} ? ++ + ++diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html new file mode 100644 index 0000000000..82b088df49 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html @@ -0,0 +1,46 @@ ++ + + +diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html index db1a0db640..2976f65917 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html @@ -1,4 +1,4 @@ -+ + ++ ++ ++ +++++++++++Name ++ + + +++++++ + +++ +++diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js index aade96c3cc..2ffeec3388 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js @@ -6,12 +6,13 @@ * @description * The controller for the doc type creation dialog */ -function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState, notificationsService, localizationService) { +function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState, notificationsService, localizationService, iconHelper) { $scope.model = { allowCreateFolder: $scope.dialogOptions.currentNode.parentId === null || $scope.dialogOptions.currentNode.nodeType === "container", folderName: "", creatingFolder: false, + creatingDoctypeCollection: false }; var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates; @@ -24,6 +25,10 @@ function DocumentTypesCreateController($scope, $location, navigationService, con $scope.model.creatingFolder = true; }; + $scope.showCreateDocTypeCollection = function () { + $scope.model.creatingDoctypeCollection = true; + }; + $scope.createContainer = function () { if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: localizeCreateFolder })) { @@ -61,6 +66,54 @@ function DocumentTypesCreateController($scope, $location, navigationService, con } }; + $scope.createCollection = function () { + + if (formHelper.submitForm({ scope: $scope, formCtrl: this.createDoctypeCollectionForm, statusMessage: "Creating Doctype Collection..." })) { + + // see if we can find matching icons + var collectionIcon = "icon-folders", collectionItemIcon = "icon-document"; + iconHelper.getIcons().then(function (icons) { + + for (var i = 0; i < icons.length; i++) { + // for matching we'll require a full match for collection, partial match for item + if (icons[i].substring(5) == $scope.model.collectionName.toLowerCase()) { + collectionIcon = icons[i]; + } else if (icons[i].substring(5).indexOf($scope.model.collectionItemName.toLowerCase()) > -1) { + collectionItemIcon = icons[i]; + } + } + + contentTypeResource.createCollection(node.id, $scope.model.collectionName, $scope.model.collectionItemName, collectionIcon, collectionItemIcon).then(function (collectionData) { + + navigationService.hideMenu(); + $location.search('create', null); + $location.search('notemplate', null); + + formHelper.resetForm({ + scope: $scope + }); + + var section = appState.getSectionState("currentSection"); + + // redirect to the item id + $location.path("/settings/documenttypes/edit/" + collectionData.ItemId); + + }, function (err) { + + $scope.error = err; + + //show any notifications + if (angular.isArray(err.data.notifications)) { + for (var i = 0; i < err.data.notifications.length; i++) { + notificationsService.showNotification(err.data.notifications[i]); + } + } + }); + }); + } + + }; + // Disabling logic for creating document type with template if disableTemplates is set to true if (!disableTemplates) { $scope.createDocType = function () { diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html index e5043be785..549ad0452b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html @@ -1,6 +1,6 @@-++Create an item under {{currentNode.name}}-
@@ -24,6 +24,17 @@
+
+ + A Document Type collection is a fast way to create two Document Types in one task. + The Item Document Type will automatically be + allowed under the Parent Document Type. + +
+ +diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html index c982abc0c0..1ed224b5ba 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html @@ -1,4 +1,4 @@ -+diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js index fe6e65918a..02cb3a363a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js @@ -13,6 +13,12 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController", $scope.treeModel.hideHeader = userData.startMediaIds.length > 0 && userData.startMediaIds.indexOf(-1) == -1; }); + function treeLoadedHandler(ev, args) { + if (node && node.path) { + $scope.dialogTreeEventHandler.syncTree({ path: node.path, activate: false }); + } + } + function nodeSelectHandler(ev, args) { if(args && args.event) { @@ -38,6 +44,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController", } } + $scope.dialogTreeEventHandler.bind("treeLoaded", treeLoadedHandler); $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler); $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler); @@ -71,6 +78,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController", }; $scope.$on('$destroy', function () { + $scope.dialogTreeEventHandler.unbind("treeLoaded", treeLoadedHandler); $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js new file mode 100644 index 0000000000..6ef9232c37 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js @@ -0,0 +1,85 @@ +angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController", + function ($scope, relationResource, mediaResource, navigationService, appState, treeService, localizationService) { + var dialogOptions = $scope.dialogOptions; + + var node = dialogOptions.currentNode; + + $scope.error = null; + $scope.success = false; + + relationResource.getByChildId(node.id, "relateParentDocumentOnDelete").then(function (data) { + + if (data.length == 0) { + $scope.success = false; + $scope.error = { + errorMsg: localizationService.localize('recycleBin_itemCannotBeRestored'), + data: { + Message: localizationService.localize('recycleBin_noRestoreRelation') + } + } + return; + } + + $scope.relation = data[0]; + + if ($scope.relation.parentId == -1) { + $scope.target = { id: -1, name: "Root" }; + + } else { + mediaResource.getById($scope.relation.parentId).then(function (data) { + $scope.target = data; + + // make sure the target item isn't in the recycle bin + if ($scope.target.path.indexOf("-20") !== -1) { + $scope.error = { + errorMsg: localizationService.localize('recycleBin_itemCannotBeRestored'), + data: { + Message: localizationService.localize('recycleBin_restoreUnderRecycled').then(function (value) { + value.replace('%0%', $scope.target.name); + }) + } + }; + $scope.success = false; + } + + }, function (err) { + $scope.success = false; + $scope.error = err; + }); + } + + }, function (err) { + $scope.success = false; + $scope.error = err; + }); + + $scope.restore = function () { + // this code was copied from `content.move.controller.js` + mediaResource.move({ parentId: $scope.target.id, id: node.id }) + .then(function (path) { + + $scope.success = true; + + //first we need to remove the node that launched the dialog + treeService.removeNode($scope.currentNode); + + //get the currently edited node (if any) + var activeNode = appState.getTreeState("selectedNode"); + + //we need to do a double sync here: first sync to the moved media item - but don't activate the node, + //then sync to the currenlty edited media item (note: this might not be the media item that was moved!!) + + navigationService.syncTree({ tree: "media", path: path, forceReload: true, activate: false }).then(function (args) { + if (activeNode) { + var activeNodePath = treeService.getPath(activeNode).join(); + //sync to this node now - depending on what was copied this might already be synced but might not be + navigationService.syncTree({ tree: "media", path: activeNodePath, forceReload: false, activate: true }); + } + }); + + }, function (err) { + $scope.success = false; + $scope.error = err; + }); + }; + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html index d04d66f706..b37b71b639 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/move.html +++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html @@ -1,56 +1,55 @@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 0cfe76cd7a..a1385102e4 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 @@ -7,17 +7,15 @@diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js index 071f4c6480..45e95454ea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js @@ -23,6 +23,7 @@ vm.addChild = addChild; vm.removeChild = removeChild; + vm.toggle = toggle; /* ---------- INIT ---------- */ @@ -75,6 +76,18 @@ $scope.model.allowedContentTypes.splice(selectedChildIndex, 1); } + /** + * Toggle the $scope.model.allowAsRoot value to either true or false + */ + function toggle(){ + if($scope.model.allowAsRoot){ + $scope.model.allowAsRoot = false; + return; + } + + $scope.model.allowAsRoot = true; + } + } angular.module("umbraco").controller("Umbraco.Editors.DocumentType.PermissionsController", PermissionsController); diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html index d9c7d185da..d8a4f5057a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html @@ -7,10 +7,13 @@- ++ -+ -
+Choose where to move - {{currentNode.name}} -to in the tree structure below -+
-Choose where to move + {{currentNode.name}} +to in the tree structure below ++----+- -+-+ +- ++ -+diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html index 319e59c4cc..fcc26b9928 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html @@ -1,4 +1,4 @@ -++ + ++ + ++
+ +Restore {{currentNode.name}}under {{target.name}}? +++ +{{error.errorMsg}}+{{error.data.Message}}+++ +{{currentNode.name}}
+ +was moved underneath {{target.name}}+diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html index b82eb88ad2..973d287ea8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html @@ -1,7 +1,15 @@ -diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js index ff9d412f8a..61e7b5a2dc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js @@ -130,7 +130,7 @@ contentTypeHelper.generateModels().then(function (result) { - if (result.success) { + if (!result.lastError) { //re-check model status contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) { diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html index 59172eb547..18f7aee337 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html @@ -1,4 +1,4 @@ -+diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js index ab42c91959..c9c32c657a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js @@ -87,7 +87,7 @@ contentTypeHelper.generateModels().then(function (result) { - if (result.success) { + if (!result.lastError) { //re-check model status contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) { diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 7e352f27b0..e4cb5893ce 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -168,7 +168,7 @@diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js index 9d7cb8a1da..f8595be251 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js @@ -13,6 +13,7 @@ vm.addChild = addChild; vm.removeChild = removeChild; + vm.toggle = toggle; /* ---------- INIT ---------- */ @@ -65,6 +66,18 @@ $scope.model.allowedContentTypes.splice(selectedChildIndex, 1); } + /** + * Toggle the $scope.model.allowAsRoot value to either true or false + */ + function toggle(){ + if($scope.model.allowAsRoot){ + $scope.model.allowAsRoot = false; + return; + } + + $scope.model.allowAsRoot = true; + } + } angular.module("umbraco").controller("Umbraco.Editors.MediaType.PermissionsController", PermissionsController); diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html index 7c9811e37a..d2cd50b8d7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html @@ -7,10 +7,12 @@- ++ 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 960549aabf..93c9e162c1 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 @@ -350,7 +350,7 @@ }); }, readOnly: true - }, + } ]); diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html index 5c7d3b52c2..f9fbf0b9f0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html @@ -4,7 +4,7 @@+ img-src="{{ 'https://our.umbraco.com' + vm.package.ownerInfo.ownerAvatar }}"> - +@@ -14,7 +14,7 @@-
-
-
+
-
+
-+ +- - - - +- -++ ++-+ + + +++ +- -diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js index 98e649729c..7ae728a85a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerController", - function ($scope, $timeout, assetsService, angularHelper, $element) { + function ($scope, $timeout, assetsService, angularHelper, $element, localizationService, eventsService) { //NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive. var defaultColor = "000000"; var defaultLabel = null; @@ -8,6 +8,23 @@ $scope.newLavel = defaultLabel; $scope.hasError = false; + $scope.labels = {}; + + var labelKeys = [ + "general_cancel", + "general_choose" + ]; + + $scope.labelEnabled = false; + eventsService.on("toggleValue", function (e, args) { + $scope.labelEnabled = args.value; + }); + + localizationService.localizeMany(labelKeys).then(function (values) { + $scope.labels.cancel = values[0]; + $scope.labels.choose = values[1]; + }); + assetsService.load([ //"lib/spectrum/tinycolor.js", "lib/spectrum/spectrum.js" @@ -16,8 +33,8 @@ elem.spectrum({ color: null, showInitial: false, - chooseText: "choose", // TODO: These can be localised - cancelText: "cancel", // TODO: These can be localised + chooseText: $scope.labels.choose, + cancelText: $scope.labels.cancel, preferredFormat: "hex", showInput: true, clickoutFiresChange: true, @@ -46,16 +63,22 @@ items.push({ value: oldValue.value, label: oldValue.label, + sortOrder: oldValue.sortOrder, id: i }); } else { items.push({ value: oldValue, label: oldValue, + sortOrder: sortOrder, id: i }); } } + + //ensure the items are sorted by the provided sort order + items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); }); + //now make the editor model the array $scope.model.value = items; } @@ -104,6 +127,39 @@ }; + $scope.sortableOptions = { + axis: 'y', + containment: 'parent', + cursor: 'move', + //handle: ".handle, .thumbnail", + items: '> div.control-group', + tolerance: 'pointer', + update: function (e, ui) { + // Get the new and old index for the moved element (using the text as the identifier, so + // we'd have a problem if two prevalues were the same, but that would be unlikely) + var newIndex = ui.item.index(); + var movedPrevalueText = $('pre', ui.item).text(); + var originalIndex = getElementIndexByPrevalueText(movedPrevalueText); + + //// Move the element in the model + if (originalIndex > -1) { + var movedElement = $scope.model.value[originalIndex]; + $scope.model.value.splice(originalIndex, 1); + $scope.model.value.splice(newIndex, 0, movedElement); + } + } + }; + + function getElementIndexByPrevalueText(value) { + for (var i = 0; i < $scope.model.value.length; i++) { + if ($scope.model.value[i].value === value) { + return i; + } + } + + return -1; + } + //load the separate css for the editor to avoid it blocking our js loading assetsService.loadCss("lib/spectrum/spectrum.css", $scope); }); 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 5827c046fd..76d6fa77aa 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 @@ -77,7 +77,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper // sortable options $scope.sortableOptions = { + axis: "y", + containment: "parent", distance: 10, + opacity: 0.7, tolerance: "pointer", scroll: true, zIndex: 6000 @@ -109,6 +112,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper entityType: entityType, filterCssClass: "not-allowed not-published", startNodeId: null, + currentNode: editorState ? editorState.current : null, callback: function (data) { if (angular.isArray(data)) { _.each(data, function (item, i) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html index 315a7f15f3..8d695966e7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html @@ -4,7 +4,7 @@ id="{{model.alias}}" class="umb-editor umb-textstring textstring" val-email - ng-required="model.config.IsRequired || model.validation.mandatory" + ng-required="model.config.IsRequired != 0 || model.validation.mandatory" val-server="value" />- +#{{item.value}} - {{item.label}}++ ++ +++#{{item.value}}{{item.label}}++Remove +Required 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 2a66ee457b..ba9e868962 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 @@ -73,7 +73,7 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag var extension = file.file.substring(file.file.lastIndexOf(".") + 1, file.file.length); - file.thumbnail = thumbnailUrl; + file.thumbnail = thumbnailUrl + '&rnd=' + Math.random(); file.extension = extension.toLowerCase(); }); 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 63810ac610..ffb8149a4f 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 @@ -6,9 +6,11 @@- 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 99c3fd80ff..397438d5a0 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) { + function GridRichTextEditorController($scope, tinyMceService, macroService, editorState) { var vm = this; @@ -11,9 +11,11 @@ vm.openEmbed = openEmbed; function openLinkPicker(editor, currentTarget, anchorElement) { + vm.linkPickerOverlay = { view: "linkpicker", currentTarget: currentTarget, + anchors: tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)), show: true, submit: function(model) { tinyMceService.insertLinkInEditor(editor, model.target, anchorElement); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js index b59fc6ecad..dbfbdbdcad 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js @@ -218,7 +218,7 @@ angular.module("umbraco") // Fade in control when sorting stops ui.item.context.style.opacity = "1"; - ui.item.parents(".umb-cell-content").find(".mceNoEditor").each(function () { + ui.item.offsetParent().find(".mceNoEditor").each(function () { if ($.inArray($(this).attr("id"), notIncludedRte) < 0) { // add all dragged's neighbouring RTEs in the new cell notIncludedRte.splice(0, 0, $(this).attr("id")); @@ -333,7 +333,7 @@ angular.module("umbraco") } } - $scope.addRow = function (section, layout) { + $scope.addRow = function (section, layout, isInit) { //copy the selected layout into the rows collection var row = angular.copy(layout); @@ -345,8 +345,9 @@ angular.module("umbraco") if (row) { section.rows.push(row); } - - currentForm.$setDirty(); + if (!isInit) { + currentForm.$setDirty(); + } $scope.showRowConfigurations = false; @@ -728,7 +729,7 @@ angular.module("umbraco") if (!section.rows || section.rows.length === 0) { section.rows = []; if(section.$allowedLayouts.length === 1){ - $scope.addRow(section, section.$allowedLayouts[0]); + $scope.addRow(section, section.$allowedLayouts[0], true); } } else { _.forEach(section.rows, function (row, index) { 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/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html index fa2da2f9e2..539433821b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html @@ -2,7 +2,7 @@
@@ -57,13 +57,13 @@-
+-
-
+ - - - - - - + + + + + + + -
+ - +- + + -
-- - - +- -+ -+ + + +-
- + +
-
+- + + --
@@ -1247,6 +1278,7 @@ To manage your website, simply open the Umbraco back office and start adding con- + + Hi %0%,
-+
This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%'
-- - @@ -1068,7 +1099,7 @@ To manage your website, simply open the Umbraco back office and start adding con+ + EDIT Update summary:
%6% -
+Have a nice day!
@@ -1080,10 +1111,10 @@ To manage your website, simply open the Umbraco back office and start adding con
+
You have picked a media item currently deleted or in the recycle bin You have picked media items currently deleted or in the recycle bin Deleted item +Trashed enter external link @@ -1416,6 +1448,9 @@ To manage your website, simply open the Umbraco back office and start adding conAn error occurred while unlocking the user Member was exported to file An error occurred while exporting the member +User %0% was deleted +Invite user +Invitation has been re-sent to %0% Uses CSS syntax ex: h1, .redHeader, .blueTex @@ -1642,9 +1677,9 @@ To manage your website, simply open the Umbraco back office and start adding conHide this property value from content editors that don't have access to view sensitive information Show on member profile Allow this property value to be displayed on the member profile page - +tab has no sort order - +Where is this composition used? This composition is currently used in the composition of the following content types: @@ -1899,41 +1934,41 @@ To manage your website, simply open the Umbraco back office and start adding conUmbraco: Invitation - - - - - - + + + + + + + -
+- + + -
-- - - -- -+ + -+ + ++ +-
+ - -- + +
-
-- + + --
-- + + Hi %0%,
@@ -1951,12 +1986,12 @@ To manage your website, simply open the Umbraco back office and start adding con-
@@ -1971,32 +2006,35 @@ To manage your website, simply open the Umbraco back office and start adding con %3% -- + + Click this link to accept the invite - - + +
-
+Invite +Resending invitation... +Delete User +Are you sure you wish to delete this user account? Validation -Validate as email +Validate as an email address Validate as a number -Validate as a Url +Validate as a URL ...or enter a custom validation Field is mandatory Enter a regular expression @@ -2050,6 +2088,10 @@ To manage your website, simply open the Umbraco back office and start adding conMedia - Total XML: %0%, Total: %1%, Total invalid: %2% Content - Total XML: %0%, Total published: %1%, Total invalid: %2% +Database - The database schema is correct for this version of Umbraco +%0% problems were detected with your database schema (Check the log for details) +Some errors were detected while validating the database schema against the current version of Umbraco. +Your website's certificate is valid. Certificate validation error: '%0%' Your website's SSL certificate has expired. @@ -2153,4 +2195,15 @@ To manage your website, simply open the Umbraco back office and start adding concharacters left + +Trashed content with Id: {0} related to original parent content with Id: {1} +Trashed media with Id: {0} related to original parent media item with Id: {1} +Cannot automatically restore this item +There is no 'restore' relation found for this node. Use the Move menu item to move it manually. +The item you want to restore it under ('%0%') is in the recycle bin. Use the Move menu item to move the item manually. + + +Select your notifications for +Notification settings saved for + diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index cf44e6e955..fed40e2d79 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -2,7 +2,7 @@The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesAdministrar hostnames @@ -213,7 +213,7 @@Nodos hijo Target Esto se traduce en la siguiente hora en el servidor: -¿Esto qué significa?]]> +¿Esto qué significa?]]> ¿Estás seguro que quieres eliminar este elemento? Propiedad %0% utiliza editor %1% que no está soportado por Nested Content. Añadir otra caja de texto @@ -698,7 +698,7 @@Configuración de la base de datos instalar para instalar %0% la base de datos de Umbraco]]> Próximo para continuar]]> -¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta. +Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.
Pinche en reintentar cuando haya terminado.
]]>
Pinche aquí para mayor información de como editar el web.config (en inglés)¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta. Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.
Pinche en reintentar cuando haya terminado.
]]>
Pinche aquí para mayor información de como editar el web.config (en inglés)Por favor, contacta con tu ISP si es necesario. Si estás realizando la instalación en una máquina o servidor local, quizás necesites información de tu administrador de sistemas.]]> Pinche en actualizar para actualizar la base de datos a Umbraco %0% Ningún contenido será borrado de la base de datos y seguirá funcionando después de la actualización
]]>Pinche en Próximo para continuar. ]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index d721a8fc8b..b3d5edf512 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -2,21 +2,24 @@The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesGérer les noms d'hôtes +Culture et noms d'hôte Informations d'audit Parcourir Changer le type de document Copier Créer +Exporter +Créer un groupe Créer un package Supprimer Désactiver Vider la corbeille -Exporter un type -Importer un type +Activer +Exporter le type de document +Importer un type de document Importer un package Editer dans Canvas Déconnexion @@ -27,6 +30,7 @@Dépublier Rafraîchir Republier le site tout entier +Renommer Récupérer Spécifiez les permissions pour la page %0% Choisissez où déplacer @@ -35,10 +39,41 @@Version antérieure Envoyer pour publication Envoyer pour traduction +Spécifier le groupe Trier Traduire Mettre à jour +Spécifier les permissions +Débloquer +Créer un modèle de contenu +Envoyer à nouveau l'invitation + +Contenu +Administration +Structure +Autre + + +Permettre d'attribuer la culture et des noms d'hôte +Permettre d'accéder au journal d'historique d'un noeud +Permettre d'accéder à un noeud +Permettre de modifier le type de document d'un noeud +Permettre de copier un noeud +Permettre de créer des noeuds +Permettre de supprimer des noeuds +Permettre de déplacer un noeud +Permettre de définir et modifier l'accès public à un noeud +Permettre de publier un noeud +Permettre de modifier les permissions pour un noeud +Permettre de revenir à une situation antérieure +Permettre d'envoyer un noeud pour approbation avant publication +Permettre d'envoyer un noeud à la traduction +Permettre de modifier l'ordonnancement des noeuds +Permettre de traduire un noeud +Permettre de sauvegarder un noeud +Permettre la création d'un Modèle de Contenu +Permission refusée. Ajouter un nouveau domaine @@ -53,18 +88,19 @@Domaine '%0%' déjà assigné Domaine '%0%' mis à jour Editer les domaines actuels -+ + devrait être évité. Utilisez plutôt la gestion de la culture et des noms d'hôte.]]> +
Les domaines contenant un chemin d'un niveau sont autorisés, ex : "example.com/en". Pour autant, cela - devrait être évité. Utilisez plutôt la gestion des noms d'hôte.]]>Hériter Culture -ou hériter de la culture des noeuds parents. S'appliquera aussi +
- au noeud courant, à moins qu'un domaine ci-dessous soit aussi d'application.]]>+ ou hériter de la culture des noeuds parents. S'appliquera aussi
+ au noeud courant, à moins qu'un domaine ci-dessous soit aussi d'application.]]> +Domaines - -Aperçu pour -Vider la sélection Choisir @@ -90,7 +126,8 @@Retourner à la liste Sauver Sauver et publier -Sauver et envoyer pour approbation +Sauver et planifier +Sauver et envoyer pour approbation Sauver la mise en page de la liste Prévisualiser La prévisualisation est désactivée car aucun modèle n'a été assigné. @@ -98,9 +135,31 @@Afficher les styles Insérer un tableau Générer les modèles +Sauver et générer les modèles Défaire Refaire + +Aperçu pour +Suppressions de contenu réalisées par utilisateur +Dépublications réalisées par utilisateur +Sauvegardes et publications réalisées par utilisateur +Sauvegardes de contenu réalisées par utilisateur +Déplacements de contenu réalisés par utilisateur +Copies de contenu réalisées par utilisateur +Récupérations de contenu réalisées par utilisateur +Envois de contenu pour publication réalisés par utilisateur +Envois de contenu pour traduction réalisés par utilisateur +Copie +Publication +Déplacement +Sauvegarde +Suppression +Dépublication +Récupération +Envoi pour publication +Envoi pour traduction +Pour changer le type de document du contenu séléctionné, faites d'abord un choix dans la liste des types valides à cet endroit. Puis modifiez si nécessaire la correspondance des propriétés du type actuel vers le nouveau, et cliquez sur Sauver. @@ -141,30 +200,38 @@Dernière publication Il n'y a aucun élément à afficher Il n'y a aucun élément à afficher dans cette liste. +Aucun contenu n'a encore été ajouté +Aucun membre n'a encore été ajouté Type de Média Lien vers des média(s) Groupe de membres Rôle Type de membre +Aucune modification n'a été faite Aucune date choisie Titre de la page +Ce média n'a pas de lien Propriétés Ce document est publié mais n'est pas visible car son parent '%0%' n'est pas publié Oups : ce document est publié mais n'est pas présent dans le cache (erreur interne Umbraco) Oups: impossible d'obtenir cet url (erreur interne - voir fichier log) Oups: ce document est publié mais son url entrerait en collision avec le contenu %0% Publier +Publié +Publié (changements en cours) Statut de publication Publié le Dépublié le Supprimer la date -Ordre de tri mis à jour +Défininir la date +Ordre de tri mis à jour Pour trier les noeuds, faites-les simplement glisser à l'aide de la souris ou cliquez sur les entêtes de colonne. Vous pouvez séléctionner plusieurs noeuds en gardant la touche "shift" ou "ctrl" enfoncée pendant votre séléction. Statistiques Titre (optionnel) Texte alternatif (optionnel) Type Dépublier +Dépublié Dernière édition Date/heure à laquelle ce document a été édité Supprimer le(s) fichier(s) @@ -174,18 +241,34 @@Eléments enfants Cible Ceci se traduit par l'heure suivante sur le serveur : -Qu'est-ce que cela signifie?]]> +Qu'est-ce que cela signifie?]]> +Etes-vous certain(e) de vouloir supprimer cet éléménent? +La propriété %0% utilise l'éditeur %1% qui n'est pas supporté par Nested Content. Ajouter un autre champ texte Enlever ce champ texte +Racine du contenu +Cette valeur est masquée. Si vous avez besoin de pouvoir accéder à cette valeur, veuillez prendre contact avec l'administrateur du site web. +Cette valeur est masquée. + +Créer un nouveau Modèle de Contenu à partir de '%0%' +Vide +Sélectionner un Modèle de Contenu +Modèle de Contenu créé +Un modèle de Contenu a été créé à partir de '%0%' +Un autre Modèle de Contenu existe déjà avec le même nom +Un Modèle de Contenu est du contenu pré-défini qu'un éditeur peut sélectionner et utiliser comme base pour la création de nouveau contenu +Cliquez pour télécharger Faites glisser vos fichier ici... Lien vers le média ou cliquez ici pour choisir un fichier Les seuls types de fichiers autorisés sont +Ce fichier ne peut pas ête chargé, il n'est pas d'un type de fichier autorisé. La taille maximum de fichier est - +Racine du média +Créer un nouveau membre Tous les membres @@ -193,6 +276,7 @@Où voulez-vous créer le nouveau %0% Créer un élément sous +Sélectionnez le type de document pour lequel vous souhaitez créer un modèle de contenu Choisissez un type et un titre "Types de documents".]]> "Types de médias".]]> @@ -221,7 +305,8 @@Invalider les changements Vous avez des changements en cours Etes-vous certain(e) de vouloir quitter cette page? - vous avez des changements en cours - +La dépublication va supprimer du site cette page ainsi que tous ses descendants. +Terminé @@ -280,7 +365,10 @@Cette macro ne contient aucune propriété éditable Coller Editer les permissions pour -Les éléments dans la corbeille sont en cours de suppression. Ne fermez pas cette fenêtre avant que cette opération soit terminée. +Définir les permissions pour +Définir les permissions pour %0% pour le groupe d'utilisateurs %1% +Sélectionnez les groupes d'utilisateurs pour lesquels vous souhaitez définir les permissions +Les éléments dans la corbeille sont en cours de suppression. Ne fermez pas cette fenêtre avant que cette opération soit terminée. La corbeille est maintenant vide Les éléments supprimés de la corbeille seront supprimés définitivement regexlib.com rencontre actuellement des problèmes sur lesquels nous n'avons aucun contrôle. Nous sommes sincèrement désolés pour le désagrément.]]> @@ -292,10 +380,14 @@Le cache du site va être mis à jour. Tous les contenus publiés seront mis à jour. Et tous les contenus dépubliés resteront invisibles. Nombre de colonnes Nombre de lignes -Définir un placeholder ID. En mettant un ID sur votre placeholder, vous pouvez injecter du contenu à cet endroit depuis les modèles enfants, - en faisant référence à cet ID au sein d'un élément -<asp:content />.]]>Séléctionnez un placeholder id dans la liste ci-dessous. Vous pouvez seulement - choisir un ID se trouvant dans le parent du modèle actuel.]]> ++ Définir un placeholder ID. En mettant un ID sur votre placeholder, vous pouvez injecter du contenu à cet endroit depuis les modèles enfants, + en faisant référence à cet ID au sein d'un élément +<asp:content />.]]> ++ Séléctionnez un placeholder ID dans la liste ci-dessous. Vous pouvez seulement + choisir un ID se trouvant dans le parent du modèle actuel.]]> + Cliquez sur l'image pour la voir en taille réelle Sélectionner un élément Voir l'élément de cache @@ -307,14 +399,19 @@Ouvre le document lié dans une nouvelle fenêtre ou un nouvel onglet Lier à un media Lier à un fichier +Sélectionner le noeud de base du contenu Sélectionner le media Sélectionner l'icône Sélectionner l'élément Sélectionner le lien Sélectionner la macro Sélectionner le contenu +Sélectionner le noeud de base des media Sélectionner le membre Sélectionner le groupe de membres +Sélectionner le noeud +Sélectionner les sections +Sélectionner les utilisateurs Aucune icone n'a été trouvée Il n'y a pas de paramètres pour cette macro Il n'y a pas de macro disponible à insérer @@ -329,9 +426,11 @@Selectionner un snippet -+ %0%' ci-dessous. + ]]> +
Vous pouvez ajouter d'autres langues depuis le menu ci-dessous "Langues". - ]]>Nom de Culture Modifiez la clé de l'élément de dictionaire. @@ -339,6 +438,7 @@ La clé '%0%' existe déjà. ]]> +Aperçu du dictionaire Votre nom d'utilisateur @@ -346,13 +446,16 @@Confirmation de votre mot de passe Nommer %0%... Entrez un nom... +Entrez un email... +Entrez un nom d'utilisateur... Libellé... Entrez une description... Rechercher... Filtrer... Ajouter des tags (appuyer sur enter entre chaque tag)... Entrez votre email -Votre nom d'utilisateur est généralement votre adresse email +Entrez un message... +Votre nom d'utilisateur est généralement votre adresse email Autoriser à la racine @@ -372,6 +475,11 @@Créer une liste personnalisée Supprimer la liste personnalisée + +Renommé +Entrez un nouveau nom de répertoire ici +%0% a été renommé en %1% +Ajouter une valeur de base Type de donnée en base de donées @@ -432,6 +540,7 @@Il y a une erreur de configuration du type de données utilisé pour cette propriété, veuillez vérifier le type de données. +Options A propos Action Actions @@ -472,18 +581,25 @@Erreur Trouver Premier +Général +Groupes Hauteur Aide +Cacher +Historique Icône Importer +Info Marge intérieure Insérer Installer Non valide Justifier +Libellé Langue Dernier Mise en page +Liens En cours de chargement Bloqué Connexion @@ -491,6 +607,7 @@Déconnexion Macro Obligatoire +Message Déplacer Plus Nom @@ -498,9 +615,12 @@Suivant Non de +Inactif OK Ouvrir +Actif ou +Trier par Mot de passe Chemin Placeholder ID @@ -509,13 +629,16 @@Propriétés Email de réception des données de formulaire Corbeille +Votre corbeille est vide Restant Enlever Renommer Renouveller Requis +Retrouver Réessayer Permissions +Publication Programmée Rechercher Désolé, nous ne pouvons pas trouver ce que vous recherchez Aucun élément n'a été ajouté @@ -524,6 +647,7 @@Afficher la page à l'envoi Taille Trier +Statut Envoyer Type Rechercher... @@ -550,6 +674,7 @@Sauvegarde... actuel Intégrer +Retrouver sélectionné @@ -559,7 +684,20 @@Jaune Orange Bleu +Bleu-gris +Gris +Brun +Bleu Clair +Cyan +Vert Clair +Limon +Ambre +Orange Foncé Rouge +Rose +Mauve +Mauve Foncé +Indigo @@ -590,7 +728,6 @@Général Editeur -Couleur de fond Gras @@ -598,7 +735,6 @@Police Texte -Page @@ -607,28 +743,38 @@Impossible de sauvegarder le fichier web.config. Veuillez modifier la "connection string" manuellement. Votre base de données a été détectée et est identifiée comme étant Configuration de la base de données -+ installer pour installer la base de données Umbraco %0% - ]]> + ]]> +Suivant pour poursuivre.]]> -Base de données non trouvée ! Veuillez vérifier les informations de la "connection string" dans le fichier web.config. + ++ Base de données non trouvée ! Veuillez vérifier les informations de la "connection string" dans le fichier web.config. -Pour poursuivre, veuillez éditer le fichier "web.config" (avec Visual Studio ou votre éditeur de texte favori), scroller jusqu'en bas, ajouter le "connection string" pour votre base de données dans la ligne avec la clé "umbracoDbDSN" et sauvegarder le fichier.
Cliquez sur le bouton Réessayer lorsque cela est fait. -
]]>
- Plus d'informations sur l'édition du fichier web.config ici.+ +
+ Plus d'informations sur l'édition du fichier web.config ici.]]> ++ Veuillez contacter votre fournisseur de services internet si nécessaire. - Si vous installez Umbraco sur un ordinateur ou un serveur local, vous aurez peut-être besoin de consulter votre administrateur système.]]> -+ ++ Appuyez sur le bouton Upgrader pour mettre à jour votre base de données vers Umbraco %0% -N'ayez pas d'inquiétude : aucun contenu ne sera supprimé et tout continuera à fonctionner parfaitement par après !
- ]]>Appuyez sur Suivant pour - poursuivre. ]]> + ]]> ++ Appuyez sur Suivant pour + poursuivre. ]]> + Suivant pour poursuivre la configuration]]> Le mot de passe par défaut doit être modifié !]]> L'utilisateur par défaut a été désactivé ou n'a pas accès à Umbraco! @@ -640,41 +786,56 @@Aucune autre action n'est requise. Cliquez sur Suivant pour poursuivre.]]>
Fichiers et dossiers concernés Plus d'informations sur la configuration des permissions Vous devez donner à ASP.NET les droits de modification sur les fichiers/dossiers suivants -Vos configurations de permissions sont presque parfaites ! +
- Vous pouvez faire fonctionner Umbraco sans problèmes, mais vous ne serez pas en mesure d'installer des packages, ce qui est hautement recommandé pour tirer pleinement profit d'Umbraco.]]>+ Vos configurations de permissions sont presque parfaites !
+ Vous pouvez faire fonctionner Umbraco sans problèmes, mais vous ne serez pas en mesure d'installer des packages, ce qui est hautement recommandé pour tirer pleinement profit d'Umbraco.]]> +Comment résoudre Cliquez ici pour lire la version texte tutoriel vidéo sur la définition des permissions des répertoires pour Umbraco, ou lisez la version texte.]]> -Vos configurations de permissions pourraient poser problème ! + ++ Vos configurations de permissions pourraient poser problème ! -
- Vous pouvez faire fonctionner Umbraco sans problèmes, mais vous ne serez pas en mesure d'installer des packages, ce qui est hautement recommandé pour tirer pleinement profit d'Umbraco.]]>Vos configurations de permissions ne sont pas prêtes pour Umbraco ! + Vous pouvez faire fonctionner Umbraco sans problèmes, mais vous ne serez pas en mesure d'installer des packages, ce qui est hautement recommandé pour tirer pleinement profit d'Umbraco.]]> + ++ Vos configurations de permissions ne sont pas prêtes pour Umbraco ! -
- Pour faire fonctionner Umbraco, vous aurez besoin de mettre à jour les permissions sur les fichiers/dossiers.]]>Vos configurations de permissions sont parfaites ! + Pour faire fonctionner Umbraco, vous aurez besoin de mettre à jour les permissions sur les fichiers/dossiers.]]> +
- Vous êtes prêt(e) à faire fonctionner Umbraco et à installer des packages !]]>+ Vos configurations de permissions sont parfaites !
+ Vous êtes prêt(e) à faire fonctionner Umbraco et à installer des packages !]]> +Résoudre un problème sur un dossier Suivez ce lien pour plus d'informations sur les problèmes avec ASP.NET et la création de dossiers Définir les permissions de dossier -+ + ]]> +Je veux démarrer "from scratch" -+ Apprenez comment) Vous pouvez toujours choisir d'installer Runway plus tard. Pour cela, allez dans la section "Développeur" et sélectionnez "Packages". - ]]> + ]]> +Vous venez de mettre en place une plateforme Umbraco toute nette. Que voulez-vous faire ensuite ? Runway est installé -+ Voici la liste des modules recommandés, cochez ceux que vous souhaitez installer, ou regardez la liste complète des modules - ]]> + ]]> +Recommandé uniquement pour les utilisateurs expérimentés Je veux commencer avec un site simple -+ "Runway" est un site simple qui fournit des types de documents et des modèles de base. L'installateur peut mettre en place Runway automatiquement pour vous, mais vous pouvez facilement l'éditer, l'enrichir, ou le supprimer par la suite. Il n'est pas nécessaire, et vous pouvez parfaitement vous en passer pour utiliser Umbraco. Cela étant dit, @@ -685,7 +846,8 @@ Inclus avec Runway : Home page, Getting Started page, Installing Modules page. + ]]> +
Modules optionnels : Top Navigation, Sitemap, Contact, Gallery. - ]]>Qu'est-ce que Runway Etape 1/5 : Accepter la licence Etape 2/5 : Configuration de la base de données @@ -693,24 +855,36 @@Etape 4/5 : Sécurité Umbraco Etape 5/5 : Umbraco est prêt Merci d'avoir choisi Umbraco -Parcourir votre nouveau site -Vous avez installé Runway, alors pourquoi ne pas jeter un oeil au look de votre nouveau site ?]]> -Aide et informations complémentaires -Obtenez de l'aide de notre "award winning" communauté, parcourez la documentation ou regardez quelques vidéos gratuites sur la manière de construire un site simple, d'utiliser les packages ainsi qu'un guide rapide sur la terminologie Umbraco]]> ++ Parcourir votre nouveau site +Vous avez installé Runway, alors pourquoi ne pas jeter un oeil au look de votre nouveau site ?]]> + ++ Aide et informations complémentaires +Obtenez de l'aide de notre communauté "award winning", parcourez la documentation ou regardez quelques vidéos gratuites sur la manière de construire un site simple, d'utiliser les packages ainsi qu'un guide rapide sur la terminologie Umbraco]]> + Umbraco %0% est installé et prêt à être utilisé -fichier /web.config et mettre à jour le paramètre AppSetting umbracoConfigurationStatus situé en bas à la valeur '%0%'.]]> -démarrer instantanément en cliquant sur le bouton "Lancer Umbraco" ci-dessous. -
-Si vous débutez avec Umbraco, vous pouvez trouver une foule de ressources dans nos pages "Getting Started".]]>Lancer Umbraco -Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à ajouter du contenu, à mettre à jour les modèles d'affichage et feuilles de styles ou à ajouter de nouvelles fonctionnalités]]> ++ fichier /web.config et mettre à jour le paramètre AppSetting umbracoConfigurationStatus situé en bas à la valeur '%0%'.]]> + ++ démarrer instantanément en cliquant sur le bouton "Lancer Umbraco" ci-dessous. +
+Si vous débutez avec Umbraco, vous pouvez trouver une foule de ressources dans nos pages "Getting Started".]]> ++ Lancer Umbraco +Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à ajouter du contenu, à mettre à jour les modèles d'affichage et feuilles de styles ou à ajouter de nouvelles fonctionnalités]]> + La connexion à la base de données a échoué. Umbraco Version 3 Umbraco Version 4 Regarder -Umbraco %0%, qu'il s'agisse d'une nouvelle installation ou d'une mise à jour à partir de la version 3.0 + + Umbraco %0%, qu'il s'agisse d'une nouvelle installation ou d'une mise à jour à partir de la version 3.0 + Appuyez sur "suivant" pour commencer l'assistant.]]> +
- Appuyez sur "suivant" pour commencer l'assistant.]]>Code de la Culture @@ -721,13 +895,13 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àRenouvellez votre session maintenant pour sauvegarder votre travail -Joyeux dimanche -Joyeux lundi -Joyeux mardi -Joyeux mercredi +Joyeux dimanche détonnant +Joyeux lundi lumineux +Joyeux mardi magique +Joyeux mercredi merveilleux Joyeux jeudi Joyeux vendredi -Joyeux samedi +Joyeux chamedi Connectez-vous ci-dessous Identifiez-vous avec La session a expiré @@ -735,13 +909,95 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àMot de passe oublié? Un email contenant un lien pour ré-initialiser votre mot de passe sera envoyé à l'adresse spécifiée Un email contenant les instructions de ré-initialisation de votre mot de passe sera envoyée à l'adresse spécifiée si elle correspond à nos informations. +Montrer le mot de passe +Cacher le mot de passe Revenir au formulaire de connexion Veuillez fournir un nouveau mot de passe Votre mot de passe a été mis à jour Le lien sur lequel vous avez cliqué est non valide ou a expiré. Umbraco: Ré-initialiser le mot de passe - Votre nom d'utilisateur pour vous connecter au back-office Umbraco est : %0%. @@ -765,7 +1021,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àCliquez ici pour ré-initialiser votre mot de passe, ou recopiez cet URL dans votre navigateur :
%1%
]]> + + + + + + + ++
++ ++ ++
++ ++ + ++ ++ +
+ + + ]]>+ ++ +++
++
++ ++ ++
++ ++ ++ Une réinitialisation de votre mot de passe a été demandée +
++ Votre nom d'utilisateur pour vous connecter au back-office Umbraco est : %0% +
++
+ +
+ ++ + ++ + Cliquez sur ce lien pour réinitialiser votre mot de passe + + +Si vous ne pouvez pas cliquer sur le lien, recopiez cet URL dans votre navigateur :
++
+ ++ ++ + %1% + + +
+Editez vos notifications pour %0% -+ -Hello %0% - - Ceci est un email automatique pour vous informer que la tâche '%1%' - a été executée sur la page '%2%' - par l'utilisateur '%3%' -
- --
Résumé de la mise à jour :
-- %6% + ]]> + +
+ + + + + + + + + + + ]]> ++
++ ++ ++
++ ++ + ++ ++ +
- - - - -+ + +++
++
++ ++ ++
++ ++ ++ Salut %0%, +
++ Ceci est un email automatique pour vous informer que la tâche '%1%' a été exécutée sur la page '%2%' par l'utilisateur '%3%' +
++ +
++ + ++ +
++ + MODIFIER +
Résumé de la mise à jour :
++ %6% +
+ ++ Bonne journée !
+
+ Avec les salutations du Robot Umbraco +
+Bonne journée !
]]>
- Avec les salutations du Robot Umbraco -La notification [%0%] à propos de %1% a été executée sur %2% Notifications -+ et localisez le package. Les packages Umbraco ont généralement une extension ".umb" ou ".zip". - ]]> + ]]> +Déposez pour uploader ou cliquez ici pour choisir les fichiers Uploader un package @@ -852,8 +1165,10 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àMeta data du package Nom du package Le package ne contient aucun élément -
- Vous pouvez supprimer tranquillement ce package de votre installation en cliquant sur "Désinstaller le package" ci-dessous.]]>+
+ Vous pouvez supprimer tranquillement ce package de votre installation en cliquant sur "Désinstaller le package" ci-dessous.]]> +Aucune mise à jour disponible Options du package Package readme @@ -862,9 +1177,11 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àLe package a été désinstallé Le package a été désinstallé avec succès Désinstaller le package -+ + Remarque : tous les documents, media etc. dépendant des éléments que vous supprimez vont cesser de fonctionner, ce qui peut provoquer une instabilité du système, - désinstallez donc avec prudence. En cas de doute, contactez l'auteur du package.]]> + désinstallez donc avec prudence. En cas de doute, contactez l'auteur du package.]]> +Télécharger la mise à jour depuis le repository Mettre à jour le package Instructions de mise à jour @@ -913,32 +1230,51 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à %0% n'a pas pu être publié car cet élément est programmé pour être publié bientôt. ]]> -+ -+ ++ -+ ++ -+ ++ + ]]> +Inclure les pages enfant non publiées Publication en cours - veuillez patienter... %0% pages sur %1% ont été publiées... %0% a été publié %0% et ses pages enfants ont été publiées Publier %0% et toutes ses pages enfant -Publier pour publier %0% et la rendre ainsi accessible publiquement.
++ Publier pour publier %0% et la rendre ainsi accessible publiquement. + ]]> +
Vous pouvez publier cette page et toutes ses sous-pages en cochant Inclure les pages enfant non pubiées ci-dessous. - ]]>Vous n'avez configuré aucune couleur approuvée - + +Vous avez choisi un élément de contenu actuellement supprimé ou dans la corbeille +Vous avez choisi des éléments de contenu actuellement supprimés ou dans la corbeille + + +Vous avez choisi un élément media actuellement supprimé ou dans la corbeille +Vous avez choisi des éléments media actuellement supprimés ou dans la corbeille +Elément supprimé + +introduire un lien externe choisir une page interne Légende @@ -1021,6 +1357,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àValidation Les erreurs de validation doivent être corrigées avant de pouvoir sauvegarder l'élément Echec +Sauvegardé Permissions utilisateur insuffisantes, l'opération n'a pas pu être complétée Annulation L'opération a été annulée par une extension tierce @@ -1054,6 +1391,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àErreur lors de la sauvegarde de l'utilisateur (consultez les logs) Utilisateur sauvegardé Type d'utilisateur sauvegardé +Groupe d'utilisateurs sauvegardé Fichier non sauvegardé Le fichier n'a pas pu être sauvegardé. Vérifiez les permissions de fichier. Fichier sauvegardé @@ -1079,11 +1417,34 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àVue partielle sauvegardée sans erreurs ! Vue partielle non sauvegardée Une erreur est survenue lors de la sauvegarde du fichier. +Permissions sauvegardées pour Vue script sauvegardée Vue script sauvegardée sans erreur ! Vue script non sauvegardée Une erreur est survenue lors de la sauvegarde du fichier. Une erreur est survenue lors de la sauvegarde du fichier. +%0% groupes d'utilisateurs supprimés +%0% a été supprimé +%0% utilisateurs activés +Une erreur est survenue lors de l'activation des utilisateurs +%0% utilisateurs désactivés +Une erreur est survenue lors de la désactivation des utilisateurs +%0% est à présent activé +Une erreur est survenue lors de l'activation de l'utilisateur +%0% est à présent désactivé +Une erreur est survenue lors de la désactivation de l'utilisateur +Les groupes d'utilisateurs ont été définis +%0% groupes d'utilisateurs supprimés +%0% a été supprimé +%0% utilisateurs débloqués +Une erreur est survenue lors du débloquage des utilisateurs +%0% est à présent débloqué +Une erreur est survenue lors du débloquage de l'utilisateur +Le membre a été exporté vers le fichier +Une erreur est survenue lors de l'export du membre +L'utilisateur %0% a été supprimé +Inviter l'utilisateur +L'invitation a été envoyée à nouveau à %0% Utilise la syntaxe CSS. Ex : h1, .redHeader, .blueTex @@ -1201,7 +1562,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à -Rich Text Editor +Rich Text Editor Image Macro Embed @@ -1244,6 +1605,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àAutoriser tous les éditeurs Autoriser toutes les configurations de rangées +Eléments maximum +Laisser vide ou mettre à 0 pour un nombre illimté Configurer comme défaut Choisir en plus Choisir le défaut @@ -1308,11 +1671,27 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àutilisant cet éditeur seront mis à jour avec la nouvelle configuration Le membre peut éditer -Afficher dans le profil du membre - +Autoriser la modification de la valeur de cette propriété par le membre à partir de sa page de profil +Est une donnée sensible +Cacher cette propriété aux éditeurs de contenu qui n'ont pas accès à la visualisation des données sensibles +Afficher dans le profil du membre +Permettre d'afficher la valeur de cette propriété sur la page de profil du membre + +l'onglet n'a pas d'ordre de tri + +Où cette composition est-elle utilisée? +Cette composition est actuellement utilisée dans la composition des types de contenu suivants : - + +Fabrication des modèles +ceci peut prendre un peu de temps, ne vous inquiétez pas +Modèles générés +Les modèles n'ont pas pu être générés +La génération des modèles a échoué, voyez les exceptions dans les U log + + +Ajouter un champ de rechange Champ de rechange Ajouter une valeur par défaut @@ -1353,10 +1732,12 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àTâches qui vous sont assignées -vous sont assignées. Pour voir un aperçu détaillé incluant les commentaires, cliquez sur "Détails" ou juste sur le nom de la page. + + vous sont assignées. Pour voir un aperçu détaillé incluant les commentaires, cliquez sur "Détails" ou juste sur le nom de la page. Vous pouvez aussi télécharger la page au format XML en cliquant sur le lien "Télécharger XML". + ]]> +
Pour clôturer une tâche de traduction, allez sur Détails, puis cliquez sur le bouton "Terminer la tâche". - ]]>Terminer la tâche Détails Télécharger toutes les tâches de traductions au format XML @@ -1364,7 +1745,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àTélécharger la DTD XML Champs Inclure les pages enfants -+ + ]]> +[%0%] tâches de traductions pour %1% Aucun utilisateur traducteur trouvé. Veuillez créer un utilisateur traducteur avant d'envoyer du contenu pour traduction Tâches que vous avez créées -que vous avez créées. Pour voir un aperçu détaillé incluant les commentaires, + + que vous avez créées. Pour voir un aperçu détaillé incluant les commentaires, cliquez sur "Détails" ou juste sur le nom de la page. Vous pouvez aussi télécharger la page au format XML en cliquant sur le lien "Télécharger XML". Pour clôturer une tâche de traduction, allez sur Détails, puis cliquez sur le bouton "Terminer tâche". - ]]> + ]]> +La page '%0%' a été envoyée pour traduction Veuillez choisir la langue dans laquelle le contenu doit être traduit Envoyer la page '%0%' pour traduction @@ -1401,6 +1786,9 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àUploader le fichier de traduction XML +Contenu +Types de contenu +Media Navigateur de cache Corbeille Packages créés @@ -1421,6 +1809,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àTypes de relations Packages Packages +Vues Partielles +Vues Partielles pour les Fichiers Macro Fichiers Python Installer depuis le repository Installer Runway @@ -1431,8 +1821,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àModèles Fichiers XSLT Analytique -Vues partielles -Fichiers Macro pour les vues partielles +Utilisateurs Nouvelle mise à jour disponible @@ -1441,23 +1830,45 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àErreur lors de la recherche de mises à jour. Veuillez vérifier le stack trace pour obtenir plus d'informations sur l'erreur. +Accès +Sur base des groupes et des noeuds de départ, l'utilisateur a accès aux noeuds suivants +Donner accès Administrateur Champ catégorie +Utilisateur créé Changer le mot de passe +Changer la photo Nouveau mot de passe +n'a pas été bloqué +Le mot de passe n'a pas été modifié Confirmez votre nouveau mot de passe Vous pouvez changer votre mot de passe d'accès au Back Office Umbraco en remplissant le formulaire ci-dessous puis en cliquant sur le bouton "Changer le mot de passe" Canal de contenu +Créer un autre utilisateur +Créer de nouveaux utilisateurs pour leur donner accès à Umbraco. Lors de la création d'un nouvel utilisateur, un mot de passe est généré que vous pouvez partager avec ce dernier. Champ description Désactiver l'utilisateur Type de document Editeur Champ extrait +Tentatives de connexion échouées +Voir le profil de l'utilisateur +Ajouter des groupes pour donner les accès et permissions +Inviter un autre utilisateur +Inviter de nouveaux utilisateurs pour leur donner accès à Umbraco. Un email d'invitation sera envoyé à chaque utilisateur avec des informations concernant la connexion à Umbraco. Langue +Spécifiez la langue dans laquelle vous souhaitez voir les menus et dialogues +Date du dernier bloquage +Dernière connexion +Dernière modification du mot de passe Identifiant Noeud de départ dans la librarie de média +Limiter la librairie média à un noeud de départ spécifique +Noeuds de départ dans la librairie de média +Limiter la librairie média à des noeuds de départ spécifique Sections Désactiver l'accès Umbraco +ne s'est pas encore connecté Ancien mot de passe Mot de passe Réinitialiser le mot de passe @@ -1472,17 +1883,153 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àRemplacer les permissions sur les noeuds enfants Vous êtes en train de modifiez les permissions pour les pages : Choisissez les pages dont les permissions doivent être modifiées +Supprimer la photo +Permissions par défaut +Permissions granulaires +Définir les permissions sur des noeuds spécifiques +Profil Rechercher tous les enfants +Ajouter les sections auxquelles les utilisateurs peuvent accéder +Sélectionner les groupes d'utilisateurs +Aucun noeud de départ sélectionné +Aucun noeud de départ sélectionné +Actif +Tous +Désactivé +Bloqué +Invité Noeud de départ du contenu +Limiter l'arborescence de contenu à un noeud de départ spécifique +Noeuds de départ du contenu +Limiter l'arborescence de contenu à des noeuds de départ spécifiques +Nom (A-Z) +Nom (Z-A) +Plus récent +Plus ancien +Dernière connexion +Dernière mise à jour de l'utilisateur +a été créé +Le nouvel utilisateur a été créé avec succès. Utilisez le mot de passe ci-dessous pour la connexion à Umbraco. +Gestion des utilisateurs Nom d'utilisateur -Permissions utilisateur +Permissions de l'utilisateur +Permissions du groupe d'utilisateurs +Groupe d'utilisateurs +Groupes d'utilisateurs +a été invité +Une invitation a été envoyée au nouvel utilisateur avec les détails concernant la connexion à Umbraco. +Bien le bonjour et bienvenue dans Umbraco! Vous serez prêt.e dans moins d'1 minute, vous devez encore simplement configurer votre mot de passe et ajouter une photo pour votre avatar. +Chargez une photo afin que les autres utilisateurs puissent vous reconnaître facilement. Rédacteur Traducteur Modifier Votre profil Votre historique récent La session expire dans +Inviter un utilisateur +Créer un utilisateur +Envoyer l'invitation +Retour aux utilisateurs +Umbraco: Invitation ++ + + + + + + + ++
++ ++ ++
++ ++ + ++ ++ +
+ + ]]> ++ ++ +++
++
++ ++ ++
++ ++ ++ Salut %0%, +
++ Vous avez été invité.e par %1% à accéder au Umbraco Back Office. +
++ Message de %1%: +
+
+ %2% ++ +
++ + ++ ++ +
++ + ++ + Cliquez sur ce lien pour accepter l'invitation + + +Si vous ne pouvez pas cliquer sur le lien, copiez cet URL dans votre navigateur :
++
+ ++ ++ + %3% + + +
+Inviter +Nouvel envoi de l'invitation en cours... +Supprimer l'Utilisateur +Etes-vous certain(e) de vouloir supprimer le compte de cet utilisateur? +Validation Valider comme email @@ -1541,8 +2088,14 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àTotal XML : %0%, Total : %1% Total XML : %0%, Total publié : %1% +Base de données - Le schéma de la base de données est correct pour cette version de Umbraco +%0% problèmes ont été détectés avec le schéma de votre base de données (Voyez le fichier log pour les détails) +Des erreurs ont été détectées lors de la validation du schéma de la base de données par rapport à la version actuelle de Umbraco. +Le certificat de votre site a été marqué comme valide. Erreur de validation du certificat : '%0%' +Le certificat SSL de votre site web a expiré. +Le certificat SSL de votre site web va expirer dans %0% jours. Erreur en essayant de contacter l'URL %0% - '%1%' Vous êtes actuellement %0% à voir le site via le schéma HTTPS. La valeur appSetting 'umbracoUseSSL' est fixée à 'false' dans votre fichier web.config. Une fois que vous donnerez accès à ce site en utilisant le schéma HTTPS, cette valeur devra être mise à 'true'. @@ -1588,6 +2141,21 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àUne configuration générant un header qui empêche l'intégration du site par d'autres sites via IFRAME a été ajoutée à votre fichier web.config. Impossible de modifier le fichier web.config. Erreur : %0% +X-Content-Type-Options utilisé pour la protection contre les vulnérabilités de MIME sniffing a été trouvé.]]> +X-Content-Type-Options utilisé pour la protection contre les vulnérabilités de MIME sniffing n'a pas été trouvé.]]> +Ajoute une valeur dans la section httpProtocol/customHeaders du fichier web.config pour protéger contre les vulnérabilités de MIME sniffing. +Une configuration a été ajoutée dans votre fichier web.config pour créer un header protégeant contre les vulnérabilités de MIME sniffing. + +Strict-Transport-Security, aussi connu sous le nom de HSTS-header, a été trouvé.]]> +Strict-Transport-Security, aussi connu sous le nom de HSTS-header, n'a pas été trouvé.]]> +Ajoute l'en-tête 'Strict-Transport-Security' avec la valeur 'max-age=10886400; preload' à la section httpProtocol/customHeaders du fichier web.config. Utilisez cette correction uniquement si vos domaines vont fonctionner en https pour les 18 prochaines semaines (minimum). +L'en-tête HSTS a été ajouté dans votre fichier web.config. + +X-XSS-Protection a été trouvé.]]> +X-XSS-Protection n'a pas été trouvé.]]> +Ajoute l'en-tête 'X-XSS-Protection' avec la valeur '1; mode=block' à la section httpProtocol/customHeaders du fichier web.config. +L'en-tête X-XSS-Protection a été ajouté dans votre fichier web.config. + @@ -1601,6 +2169,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à%0%.]]> %0%.]]> +Les résultats de l'exécution du Umbraco Health Checks planifiée le %0% à %1% sont les suivants :
%2%]]>Statut du Umbraco Health Check Désactiver URL tracker @@ -1622,5 +2192,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez àPas d'élément de dictionaire à choisir + +caractères restant + - diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index 686ac9f837..1e3258976a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -2,7 +2,7 @@The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Filesנהל שמות מתחם @@ -383,7 +383,7 @@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.
]]>
+ done.
More information on editing web.config here.Please contact your ISP if necessary. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index 6132c2a7ab..dba069327e 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -2,7 +2,7 @@ +The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesGestisci hostnames @@ -127,38 +127,38 @@Benvenuto -Stay -Discard changes -You have unsaved changes -Are you sure you want to navigate away from this page? - you have unsaved changes +Rimani +Scarta le modifiche +Hai delle modifiche non salvate +Sei sicuro di voler lasciare questa pagina? - hai delle modifiche non salvate -Done +Fatto -Deleted %0% item -Deleted %0% items -Deleted %0% out of %1% item -Deleted %0% out of %1% items +Elimianto %0% elemento +Elimianto %0% elementi +Eliminato %0% su %1% elemento +Eliminato %0% su %1% elementi -Published %0% item -Published %0% items -Published %0% out of %1% item -Published %0% out of %1% items +Pubblicato %0% elemento +Pubblicato %0% elementi +Pubblicato %0% su %1% elemento +Pubblicato %0% su %1% elementi -Unpublished %0% item -Unpublished %0% items -Unpublished %0% out of %1% item -Unpublished %0% out of %1% items +%0% elemento non pubblicato +%0% elementi non pubblicati +Elementi non pubblicati - %0% su %1% +Elementi non pubblicati - %0% su %1% -Moved %0% item -Moved %0% items -Moved %0% out of %1% item -Moved %0% out of %1% items +Spostato %0% elemento +Spsotato %0% elementi +Spostato %0% su %1% elemento +Spostato %0% su %1% elementi -Copied %0% item -Copied %0% items -Copied %0% out of %1% item -Copied %0% out of %1% items +Copiato %0% elemento +Copiato %0% elementi +Copiato %0% su %1% elemento +Copiato %0% su %1% elementi Titolo del Link @@ -381,7 +381,7 @@Avanti per proseguire.]]> Database non trovato! Perfavore, controlla che le informazioni della stringa di connessione nel file "web.config" siano corrette. - Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.
Clicca il tasto riprova quando hai finito.
]]> +
Maggiori dettagli per la modifica del file web.config qui.Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.
Clicca il tasto riprova quando hai finito.
]]>
Maggiori dettagli per la modifica del file web.config qui.Premi il tasto aggiorna per aggiornare il database ad Umbraco %0% @@ -738,43 +738,43 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e iNon preoccuparti, il contenuto non verrà perso e tutto continuerà a funzionare dopo l'aggiornamento!
]]>Embed Headline Quote -Choose type of content -Choose a layout -Add a row -Add content -Drop content -Settings applied +Seleziona il tipo di contenuto +Seleziona un layout +Aggiungi una riga +Aggiungi contenuto +Elimina contenuto +Impostazioni applicati -This content is not allowed here -This content is allowed here +Questo contenuto non è consentito qui +Questo contenuto è consentito qui -Click to embed -Click to insert image -Image caption... -Write here... +Clicca per incorporare +Clicca per inserire l'immagine +Didascalia dell'immagine... +Scrivi qui... -Grid Layouts -Layouts are the overall work area for the grid editor, usually you only need one or two different layouts -Add Grid Layout -Adjust the layout by setting column widths and adding additional sections -Row configurations -Rows are predefined cells arranged horizontally -Add row configuration -Adjust the row by setting cell widths and adding additional cells +I Grid Layout +I layout sono l'area globale di lavoro per il grid editor, di solito ti serve solo uno o due layout differenti +Aggiungi un Grid Layout +Sistema il layout impostando la larghezza della colonna ed aggiungendo ulteriori sezioni +Configurazioni della riga +Le righe sono le colonne predefinite disposte orizzontalmente +Aggiungi configurazione della riga +Sistema la riga impostando la larghezza della colonna ed aggiungendo ulteriori colonne -Columns -Total combined number of columns in the grid layout +Colonne +Totale combinazioni delle colonne nel grid layout -Settings -Configure what settings editors can change +Impostazioni +Configura le impostazioni che possono essere cambiate dai editori -Styles -Configure what styling editors can change +Stili +Configura i stili che possono essere cambiati dai editori -Settings will only save if the entered json configuration is valid +Le impostazioni verranno salvate soltanto se è valido il json inserito -Allow all editors -Allow all row configurations +Permetti tutti i editor +Permetti tutte le configurazioni della riga diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index fb5918db81..2d53b99237 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Filesドメインの割り当て diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index 01c2704178..ab830a39a5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -2,7 +2,7 @@The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files호스트명 관리 @@ -378,7 +378,7 @@데이터베이스를 찾을 수 없습니다. “web.config”파일의 "connection string"이 바르게 설정되었는지 확인하세요. "web.config" 파일에 맨아래에 ,키네임을 "UmbracoDbDSN"로 하여 사용하시는 데이터베이스의 connection string 정보를 입력하시고 파일을 저장하세요.
- 완료 후재시도버튼을 누르세요.
]]>
+ 완료 후재시도버튼을 누르세요.
web.config의 더많은 정보는 여기에 있습니다.필요하시다면 사용하시는 ISP쪽에 문의하시기 바랍니다.. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index d398a839ec..211f7f6e48 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesBeheer domeinnamen @@ -36,6 +36,10 @@Sorteren Vertalen Bijwerken +Rechten instellen +Deblokkeer +Content sjabloon aanmaken +Uitnodiging opnieuw versturen Toegang geweigerd. @@ -171,7 +175,14 @@Subitems Doel Dit betekend de volgende tijd op de server: -Wat houd dit in?]]> +Wat houd dit in?]]> +Ben je er zeker van dat je dit item wilt verwijderen? +Eigenschap %0% gebruikt editor %1% welke niet wordt ondersteund door Nested Content. +Voeg nog een tekstvak toe +Verwijder dit tekstvak +Content root +Deze waarde is verborgen. Indien u toegang nodig heeft om deze waarde te bekijken, contacteer dan uw website administrator. +Deze waarde is verborgen Klik om te uploaden @@ -214,6 +225,7 @@Negeer wijzigingen Wijzigingen niet opgeslagen Weet je zeker dat deze pagina wilt verlaten? - er zijn onopgeslagen wijzigingen +Depubliceren zal deze pagina en alle onderliggend paginas verwijderen van de site. Done @@ -506,6 +518,7 @@Verstuur Typen Typ om te zoeken... +onder Omhoog Update Upgrade @@ -574,7 +587,7 @@Database configuratie installeren om de Umbraco %0% database te installeren]]> Volgende om door te gaan.]]> -De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is. +Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.
Klik op de knop opnieuw proberen als je hiermee klaar bent.
]]>
Meer informatie over het aanpassen van de web.config vind je hier.De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is. Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.
Klik op de knop opnieuw proberen als je hiermee klaar bent.
]]>
Meer informatie over het aanpassen van de web.config vind je hier.Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]> Klik de upgrade knop om je database te upgraden naar Umbraco %0% Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken!
]]>Klik Volgende om verder te gaan.]]> @@ -1018,6 +1031,28 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als jeScript view niet opgeslagen Er is een fout opgetreden bij het opslaan van dit bestand. Er is een fout opgetreden bij het opslaan van dit bestand. +%0% gebruikersgroepen verwijderd +%0% is verwijderd +%0% gebruikers geactiveerd +Er heeft zich een fout voorgedaan tijdens het activeren van de gebruikers +%0% users gedeactiveerd +Er heeft zich een fout voorgedaan tijdens het deactiveren van de gebruikers +%0% is nu geactiveerd +Er heeft zich een fout voorgedaan tijdens het activeren van de gebruiker +%0% is nu gedeactiveerd +Er heeft zich een fout voorgedaan tijdens het deactiveren van de gebruiker +Gebruikers groepen zijn ingesteld +%0% gebruikersgroepen verwijderd +%0% is verwijderd +%0% gebruikers gedeblokkeerd +Er heeft zich een fout voorgedaan tijdens het deblokkeren van de gebruikers +%0% is nu gedeblokkeerd +Er heeft zich een fout voorgedaan tijdens het deblokkeren van de gebruikers +Lid is geexporteerd naar een bestand +Er heeft zich een fout voorgedaan tijdens het exporteren van het lid +Gebruiker %0% is verwijderd +Gebruiker uitnodigen +Uitnodiging is opnieuw gestuurd naar gebruiker %0% Gebruik CSS syntax bijv: h1, .redHeader, .blueTex @@ -1146,7 +1181,12 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als jedie gebruik maken van deze editor zullen geupdate worden met deze nieuwe instellingen Lid kan bewerken +Toestaan dat deze eigenschap kan worden gewijzigd door het lid op zijn profiel pagina. +Omvat gevoelige gegevens +Verberg deze eigenschap voor de content editor die geen toegang heeft tot het bekijken van gevoelige informatie. Toon in het profiel van leden +Toelaten dat deze eigenschap wordt getoond op de profiel pagina van het lid. +tab heeft geen sorteervolgorde @@ -1274,23 +1314,45 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op deEr is een fout opgetreden bij het zoeken naar een update. Bekijk de trace-stack voor verdere informatie. +Toegang +Gebaseerd op de gebruikers groepen en start pagina's heeft de bruiker toegang tot de volgende pagina's +Toegang geven Beheerders Categorieveld +Gebruiker aangemaakt Verander je wachtwoord +Wijzig je foto Wijzig je wachtwoord +is niet gedeblokkeerd +Het wachtwoord is niet gewijzigd Bevestig nieuw password Je kunt je wachtwoord veranderen door onderstaan formulier in te vullen en op de knop 'Verander wachtwoord' te klikken Inhoudskanaal +Nog een gebruiker aanmaken +Maak nieuwe gebruikers aan om hun toegang te geven tot Umbraco. Wanneer een nieuwe gebruiker wordt aangemaakt wordt er een wachtwoord gegenereerd dat je met hun kan delen. Omschrijving Geblokkeerde gebruiker Documenttype Redacteur Samenvattingsveld +Foute wachtwoord pogingen +Ga naar gebruikersprofiel +Voeg gebruikersgroepen toe om rechten in te stellen +Nog een gebruiker uitnodigen +Nodig gebruikers uit om hen toegang te geven to Umbraco. Een uitnodiging wordt via e-mail verstuurd met instructies hoe de gebruiker kan inloggen. Taal +Stel de taal in die gebruiker zal zien in menu's en dialoog vensters +Laatst geblokkeerd datu, +Laatste keer ingelogd +Laatste keer paswoord gewijzigd Loginnaam Startnode in Mediabibliotheek +Beperk de mediabibliotheek tot een specifieke startnode +Startnodes in Mediabibliotheek +Beperk de mediabibliotheek tot een specifieke startnodes Secties Blokkeer Umbraco toegang +heeft nog niet ingelogd Oude wachtwoord Wachtwoord Reset wachtwoord @@ -1305,16 +1367,151 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op deVervang rechten op de subitems U bent momenteel rechten aan het aanpassen voor volgende pagina's: Selecteer pagina's om hun rechten aan te passen -Doorzoek alle subitems -Startnode in Content +Verwijder je foto +Standaard rechten +Specifieke rechten +Geef rechten op specifieke nodes +Profiel +Doorzoek alle subitems +Geef de gebruiker toegang tot secties +Selecteer een gebruikersgroep +Geen startnode geselecteerd +Geen startnodes geselecteerd +Actief +Alles +Gedeactiveerd +Geblokkeerd +Uitgenodigd +Startnode in Content +Beperk de content toegan een specifieke start node +Startnodes in Content +Beperk de content toegan een specifieke start nodes +Naam (A-Z) +Naam (Z-A) +Nieuwste +Oudste +Laatste inlog +Laatste keer bijgewerkt +is aangemaakt +De gebruiker is aangemaakt. Om in te loggen in Umbraco gebruik je onderstaand wachtwoord. +Gebruikers beheren Gebruikersnaam Gebruikersrechten +Gebruikersgroep rechten +Gebruikersgroep +Gebruikersgroepen +is uitgenodigd +Een uitnodiging is gestuurd naar de nieuwe gebruiker met informatie over hoe in te loggen in Umbraco +Hallo en welk in Umbraco! Binnen ongeveer 1 minuut kan je aan de slag. Je moet enkel je wachtwoord instellen en een foto toevoegen. +Wijzig je foto zodat andere gebruikers je makkelijk kunnen herkennen. Auteur Vertaler Wijzig Je profiel Je recente historie Sessie verloopt over +Gebruiker uitnodigen +Gebruiker aanmaken +Uitnodiging versturen +Terug naar gebruikers +Umbraco: Uitnodiging ++ + + + + + + + ++
++ ++ ++
++ ++ + ++ ++ +
+ + ]]> ++ ++ +++
++
++ ++ ++
++ ++ ++ Hallo %0%, +
++ U bent uitgenodigd door %1% om in te loggen in de Umbraco Backoffice. +
++ Bericht van %1%: +
+
+ %2% ++ +
++ + ++ ++ +
++ + ++ + Klik hier om de uitnodiging te accepteren + + +Als je niet op de link kunt klikken, kopieer deze dan in de adresbalk van je browser:
++
+ ++ ++ + %3% + + +
+Uitnodigen +Uitnodiging opnieuw aan het versturen... +Verwijder gebruiker +Ben je zeker dat je deze gebruiker wil verwijderen? Validatie @@ -1444,4 +1641,11 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op deURL tracker staat nu aan. Fout bij het aanzetten van de URL tracker. Meer informatie kan gevonden worden in de log file. + +Content verwijderd met id : {0} gerelateerd aan aan bovenliggend item met Id: {1} +Media verwijderd met id: {0} gerelateerd aan aan bovenliggend item met Id: {1} +Kan dit item niet automatisch herstellen +Er is geen 'herstel' relatie gevonden voor dit item. Gebruik de "Verplaats" optie om het manueel terug te zetten +Het item dat u wil herstellen onder ('%0%') zit in de prullenbak. Gebruik de "Verplaats" optie om het manueel terug te zetten +The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesZarządzanie hostami @@ -214,7 +214,7 @@Elementy dzieci Cel Oznacza to następującą godzinę na serwerze: -Co to oznacza?]]> +Co to oznacza?]]> Czy na pewno chcesz usunąć ten element? Właściwość %0% używa edytora %1%, który nie jest wspierany przez Nested Content. Dodaj kolejne pole tekstowe @@ -688,7 +688,7 @@ Naciśnij przycisk instaluj, aby zainstalować bazę danych UmbAby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.
Kliknij ponów próbę kiedy - skończysz.
]]>
+ skończysz.
Tu znajdziesz więcej informacji na temat edycji pliku "web.config".Skontaktuj się z Twoim dostawą usług internetowych jeśli zajdzie taka potrzeba. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index 1ffa74f87f..bcbd609b5f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesGerenciar hostnames @@ -374,7 +374,7 @@Próximo para prosseguir.]]> Banco de dados não encontrado! Favor checar se a informação no "connection string" do "web.config" esteja correta. Para prosseguir, favor editar o arquivo "web.config" (usando Visual Studio ou seu editor de texto favorito), role até embaixo, adicione a connection string para seu banco de dados com a chave de nome "UmbracoDbDSN" e salve o arquivo
-Clique o botão tentar novamente quando terminar.
+Clique o botão tentar novamente quando terminar.
]]>
Mais informações em como editar o web.config aqui.Favor contatar seu provedor de internet ou hospedagem web se necessário. Se você estiver instalando em uma máquina ou servidor local é possível que você precise dessas informações por um administrador de sistema.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index 009fbdb683..8ebe8c0ef7 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -1,8 +1,8 @@ - + +The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-FilesЯзыки и домены @@ -19,6 +19,7 @@Отключить Очистить корзину Включить +Экспорт Экспортировать Импортировать Импортировать пакет @@ -158,8 +159,9 @@Вернуться к списку Сохранить Сохранить и построить модели -Сохранить и опубликовать -Сохранить и направить на публикацию +Опубликовать +Запланировать +Направить на публикацию Сохранить список Выбрать Выбрать текущую папку @@ -201,7 +203,20 @@Желтый Оранжевый Синий +Серо-синий +Серый +Коричневый +Светло-синий +Голубой +Светло-зеленый +Лайм +Янтарный +Рыжий Красный +Розовый +Лиловый +Темно-лиловый +Индиго Об этой странице @@ -221,6 +236,8 @@Скрыть ВНИМАНИЕ: невозможно получить URL документа (внутренняя ошибка - подробности в системном журнале) Опубликовано +Это значение скрыто. Если Вам нужен доступ к просмотру этого значения, свяжитесь с администратором веб-сайта. +Это значение скрыто. Этот документ был изменен после публикации Этот документ не опубликован Документ опубликован @@ -236,19 +253,24 @@Тип участника Вы уверены, что хотите удалить этот элемент? Свойство '%0%' использует редактор '%1%', который не поддерживается для вложенного содержимого. +Не было сделано никаких изменений Дата не указана Заголовок страницы +Этот медиа-элемент не содержит ссылки Доступные группы Свойства Этот документ опубликован, но скрыт, потому что его родительский документ '%0%' не опубликован ВНИМАНИЕ: этот документ опубликован, но его нет в глобальном кэше (внутренняя ошибка - подробности в системном журнале) Опубликовать +Опубликовано +Опубликовано (есть измененения) Состояние публикации Опубликовать Очистить дату ВНИМАНИЕ: этот документ опубликован, но его URL вступает в противоречие с документом %0% Это время будет соответствовать следующему времени на сервере: -Что это означает?]]> +Что это означает?]]> +Задать дату Порядок сортировки обновлен Для сортировки узлов просто перетаскивайте узлы или нажмите на заголовке столбца. Вы можете выбрать несколько узлов, удерживая клавиши "shift" или "ctrl" при пометке Статистика @@ -256,6 +278,7 @@Заголовок (необязательно) Тип Скрыть +Распубликовано Распубликовать Последняя правка Дата/время редактирования документа @@ -289,6 +312,8 @@Выбрать дочерний узел Унаследовать вкладки и свойства из уже существующего типа документов. Вкладки будут либо добавлены в создаваемый тип, либо в случае совпадения названий вкладок будут добавлены наследуемые свойства. Этот тип документов уже участвует в композиции другого типа, поэтому сам не может быть композицией. +Где используется эта композиция? +Эта композиция сейчас используется при создании следующих типов документов: В настоящее время нет типов документов, допустимых для построения композиции. Доступные редакторы @@ -320,7 +345,11 @@, использующие этот редактор, будут обновлены с применением этих установок Участник может изменить +Разрешает редактирование значение данного свойства участником в своем профиле +Конфеденциальные данные +Скрывает значение это свойства от редакторов содержимого, не имеющих доступа к конфеденциальной информации Показать в профиле участника +Разрешает показ данного свойства в профиле участника для вкладки не указан порядок сортировки @@ -447,6 +476,7 @@ Ключ '%0%' уже существует в словаре. ]]>Обзор словаря Допустим как корневой @@ -569,13 +599,16 @@Ошибка Найти Начало +Общее Группы Папка Высота Справка Скрыть +История Иконка Импорт +Инфо Внутренний отступ Вставить Установить @@ -585,6 +618,7 @@Язык Конец Макет +Ссылки Загрузка БЛОКИРОВКА Войти @@ -605,6 +639,7 @@Ok Открыть Вкл +Варианты или Сортировка по Пароль @@ -624,6 +659,7 @@Получить Повторить Разрешения +Публикация по расписанию Поиск К сожалению, ничего подходящего не нашлось Результаты поиска @@ -657,7 +693,8 @@Сохранение... текущий выбрано -Внедрить +Встроить +Получить Цвет фона @@ -667,12 +704,12 @@Текст -Rich Text Editor -Image -Macro -Embed -Headline -Quote +Редактор текста +Изображение +Макрос +Встраивание +Заголовок +Цитата Добавить содержимое Сбросить содержимое Добавить шаблон сетки @@ -754,9 +791,10 @@Медиа - всего в XML: %0%, всего: %1%Б с ошибками: %2% Содержимое - всего в XML: %0%, всего опубликовано: %1%, с ошибками: %2% +Ошибка проверки адреса URL %0% - '%1%' +Сертификат Вашего веб-сайта отмечен как проверенный. Ошибка проверки сертификата: '%0%' -Ошибка проверки адреса URL %0% - '%1%' Сейчас Вы %0% просматриваете сайт, используя протокол HTTPS. Параметр 'umbracoUseSSL' в секции 'appSetting' установлен в 'false' в файле web.config. Если Вам необходим доступ к сайту по протоколу HTTPS, нужно установить данный параметр в 'true'. Параметр 'umbracoUseSSL' в секции 'appSetting' в файле установлен в '%0%', значения cookies %1% маркированы как безопасные. @@ -796,11 +834,27 @@X-Frame-Options, использующийся для управления возможностью помещать сайт в IFRAME на другом сайте.]]> X-Frame-Options, использующийся для управления возможностью помещать сайт в IFRAME на другом сайте, не обнаружен.]]> -Установить заголовок в файле конфигурации Добавляет значение в секцию 'httpProtocol/customHeaders' файла web.config, препятствующее возможному использованию этого сайта внутри IFRAME на другом сайте. Значение, добавляющее заголовок, препятствующий использованию этого сайта внутри IFRAME другого сайта, успешно добавлено в файл web.config. + +Установить заголовок в файле конфигурации Невозможно обновить файл web.config. Ошибка: %0% +X-Content-Type-Options, использующиеся для защиты от MIME-уязвимостей, обнаружены.]]> +X-Content-Type-Options, использующиеся для защиты от MIME-уязвимостей, не найдены.]]> +Добавляет значение в секцию httpProtocol/customHeaders файла web.config, препятствующее использованию MIME-уязвимостей. +Значение, добавляющее заголовок, препятствующий использованию MIME-уязвимостей, успешно добавлено в файл web.config. + +Strict-Transport-Security, известный также как HSTS-header, обнаружен.]]> +Strict-Transport-Security не найден.]]> +Добавляет заголовок 'Strict-Transport-Security' и его значение 'max-age=10886400; preload' в секцию httpProtocol/customHeaders файла web.config. Применяйте этот способ только в случае, если доступ к Вашим сайтам будет осуществляться по протоколу https как минимум ближайшие 18 недель. +Заголовок HSTS-header успешно добавлен в файл web.config. + +X-XSS-Protection обнаружен.]]> +X-XSS-Protection не найден.]]> +Добавляет заголовок 'X-XSS-Protection' и его значение '1; mode=block' в секцию httpProtocol/customHeaders файла web.config. +Заголовок X-XSS-Protection успешно добавлен в файл web.config. + @@ -843,7 +897,7 @@Для настройки откройте файл "web.config" с помощью любого текстового редактора и добавьте нужную информацию в строку подключения (параметр "UmbracoDbDSN"), затем сохраните файл.
Нажмите кнопку "Повторить" когда все будет готово
]]>
- Более подробно о внесении изменений в файл "web.config" рассказано здесь.@@ -970,7 +1024,87 @@ -Ссылка, по которой Вы попали сюда, неверна или устарела Umbraco: сброс пароля - @@ -1027,34 +1161,88 @@ Удачи! Генератор уведомлений Umbraco. - ]]>Ваше имя пользователя для входа в панель администрирования Umbraco: %0%
Перейдите по этой ссылке для того, чтобы сбросить Ваш пароль, или скопируйте текст ссылки и вставьте в адресную строку своего браузера:
%1%
]]> + + + + + + + ++
++ ++ ++
++ ++ + ++ ++ +
+ + + ]]>+ ++ +++
++
++ ++ ++
++ ++ ++ Запрошен сброс пароля +
++ Ваше имя пользователя для входа в административную панель Umbraco: %0% +
++
+ +
+ ++ + ++ + Нажмите на эту ссылку для того, чтобы сбросить пароль + + +Если Вы не имеете возможности нажать на сслыку, скопируйте следующий адрес (URL) и вставьте в адресную строку Вашего браузера:
++
+ ++ ++ + %1% + + +
+Здравствуйте, %0% - - + ]]> +Это автоматически сгенерированное уведомление. Операция '%1%' - была произведена на странице '%2%' - пользователем '%3%'.
- - - --
Сводка обновлений:
-- %6% -
- - - - -Удачи!
]]>
Генератор уведомлений Umbraco -+ + + + + + + + +
++ ++ ++
++ ++ + ++ ++ +
+ + + ]]> ++ ++ +++
++
++ ++ ++
++ ++ ++ Здравствуйте, %0%, +
++ Это автоматически сгенерированное сообщение, отправленное, чтобы уведомить Вас о том, что операция '%1%' была выполнена на странице '%2%' пользователем '%3%' +
++ +
++ + ++ +
++ + ВНЕСТИ ИЗМЕНЕНИЯ +
Обзор обновления:
++ %6% +
+ ++ Удачного дня!
+
+ К Вашим услугам, почтовый робот Umbraco +
+[%0%] Уведомление об операции %1% над документом %2% Уведомления @@ -1409,6 +1597,8 @@При разблокировке пользователей произошла ошибка '%0%' сейчас разблокирован При разблокировке пользователя произошла ошибка +Данные участника успешно экспортированы в файл +Во время экспортирования данных участника произошла ошибка Используется синтаксис селекторов CSS, например: h1, .redHeader, .blueTex @@ -1682,9 +1872,103 @@Неудачных попыток входа К профилю пользователя Добавьте пользователя в группу(ы) для задания прав доступа +Пригласить Приглашение в панель администрирования Umbraco Здравствуйте, %0%,
Вы были приглашены пользователем %1%, и Вам предоставлен доступ в панель администрирования Umbraco.Сообщение от %1%: %2%
Перейдите по этой ссылке, чтобы принять приглашение.
Если Вы не имеете возможности перейти по ссылке, скопируйте нижеследующий текст ссылки и вставьте в адресную строку Вашего браузера.
%3%