From 02b6b77d38a9c8c632a5d6b93ef8e06cac5eca7a Mon Sep 17 00:00:00 2001
From: ashallcross <1766330+ashallcross@users.noreply.github.com>
Date: Tue, 31 Jul 2018 09:39:51 +0100
Subject: [PATCH 01/11] Updated links in readme file (#2822)

Updated the links from our.umbraco.org > our.umbraco.com also the case study and cloud links
---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index 067a4b83d0..5316ad0604 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -46,6 +46,6 @@ Umbraco is contribution focused and community driven. If you want to contribute
 
 ## Found a bug?
 
-Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/docs/CONTRIBUTING.md).
+Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](CONTRIBUTING_DETAILED.md#reporting-bugs).
 
 To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).

From 80db20fdfb1575b5665b82fa108ceae4cd11ea0d Mon Sep 17 00:00:00 2001
From: Warren <warren@umbraco.com>
Date: Tue, 31 Jul 2018 11:18:24 +0100
Subject: [PATCH 02/11] Fix up failing JS unit test from a recent change from
 V8 hackathon to the query builder syntax (was curly's on new lines)

---
 .../unit/common/services/template-helper.spec.js  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/template-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/template-helper.spec.js
index 0ccc9ab1dc..08a69b7e80 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/template-helper.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/template-helper.spec.js
@@ -58,13 +58,14 @@ describe('service: templateHelper', function () {
         it('should return the snippet for a query', function () {
             var queryExpression = "queryExpression";
             var snippet = "\n@{\n" + "\tvar selection = " + queryExpression + ";\n}\n";
-                snippet += "<ul>\n" +
-                            "\t@foreach(var item in selection){\n" +
-                                "\t\t<li>\n" +
-                                    "\t\t\t<a href=\"@item.Url\">@item.Name</a>\n" +
-                                "\t\t</li>\n" +
-                            "\t}\n" +
-                        "</ul>\n\n";
+            snippet += "<ul>\n" +
+                "\t@foreach (var item in selection)\n" +
+                "\t{\n" +
+                "\t\t<li>\n" +
+                "\t\t\t<a href=\"@item.Url\">@item.Name</a>\n" +
+                "\t\t</li>\n" +
+                "\t}\n" +
+                "</ul>\n\n";
 
             expect(templateHelper.getQuerySnippet(queryExpression)).toBe(snippet);
         });

From f30171bcfda3862404b200a0efe8577c6b280c8c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 31 Jul 2018 10:09:40 +0200
Subject: [PATCH 03/11] Cleanup filenames

---
 .../{Settings1.Designer.cs => Settings.Designer.cs}           | 4 ++--
 src/Umbraco.Web/Properties/Settings.settings                  | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Umbraco.Web/Properties/{Settings1.Designer.cs => Settings.Designer.cs} (98%)

diff --git a/src/Umbraco.Web/Properties/Settings1.Designer.cs b/src/Umbraco.Web/Properties/Settings.Designer.cs
similarity index 98%
rename from src/Umbraco.Web/Properties/Settings1.Designer.cs
rename to src/Umbraco.Web/Properties/Settings.Designer.cs
index 2f68c9774c..5a5a863f4f 100644
--- a/src/Umbraco.Web/Properties/Settings1.Designer.cs
+++ b/src/Umbraco.Web/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Somthing")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Something")]
         public string test {
             get {
                 return ((string)(this["test"]));
diff --git a/src/Umbraco.Web/Properties/Settings.settings b/src/Umbraco.Web/Properties/Settings.settings
index d6489e3251..757b363da2 100644
--- a/src/Umbraco.Web/Properties/Settings.settings
+++ b/src/Umbraco.Web/Properties/Settings.settings
@@ -9,7 +9,7 @@
       <Value Profile="(Default)">http://update.umbraco.org/checkforupgrade.asmx</Value>
     </Setting>
     <Setting Name="test" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Somthing</Value>
+      <Value Profile="(Default)">Something</Value>
     </Setting>
     <Setting Name="umbraco_org_umbraco_our_Repository" Type="(Web Service URL)" Scope="Application">
       <Value Profile="(Default)">https://our.umbraco.com/umbraco/webservices/api/repository.asmx</Value>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0da2704c6c..b71750fe2b 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1204,7 +1204,7 @@
     <Compile Include="umbraco.presentation\page.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\Settings1.Designer.cs">
+    <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
@@ -1524,7 +1524,7 @@
     </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>

From 3c446a3ba004d3c548080c5c9f9b34171cae3782 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 31 Jul 2018 12:23:06 +0200
Subject: [PATCH 04/11] Cleanup merge of Color Picker editor

---
 .../ColorListPreValueEditor.cs                | 183 ------------------
 .../ColorPickerConfigurationEditor.cs         |  80 ++++++--
 2 files changed, 65 insertions(+), 198 deletions(-)
 delete mode 100644 src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs

diff --git a/src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
deleted file mode 100644
index 60785d283e..0000000000
--- a/src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.PropertyEditors
-{
-    internal class ColorListPreValueEditor : ValueListPreValueEditor
-    {
-
-        public ColorListPreValueEditor()
-        {
-            var field = Fields.First();
-
-            //use a custom editor too
-            field.View = "views/propertyeditors/colorpicker/colorpicker.prevalues.html";
-            //change the description
-            field.Description = "Add, remove or sort colors.";
-            //change the label
-            field.Name = "Colors";
-            //need to have some custom validation happening here
-            field.Validators.Add(new ColorListValidator());
-
-            Fields.Insert(0, new PreValueField
-            {
-                Name = "Include labels?",
-                View = "boolean",
-                Key = "useLabel",
-                Description = "Stores colors as a Json object containing both the color hex string and label, rather than just the hex string."
-            });
-        }
-
-        public override IDictionary<string, object> ConvertDbToEditor(IDictionary<string, object> defaultPreVals, PreValueCollection persistedPreVals)
-        {
-            var dictionary = persistedPreVals.FormatAsDictionary();
-            var items = dictionary.Where(x => x.Key != "useLabel")
-                                  .OrderBy(x => x.Value.SortOrder);
-
-            var items2 = new Dictionary<int, object>();
-            foreach (var item in items)
-            {
-                var valueItem = new ColorPickerColor
-                {
-                    Color = item.Value.Value,
-                    Label = item.Value.Value,
-                    SortOrder = item.Value.SortOrder
-                };
-
-                if (item.Value.Value.DetectIsJson())
-                {
-                    try
-                    {
-                        var valueObject = JsonConvert.DeserializeObject<ColorPickerColor>(item.Value.Value);
-                        valueItem = new ColorPickerColor
-                        {
-                            Color = valueObject.Color,
-                            Label = valueObject.Label,
-                            SortOrder = valueObject.SortOrder
-                        };
-                    }
-                    catch
-                    {
-                        // let's say parsing Json failed, we'll not do anything,
-                        // we'll just use the valueItem we built in the  first place
-                    }
-                }
-
-                items2[item.Value.Id] = new JObject
-                {
-                    { "value", valueItem.Color },
-                    { "label", valueItem.Label },
-                    { "sortOrder", valueItem.SortOrder }
-                };
-            }
-
-            var result = new Dictionary<string, object> { { "items", items2 } };
-            var useLabel = dictionary.ContainsKey("useLabel") && dictionary["useLabel"].Value == "1";
-            if (useLabel)
-                result["useLabel"] = dictionary["useLabel"].Value;
-
-            return result;
-        }
-
-        public override IDictionary<string, PreValue> ConvertEditorToDb(IDictionary<string, object> editorValue, PreValueCollection currentValue)
-        {
-            var val = editorValue["items"] as JArray;
-            var result = new Dictionary<string, PreValue>();
-            if (val == null) return result;
-
-            try
-            {
-                var useLabel = false;
-                if (editorValue.TryGetValue("useLabel", out var useLabelObj))
-                {
-                    useLabel = useLabelObj is string && (string) useLabelObj == "1";
-                    result["useLabel"] = new PreValue(useLabel ? "1" : "0");
-                }
-
-                // get all non-empty values
-                var index = 0;
-                // items get submitted in the sorted order, so just count them up
-                var sortOrder = -1;
-                foreach (var preValue in val.OfType<JObject>()
-                    .Where(x => x["value"] != null)
-                    .Select(x =>
-                    {
-                        var idString = x["id"] == null ? "0" : x["id"].ToString();
-                        int.TryParse(idString, out var id);
-
-                        var color = x["value"].ToString();
-                        if (string.IsNullOrWhiteSpace(color)) return null;
-
-                        var label = x["label"].ToString();
-
-                        sortOrder++;
-                        var value = useLabel
-                            ? JsonConvert.SerializeObject(new { value = color, label = label, sortOrder = sortOrder })
-                            : color;
-
-                        return new PreValue(id, value, sortOrder);
-                    })
-                    .WhereNotNull())
-                {
-                    result.Add(index.ToInvariantString(), preValue);
-                    index++;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<ValueListPreValueEditor>("Could not deserialize the posted value: " + val, ex);
-            }
-
-            return result;
-        }
-
-        internal class ColorListValidator : IPropertyValidator
-        {
-            public IEnumerable<ValidationResult> Validate(object value, PreValueCollection preValues, PropertyEditor editor)
-            {
-                var json = value as JArray;
-                if (json == null) yield break;
-
-                //validate each item which is a json object
-                for (var index = 0; index < json.Count; index++)
-                {
-                    var i = json[index];
-                    var jItem = i as JObject;
-                    if (jItem == null || jItem["value"] == null) continue;
-
-                    //NOTE: we will be removing empty values when persisting so no need to validate
-                    var asString = jItem["value"].ToString();
-                    if (asString.IsNullOrWhiteSpace()) continue;
-
-                    if (Regex.IsMatch(asString, "^([0-9a-f]{3}|[0-9a-f]{6})$", RegexOptions.IgnoreCase) == false)
-                    {
-                        yield return new ValidationResult("The value " + asString + " is not a valid hex color", new[]
-                            {
-                                //we'll make the server field the index number of the value so it can be wired up to the view
-                                "item_" + index.ToInvariantString()
-                            });
-                    }
-                }
-            }
-        }
-    }
-
-    internal class ColorPickerColor
-    {
-        [JsonProperty("value")]
-        public string Color { get; set; }
-        [JsonProperty("label")]
-        public string Label { get; set; }
-        [JsonProperty("sortOrder")]
-        public int SortOrder { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
index ddc4b50858..cbd4e69a9e 100644
--- a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
@@ -17,39 +17,85 @@ namespace Umbraco.Web.PropertyEditors
 
             // customize the items field
             items.View = "views/propertyeditors/colorpicker/colorpicker.prevalues.html";
-            items.Description = "Add and remove colors";
-            items.Name = "Add color";
+            items.Description = "Add, remove or sort colors";
+            items.Name = "Colors";
             items.Validators.Add(new ColorListValidator());
         }
 
         public override Dictionary<string, object> ToConfigurationEditor(ColorPickerConfiguration configuration)
         {
-            var items = configuration?.Items.ToDictionary(x => x.Id.ToString(), x => GetItemValue(x, configuration.UseLabel)) ?? new object();
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                   d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
             var useLabel = configuration?.UseLabel ?? false;
 
             return new Dictionary<string, object>
             {
-                { "items", items },
+                { "items", editorItems },
                 { "useLabel", useLabel }
             };
         }
 
-        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel)
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
         {
-            if (useLabel)
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
             {
-                return item.Value.DetectIsJson()
-                    ? JsonConvert.DeserializeObject(item.Value)
-                    : new JObject { { "color", item.Value }, { "label", item.Value } };
+                Color = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Color = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
             }
 
-            if (!item.Value.DetectIsJson())
-                return item.Value;
-
-            var jobject = (JObject) JsonConvert.DeserializeObject(item.Value);
-            return jobject.Property("color").Value.Value<string>();
+            return new ItemValue { Color = item.Value, Label = item.Value, SortOrder = sortOrder };
         }
 
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Color { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+
+        // send: { "items": { "<id>": { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> } , ... }, "useLabel": <bool> }
+        // recv: { "items": ..., "useLabel": <bool> }
+
         public override ColorPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, ColorPickerConfiguration configuration)
         {
             var output = new ColorPickerConfiguration();
@@ -66,9 +112,13 @@ namespace Umbraco.Web.PropertyEditors
             if (configuration?.Items != null && configuration.Items.Count > 0)
                 nextId = configuration.Items.Max(x => x.Id) + 1;
 
-            // create ValueListItem instances - sortOrder is ignored here
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
             foreach (var item in jItems.OfType<JObject>())
             {
+                // in:  { "value": "<color>", "id": <id>, "label": "<label>" }
+                // out: ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+                //                                        (depending on useLabel)
+
                 var value = item.Property("value")?.Value?.Value<string>();
                 if (string.IsNullOrWhiteSpace(value)) continue;
 

From abc2bfa774de7020a2a1a9ffca6a8a1a7c79c690 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 31 Jul 2018 12:30:31 +0200
Subject: [PATCH 05/11] Cleanup merge of migrations

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 3729ae1877..5773547320 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -5,6 +5,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Upgrade.V_7_12_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_0_0;
+using Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -113,6 +114,10 @@ namespace Umbraco.Core.Migrations.Upgrade
 
             Chain<ContentVariationMigration>("{1350617A-4930-4D61-852F-E3AA9E692173}");
             Chain<UpdateUmbracoConsent>("{39E5B1F7-A50B-437E-B768-1723AEC45B65}"); // from 7.12.0
+            Chain<AddRelationTypeForMediaFolderOnDelete>("{0541A62B-EF87-4CA2-8225-F0EB98ECCC9F}"); // from 7.12.0
+            Chain<IncreaseLanguageIsoCodeColumnLength>("{EB34B5DC-BB87-4005-985E-D983EA496C38}"); // from 7.12.0
+            Chain<RenameTrueFalseField>("{517CE9EA-36D7-472A-BF4B-A0D6FB1B8F89}"); // from 7.12.0
+            Chain<SetDefaultTagsStorageType>("{BBD99901-1545-40E4-8A5A-D7A675C7D2F2}"); // from 7.12.0
             //FINAL
 
 
@@ -127,13 +132,13 @@ namespace Umbraco.Core.Migrations.Upgrade
             From("{init-7.11.0}").Chain("{init-7.10.0}"); // same as 7.10.0
             From("{init-7.11.1}").Chain("{init-7.10.0}"); // same as 7.10.0
 
-            // 7.12.0 has a migration, define a custom chain which copies the chain
-            // going from {init-7.10.0} to former final, and then goes straight to
-            // main chain, skipping the migration
+            // 7.12.0 has migrations, define a custom chain which copies the chain
+            // going from {init-7.10.0} to former final (1350617A) , and then goes straight to
+            // main chain, skipping the migrations
             //
             From("{init-7.12.0}");
             //        copy from        copy to (former final)                    main chain
-            CopyChain("{init-7.10.0}", "{1350617A-4930-4D61-852F-E3AA9E692173}", "{39E5B1F7-A50B-437E-B768-1723AEC45B65}");
+            CopyChain("{init-7.10.0}", "{1350617A-4930-4D61-852F-E3AA9E692173}", "{BBD99901-1545-40E4-8A5A-D7A675C7D2F2}");
         }
     }
 }

From 309ca0a7653da55ca1cdd9fa96de05b1f04d3d66 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 31 Jul 2018 13:41:38 +0200
Subject: [PATCH 06/11] Fix tests after merge (loadPackager tree is gone)

---
 src/Umbraco.Tests/Composing/TypeLoaderTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 46f024429e..09411f6d20 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -279,7 +279,7 @@ AnotherContentFinder
         public void Resolves_Trees()
         {
             var trees = _typeLoader.GetTrees();
-            Assert.AreEqual(4, trees.Count());
+            Assert.AreEqual(3, trees.Count());
         }
 
         [Test]
@@ -288,7 +288,7 @@ AnotherContentFinder
             var types = _typeLoader.GetDataEditors();
             Assert.AreEqual(43, types.Count());
         }
-        
+
         /// <summary>
         /// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types
         /// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.

From f35c63fa400c6e81e974a91d93916dc2135a8cc5 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 31 Jul 2018 14:14:52 +0200
Subject: [PATCH 07/11] Renormalize

---
 .../umbraco_client/Dialogs/AssignDomain2.js   |  290 +-
 src/Umbraco.Web/Editors/ContentController.cs  | 2942 ++++++++---------
 src/Umbraco.Web/Mvc/UrlHelperExtensions.cs    |  158 +-
 src/Umbraco.Web/UrlHelperExtensions.cs        |  386 +--
 .../controls/Tree/CustomTreeService.cs        |  308 +-
 .../umbraco/dialogs/AssignDomain2.aspx.cs     |  166 +-
 .../umbraco/webservices/nodeSorter.asmx.cs    |  524 +--
 7 files changed, 2387 insertions(+), 2387 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js b/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js
index ddf38733e1..b5921b6576 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js
@@ -1,145 +1,145 @@
-Umbraco.Sys.registerNamespace("Umbraco.Dialogs");
-
-(function ($) {
-
-    // register AssignDomain dialog
-    Umbraco.Dialogs.AssignDomain2 = base2.Base.extend({
-        
-        _opts: null,
-        
-        _isRepeated: function (element) {
-            var inputs = $('form input.domain');
-            var elementName = element.attr('name');
-            var repeated = false;
-            inputs.each(function() {
-                var input = $(this);
-                if (input.attr('name') != elementName && input.val() == element.val())
-                    repeated = true;
-            });
-            return repeated;
-        },
-
-        // constructor
-        constructor: function (opts) {
-            // merge options with default
-            this._opts = $.extend({
-                invalidDomain: 'Invalid domain.',
-                duplicateDomain: 'Domain has already been assigned.'
-            }, opts);
-        },
-
-        // public methods/variables
-
-        languages: null,
-        language: null,
-        domains: null,
-
-        addDomain: function () {
-            this.domains.push({
-                Name: "",
-                Lang: ""
-            });
-        },
-      
-        init: function () {
-            var self = this;
-            
-            self.domains = ko.observableArray(self._opts.domains);
-            self.languages = self._opts.languages;
-            self.language = self._opts.language;
-            self.removeDomain = function() { self.domains.remove(this); };
-
-            ko.applyBindings(self);
-
-            $.validator.addMethod("domain", function (value, element, param) {
-                // beware! encode('test') == 'test-'
-                // read eg https://rt.cpan.org/Public/Bug/Display.html?id=94347
-                value = punycode.encode(value);
-                // that regex is best-effort and certainly not exact
-                var re = /^(http[s]?:\/\/)?([-\w]+(\.[-\w]+)*)(:\d+)?(\/[-\w]*|-)?$/gi;
-                var isopt = this.optional(element);
-                var retest = re.test(value);
-                var ret = isopt || retest;
-                return ret;
-            }, self._opts.invalidDomain);
-
-            function getDuplicateMessage(val, el) {
-                var other = $(el).nextAll('input').val();
-                var msg = self._opts.duplicateDomain
-                if (other != "" && other != "!!!")
-                    msg = msg + ' (' + other + ')';
-                return msg;
-            }
-
-            $.validator.addMethod("duplicate", function (value, element, param) {
-                return $(element).nextAll('input').val() == "" && !self._isRepeated($(element));
-            }, getDuplicateMessage);
-            
-            $.validator.addClassRules({
-                domain: { domain: true },
-                duplicate: { duplicate: true }
-            });
-
-            $('form').validate({
-                debug: true,
-                focusCleanup: true,
-                onkeyup: false
-            });
-
-            $('form input.domain').on('focus', function(event) {
-                if (event.type != 'focusin') return;
-                $(this).nextAll('input').val("");
-            });
-            
-            // force validation *now*
-            $('form').valid();
-
-            $('#btnSave').click(function () {
-                if (!$('form').valid())
-                    return false;
-                
-                var mask = $('#komask');
-                var masked = mask.parent();
-                mask.height(masked.height());
-                mask.width(masked.width());
-                mask.show();
-                
-                var data = { nodeId: self._opts.nodeId, language: self.language ? self.language : 0, domains: self.domains };
-                $.post(self._opts.restServiceLocation + 'PostSaveLanguageAndDomains', ko.toJSON(data), function (json) {
-                    mask.hide();
-
-                    if (json.Valid) {
-                        UmbClientMgr.closeModalWindow();
-                    }
-                    else {
-                        var inputs = $('form input.domain');
-                        inputs.each(function() { $(this).nextAll('input').val(""); });
-                        for (var i = 0; i < json.Domains.length; i++) {
-                            var d = json.Domains[i];
-                            if (d.Duplicate)
-                                inputs.each(function() {
-                                    var input = $(this);
-                                    if (input.val() == d.Name)
-                                        input.nextAll('input').val(d.Other ? d.Other : "!!!");
-                                });
-                        }
-                        $('form').valid();
-                    }
-                })
-                .fail(function (xhr, textStatus, errorThrown) {
-                    mask.css('opacity', 1).css('color', "#ff0000").html(xhr.responseText);
-                });
-                return false;
-            });
-        }
-
-    });
-
-    // set defaults for jQuery ajax calls
-    $.ajaxSetup({
-        dataType: 'json',
-        cache: false,
-        contentType: 'application/json; charset=utf-8'
-    });
-    
-})(jQuery);
+Umbraco.Sys.registerNamespace("Umbraco.Dialogs");
+
+(function ($) {
+
+    // register AssignDomain dialog
+    Umbraco.Dialogs.AssignDomain2 = base2.Base.extend({
+        
+        _opts: null,
+        
+        _isRepeated: function (element) {
+            var inputs = $('form input.domain');
+            var elementName = element.attr('name');
+            var repeated = false;
+            inputs.each(function() {
+                var input = $(this);
+                if (input.attr('name') != elementName && input.val() == element.val())
+                    repeated = true;
+            });
+            return repeated;
+        },
+
+        // constructor
+        constructor: function (opts) {
+            // merge options with default
+            this._opts = $.extend({
+                invalidDomain: 'Invalid domain.',
+                duplicateDomain: 'Domain has already been assigned.'
+            }, opts);
+        },
+
+        // public methods/variables
+
+        languages: null,
+        language: null,
+        domains: null,
+
+        addDomain: function () {
+            this.domains.push({
+                Name: "",
+                Lang: ""
+            });
+        },
+      
+        init: function () {
+            var self = this;
+            
+            self.domains = ko.observableArray(self._opts.domains);
+            self.languages = self._opts.languages;
+            self.language = self._opts.language;
+            self.removeDomain = function() { self.domains.remove(this); };
+
+            ko.applyBindings(self);
+
+            $.validator.addMethod("domain", function (value, element, param) {
+                // beware! encode('test') == 'test-'
+                // read eg https://rt.cpan.org/Public/Bug/Display.html?id=94347
+                value = punycode.encode(value);
+                // that regex is best-effort and certainly not exact
+                var re = /^(http[s]?:\/\/)?([-\w]+(\.[-\w]+)*)(:\d+)?(\/[-\w]*|-)?$/gi;
+                var isopt = this.optional(element);
+                var retest = re.test(value);
+                var ret = isopt || retest;
+                return ret;
+            }, self._opts.invalidDomain);
+
+            function getDuplicateMessage(val, el) {
+                var other = $(el).nextAll('input').val();
+                var msg = self._opts.duplicateDomain
+                if (other != "" && other != "!!!")
+                    msg = msg + ' (' + other + ')';
+                return msg;
+            }
+
+            $.validator.addMethod("duplicate", function (value, element, param) {
+                return $(element).nextAll('input').val() == "" && !self._isRepeated($(element));
+            }, getDuplicateMessage);
+            
+            $.validator.addClassRules({
+                domain: { domain: true },
+                duplicate: { duplicate: true }
+            });
+
+            $('form').validate({
+                debug: true,
+                focusCleanup: true,
+                onkeyup: false
+            });
+
+            $('form input.domain').on('focus', function(event) {
+                if (event.type != 'focusin') return;
+                $(this).nextAll('input').val("");
+            });
+            
+            // force validation *now*
+            $('form').valid();
+
+            $('#btnSave').click(function () {
+                if (!$('form').valid())
+                    return false;
+                
+                var mask = $('#komask');
+                var masked = mask.parent();
+                mask.height(masked.height());
+                mask.width(masked.width());
+                mask.show();
+                
+                var data = { nodeId: self._opts.nodeId, language: self.language ? self.language : 0, domains: self.domains };
+                $.post(self._opts.restServiceLocation + 'PostSaveLanguageAndDomains', ko.toJSON(data), function (json) {
+                    mask.hide();
+
+                    if (json.Valid) {
+                        UmbClientMgr.closeModalWindow();
+                    }
+                    else {
+                        var inputs = $('form input.domain');
+                        inputs.each(function() { $(this).nextAll('input').val(""); });
+                        for (var i = 0; i < json.Domains.length; i++) {
+                            var d = json.Domains[i];
+                            if (d.Duplicate)
+                                inputs.each(function() {
+                                    var input = $(this);
+                                    if (input.val() == d.Name)
+                                        input.nextAll('input').val(d.Other ? d.Other : "!!!");
+                                });
+                        }
+                        $('form').valid();
+                    }
+                })
+                .fail(function (xhr, textStatus, errorThrown) {
+                    mask.css('opacity', 1).css('color', "#ff0000").html(xhr.responseText);
+                });
+                return false;
+            });
+        }
+
+    });
+
+    // set defaults for jQuery ajax calls
+    $.ajaxSetup({
+        dataType: 'json',
+        cache: false,
+        contentType: 'application/json; charset=utf-8'
+    });
+    
+})(jQuery);
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 1c61d3910d..7b5b728e7d 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1,1471 +1,1471 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using System.Web.Http.ModelBinding;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Models.Mapping;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Binders;
-using Umbraco.Web.WebApi.Filters;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Web.PublishedCache;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models.Validation;
-using Umbraco.Web.Models;
-using Umbraco.Web.WebServices;
-using Umbraco.Web._Legacy.Actions;
-using Constants = Umbraco.Core.Constants;
-using ContentVariation = Umbraco.Core.Models.ContentVariation;
-using Language = Umbraco.Web.Models.ContentEditing.Language;
-
-namespace Umbraco.Web.Editors
-{
-    /// <summary>
-    /// The API controller used for editing content
-    /// </summary>
-    /// <remarks>
-    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
-    /// access to ALL of the methods on this controller will need access to the content application.
-    /// </remarks>
-    [PluginController("UmbracoApi")]
-    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
-    [ContentControllerConfiguration]
-    public class ContentController : ContentControllerBase
-    {
-        private readonly IPublishedSnapshotService _publishedSnapshotService;
-
-        public ContentController(IPublishedSnapshotService publishedSnapshotService)
-        {
-            if (publishedSnapshotService == null) throw new ArgumentNullException(nameof(publishedSnapshotService));
-            _publishedSnapshotService = publishedSnapshotService;
-        }
-
-        /// <summary>
-        /// Configures this controller with a custom action selector
-        /// </summary>
-        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
-        {
-            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
-            {
-                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
-                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))    
-                ));
-            }
-        }
-
-        /// <summary>
-        /// Returns true if any content types have culture variation enabled
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        [WebApi.UmbracoAuthorize, OverrideAuthorization]
-        public bool AllowsCultureVariation()
-        {
-            var contentTypes = Services.ContentTypeService.GetAll();
-            return contentTypes.Any(contentType => contentType.VariesByCulture());
-        }
-
-        /// <summary>
-        /// Return content for the specified ids
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
-        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
-        {
-            //fixme what about cultures?
-
-            var foundContent = Services.ContentService.GetByIds(ids);
-            return foundContent.Select(x => MapToDisplay(x));
-        }
-
-        /// <summary>
-        /// Updates the permissions for a content item for a particular user group
-        /// </summary>
-        /// <param name="saveModel"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
-        /// </remarks>
-        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
-        {
-            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be alowed to set granular permissions?
-
-            var content = Services.ContentService.GetById(saveModel.ContentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //current permissions explicitly assigned to this content item
-            var contentPermissions = Services.ContentService.GetPermissions(content)
-                .ToDictionary(x => x.UserGroupId, x => x);
-
-            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
-
-            //loop through each user group
-            foreach (var userGroup in allUserGroups)
-            {
-                //check if there's a permission set posted up for this user group
-                IEnumerable<string> groupPermissions;
-                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
-                {
-                    //create a string collection of the assigned letters
-                    var groupPermissionCodes = groupPermissions.ToArray();
-
-                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
-                    //for this group/node which will go back to the defaults
-                    if (groupPermissionCodes.Length == 0)
-                    {
-                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                    }
-                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
-                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
-                    {
-                        //only remove them if they are actually currently assigned
-                        if (contentPermissions.ContainsKey(userGroup.Id))
-                        {
-                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
-                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                        }
-                    }
-                    //if they are different we need to update, otherwise there's nothing to update
-                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
-                    {
-
-                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
-                    }
-                }
-            }
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        /// <summary>
-        /// Returns the user group permissions for user groups assigned to this node
-        /// </summary>
-        /// <param name="contentId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
-        /// </remarks>
-        [EnsureUserPermissionForContent("contentId", 'R')]
-        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
-        {
-            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            //TODO: Should non-admins be able to see detailed permissions?
-
-            var allUserGroups = Services.UserService.GetAllUserGroups();
-
-            return GetDetailedPermissions(content, allUserGroups);
-        }
-
-        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
-        {
-            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
-            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
-
-            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
-
-            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
-                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
-
-            //get the actual assigned permissions
-            var assignedPermissionsByGroup = Services.ContentService.GetPermissions(content).ToArray();
-
-            //iterate over assigned and update the defaults with the real values
-            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
-            {
-                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
-
-                //clone the default permissions model to the assigned ones
-                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
-
-                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
-                //and we'll re-check it if it's one of the explicitly assigned ones
-                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
-                {
-                    permission.Checked = false;
-                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
-                }
-
-            }
-
-            return defaultPermissionsByGroup;
-        }
-
-        /// <summary>
-        /// Returns an item to be used to display the recycle bin for content
-        /// </summary>
-        /// <returns></returns>
-        public ContentItemDisplay GetRecycleBin()
-        {
-            var display = new ContentItemDisplay
-            {
-                Id = Constants.System.RecycleBinContent,
-                Alias = "recycleBin",
-                ParentId = -1,
-                Name = Services.TextService.Localize("general/recycleBin"),
-                ContentTypeAlias = "recycleBin",
-                CreateDate = DateTime.Now,
-                IsContainer = true,
-                Path = "-1," + Constants.System.RecycleBinContent
-            };
-
-            TabsAndPropertiesResolver.AddListView(display, "content", Services.DataTypeService, Services.TextService);
-
-            return display;
-        }
-
-        //fixme what about cultures?
-        public ContentItemDisplay GetBlueprintById(int id)
-        {
-            var foundContent = Services.ContentService.GetBlueprintById(id);
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-            }
-
-            var content = MapToDisplay(foundContent);
-
-            SetupBlueprint(content, foundContent);
-
-            return content;
-        }
-
-        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
-        {
-            content.AllowPreview = false;
-
-            //set a custom path since the tree that renders this has the content type id as the parent
-            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
-
-            content.AllowedActions = new[] { "A" };
-            content.IsBlueprint = true;
-
-            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
-            var propsTab = content.Tabs.Last();
-            propsTab.Properties = propsTab.Properties
-                .Where(p => excludeProps.Contains(p.Alias) == false);
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="culture"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(int id, string culture = null)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-                return null;//irrelevant since the above throws
-            }
-            var content = MapToDisplay(foundContent, culture);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Guid id, string culture = null)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-            if (foundContent == null)
-            {
-                HandleContentNotFound(id);
-                return null;//irrelevant since the above throws
-            }
-
-            var content = MapToDisplay(foundContent, culture);
-            return content;
-        }
-
-        /// <summary>
-        /// Gets the content json for the content id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [OutgoingEditorModelEvent]
-        [EnsureUserPermissionForContent("id")]
-        public ContentItemDisplay GetById(Udi id, string culture = null)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetById(guidUdi.Guid, culture);
-            }
-
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }   
-
-        /// <summary>
-        /// Gets an empty content item for the
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <param name="parentId"></param>
-        /// <returns>
-        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
-        /// it cannot actually list children if it doesn't exist yet.
-        /// </returns>
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
-        {
-            var contentType = Services.ContentTypeService.Get(contentTypeAlias);
-            if (contentType == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var emptyContent = Services.ContentService.Create("", parentId, contentType.Alias, Security.GetUserId().ResultOr(0));
-            var mapped = MapToDisplay(emptyContent);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-
-            if (contentType.VariesByCulture())
-            {
-                //Remove all variants except for the default since currently the default must be saved before other variants can be edited
-                //TODO: Allow for editing all variants at once ... this will be a future task
-                mapped.Variants = new[] { mapped.Variants.FirstOrDefault(x => x.IsCurrent) };
-            }
-
-            return mapped;
-        }
-
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
-        {
-            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
-            if (blueprint == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            blueprint.Id = 0;
-            blueprint.Name = string.Empty;
-            blueprint.ParentId = parentId;
-
-            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
-
-            //remove this tab if it exists: umbContainerView
-            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
-            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-            return mapped;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(int id)
-        {
-            var url = Umbraco.Url(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Guid id)
-        {
-            var url = Umbraco.UrlProvider.GetUrl(id);
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Gets the Url for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public HttpResponseMessage GetNiceUrl(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi != null)
-            {
-                return GetNiceUrl(guidUdi.Guid);
-            }
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
-        }
-
-        /// <summary>
-        /// Gets the children for the content id passed in
-        /// </summary>
-        /// <returns></returns>
-        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
-        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
-                int id,
-                string includeProperties,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
-                int pageSize = 0,
-                string orderBy = "SortOrder",
-                Direction orderDirection = Direction.Ascending,
-                bool orderBySystemField = true,
-                string filter = "")
-        {
-            long totalChildren;
-            IContent[] children;
-            if (pageNumber > 0 && pageSize > 0)
-            {
-                IQuery<IContent> queryFilter = null;
-                if (filter.IsNullOrWhiteSpace() == false)
-                {
-                    //add the default text filter
-                    queryFilter = SqlContext.Query<IContent>()
-                        .Where(x => x.Name.Contains(filter));
-                }
-
-                children = Services.ContentService
-                    .GetPagedChildren(
-                        id, (pageNumber - 1), pageSize,
-                        out totalChildren,
-                        orderBy, orderDirection, orderBySystemField,
-                        queryFilter).ToArray();
-            }
-            else
-            {
-                children = Services.ContentService.GetChildren(id).ToArray();
-                totalChildren = children.Length;
-            }
-
-            if (totalChildren == 0)
-            {
-                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
-            }
-
-            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
-            pagedResult.Items = children.Select(content =>
-                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
-                    opts =>
-                    {
-                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
-                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
-                        {
-                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
-                        }
-                    }));
-
-            return pagedResult;
-        }
-
-        /// <summary>
-        /// Returns permissions for all nodes passed in for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="nodeIds"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
-        {
-            var permissions = Services.UserService
-                    .GetPermissions(Security.CurrentUser, nodeIds);
-
-            var permissionsDictionary = new Dictionary<int, string[]>();
-            foreach (var nodeId in nodeIds)
-            {
-                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
-                permissionsDictionary.Add(nodeId, aggregatePerms);
-            }
-
-            return permissionsDictionary;
-        }
-
-        /// <summary>
-        /// Checks a nodes permission for the current user
-        /// TODO: This should be moved to the CurrentUserController?
-        /// </summary>
-        /// <param name="permissionToCheck"></param>
-        /// <param name="nodeId"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public bool HasPermission(string permissionToCheck, int nodeId)
-        {
-            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
-            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Creates a blueprint from a content item
-        /// </summary>
-        /// <param name="contentId">The content id to copy</param>
-        /// <param name="name">The name of the blueprint</param>
-        /// <returns></returns>
-        [HttpPost]
-        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
-        {
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
-
-            var content = Services.ContentService.GetById(contentId);
-            if (content == null)
-                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
-            EnsureUniqueName(name, content, "name");
-
-            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.GetUserId().ResultOr(0));
-
-            Services.ContentService.SaveBlueprint(blueprint, Security.GetUserId().ResultOr(0));
-
-            var notificationModel = new SimpleNotificationModel();
-            notificationModel.AddSuccessNotification(
-                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
-                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
-            );
-
-            return notificationModel;
-        }
-
-        private void EnsureUniqueName(string name, IContent content, string modelName)
-        {
-            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
-            if (existing.Any(x => x.Name == name && x.Id != content.Id))
-            {
-                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
-            }
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        public ContentItemDisplay PostSaveBlueprint([ModelBinder(typeof(ContentItemBinder))] ContentItemSave contentItem)
-        {
-            var contentItemDisplay = PostSaveInternal(contentItem,
-                content =>
-                {
-                    EnsureUniqueName(content.Name, content, "Name");
-
-                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
-                    //we need to reuse the underlying logic so return the result that it wants
-                    return OperationResult.Succeed(new EventMessages());
-                });
-            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
-
-            return contentItemDisplay;
-        }
-
-        /// <summary>
-        /// Saves content
-        /// </summary>
-        /// <returns></returns>
-        [FileUploadCleanupFilter]
-        [ContentPostValidate]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostSave([ModelBinder(typeof(ContentItemBinder))] ContentItemSave contentItem)
-        {
-            var contentItemDisplay = PostSaveInternal(contentItem, content => Services.ContentService.Save(contentItem.PersistedContent, Security.CurrentUser.Id));
-            //ensure the active culture is still selected
-            if (!contentItem.Culture.IsNullOrWhiteSpace())
-            {
-                foreach (var contentVariation in contentItemDisplay.Variants)
-                {
-                    contentVariation.IsCurrent = contentVariation.Language.IsoCode.InvariantEquals(contentItem.Culture);
-                }
-            }
-            return contentItemDisplay;
-        }
-
-        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, OperationResult> saveMethod)
-        {
-            //If we've reached here it means:
-            // * Our model has been bound
-            // * and validated
-            // * any file attachments have been saved to their temporary location for us to use
-            // * we have a reference to the DTO object and the persisted object
-            // * Permissions are valid
-            MapPropertyValues(contentItem);
-
-            //We need to manually check the validation results here because:
-            // * We still need to save the entity even if there are validation value errors
-            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
-            //      then we cannot continue saving, we can only display errors
-            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
-            //      a message indicating this
-            if (ModelState.IsValid == false)
-            {
-                if (!RequiredForPersistenceAttribute.HasRequiredValuesForPersistence(contentItem) && IsCreatingAction(contentItem.Action))
-                {
-                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                    // add the modelstate to the outgoing object and throw a validation message
-                    var forDisplay = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
-                    forDisplay.Errors = ModelState.ToErrorDictionary();
-                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
-
-                }
-
-                //if the model state is not valid we cannot publish so change it to save
-                switch (contentItem.Action)
-                {
-                    case ContentSaveAction.Publish:
-                        contentItem.Action = ContentSaveAction.Save;
-                        break;
-                    case ContentSaveAction.PublishNew:
-                        contentItem.Action = ContentSaveAction.SaveNew;
-                        break;
-                }
-            }
-
-            //initialize this to successful
-            var publishStatus = new PublishResult(null, contentItem.PersistedContent);
-            var wasCancelled = false;
-
-            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
-            {
-                //save the item
-                var saveResult = saveMethod(contentItem.PersistedContent);
-
-                wasCancelled = saveResult.Success == false && saveResult.Result == OperationResultType.FailedCancelledByEvent;
-            }
-            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
-            {
-                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
-                wasCancelled = sendResult == false;
-            }
-            else
-            {
-                PublishInternal(contentItem, ref publishStatus, ref wasCancelled);
-            }
-
-            //get the updated model
-            var display = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
-
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
-            HandleInvalidModelState(display);
-
-            //put the correct msgs in
-            switch (contentItem.Action)
-            {
-                case ContentSaveAction.Save:
-                case ContentSaveAction.SaveNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
-                            Services.TextService.Localize("speechBubbles/editContentSavedText"));
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.SendPublish:
-                case ContentSaveAction.SendPublishNew:
-                    if (wasCancelled == false)
-                    {
-                        display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
-                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
-                    }
-                    else
-                    {
-                        AddCancelMessage(display);
-                    }
-                    break;
-                case ContentSaveAction.Publish:
-                case ContentSaveAction.PublishNew:
-                    ShowMessageForPublishStatus(publishStatus, display);
-                    break;
-            }
-
-            //If the item is new and the operation was cancelled, we need to return a different
-            // status code so the UI can handle it since it won't be able to redirect since there
-            // is no Id to redirect to!
-            if (wasCancelled && IsCreatingAction(contentItem.Action))
-            {
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
-            }
-
-            display.PersistedContent = contentItem.PersistedContent;
-
-            return display;
-        }
-
-        /// <summary>
-        /// Performs the publishing operation for a content item
-        /// </summary>
-        /// <param name="contentItem"></param>
-        /// <param name="publishStatus"></param>
-        /// <param name="wasCancelled"></param>
-        /// <remarks>
-        /// If this is a culture variant than we need to do some validation, if it's not we'll publish as normal
-        /// </remarks>
-        private void PublishInternal(ContentItemSave contentItem, ref PublishResult publishStatus, ref bool wasCancelled)
-        {
-            if (!contentItem.PersistedContent.ContentType.VariesByCulture())
-            {
-                //its invariant, proceed normally
-                publishStatus = Services.ContentService.SaveAndPublish(contentItem.PersistedContent, userId: Security.CurrentUser.Id);
-                wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
-            }
-            else
-            {
-                var canPublish = true;
-
-                //check if we are publishing other variants and validate them
-                var allLangs = Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase);
-                var otherVariantsToValidate = contentItem.PublishVariations.Where(x => !x.Culture.InvariantEquals(contentItem.Culture)).ToList();
-
-                //validate any mandatory variants that are not in the list
-                var mandatoryLangs = Mapper.Map<IEnumerable<ILanguage>, IEnumerable<Language>>(allLangs.Values)
-                    .Where(x => otherVariantsToValidate.All(v => !v.Culture.InvariantEquals(x.IsoCode))) //don't include variants above
-                    .Where(x => !x.IsoCode.InvariantEquals(contentItem.Culture)) //don't include the current variant
-                    .Where(x => x.Mandatory);
-                foreach (var lang in mandatoryLangs)
-                {
-                    //cannot continue publishing since a required language that is not currently being published isn't published
-                    if (!contentItem.PersistedContent.IsCulturePublished(lang.IsoCode))
-                    {
-                        var errMsg = Services.TextService.Localize("speechBubbles/contentReqCulturePublishError", new[] { allLangs[lang.IsoCode].CultureName });
-                        ModelState.AddModelError("publish_variant_" + lang.IsoCode + "_", errMsg);
-                        canPublish = false;
-                    }
-                }
-
-                if (canPublish)
-                {
-                    //validate all other variants to be published
-                    foreach (var publishVariation in otherVariantsToValidate)
-                    {
-                        //validate the content item and the culture property values, we don't need to validate any invariant property values here because they will have
-                        //been validated in the post.
-                        var valid = contentItem.PersistedContent.IsValid(publishVariation.Culture);
-                        if (!valid)
-                        {
-                            var errMsg = Services.TextService.Localize("speechBubbles/contentCultureValidationError", new[] { allLangs[publishVariation.Culture].CultureName });
-                            ModelState.AddModelError("publish_variant_" + publishVariation.Culture + "_", errMsg);
-                            canPublish = false;
-                        }
-                    }
-                }
-
-                if (canPublish)
-                {
-                    //try to publish all the values on the model
-                    canPublish = PublishCulture(contentItem, otherVariantsToValidate, allLangs);
-                }
-
-                if (canPublish)
-                {
-                    //proceed to publish if all validation still succeeds
-                    publishStatus = Services.ContentService.SavePublishing(contentItem.PersistedContent, Security.CurrentUser.Id);
-                    wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
-                }
-                else
-                {
-                    //can only save
-                    var saveResult = Services.ContentService.Save(contentItem.PersistedContent, Security.CurrentUser.Id);
-                    publishStatus = new PublishResult(PublishResultType.FailedCannotPublish, null, contentItem.PersistedContent);
-                    wasCancelled = saveResult.Result == OperationResultType.FailedCancelledByEvent;
-                }
-            }
-        }
-
-        /// <summary>
-        /// This will call TryPublishValues on the content item for each culture that needs to be published including the invariant culture
-        /// </summary>
-        /// <param name="contentItem"></param>
-        /// <param name="otherVariantsToValidate"></param>
-        /// <param name="allLangs"></param>
-        /// <returns></returns>
-        private bool PublishCulture(ContentItemSave contentItem, IEnumerable<ContentVariationPublish> otherVariantsToValidate, IDictionary<string, ILanguage> allLangs)
-        {
-            var culturesToPublish = new List<string> { contentItem.Culture };
-            culturesToPublish.AddRange(otherVariantsToValidate.Select(x => x.Culture));
-
-            foreach(var culture in culturesToPublish)
-            {
-                // publishing any culture, implies the invariant culture
-                var valid = contentItem.PersistedContent.PublishCulture(culture);
-                if (!valid)
-                {
-                    var errMsg = Services.TextService.Localize("speechBubbles/contentCultureUnexpectedValidationError", new[] { allLangs[culture].CultureName });
-                    ModelState.AddModelError("publish_variant_" + culture + "_", errMsg);
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Publishes a document with a given ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Publish access to this node.
-        /// </remarks>
-        ///
-        [EnsureUserPermissionForContent("id", 'U')]
-        public HttpResponseMessage PostPublishById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            var publishResult = Services.ContentService.SavePublishing(foundContent, Security.GetUserId().ResultOr(0));
-            if (publishResult.Success == false)
-            {
-                var notificationModel = new SimpleNotificationModel();
-                ShowMessageForPublishStatus(publishResult, notificationModel);
-                return Request.CreateValidationErrorResponse(notificationModel);
-            }
-
-            //return ok
-            return Request.CreateResponse(HttpStatusCode.OK);
-
-        }
-
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteBlueprint(int id)
-        {
-            var found = Services.ContentService.GetBlueprintById(id);
-
-            if (found == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            Services.ContentService.DeleteBlueprint(found);
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
-        /// does not have Delete access to this node.
-        /// </remarks>
-        [EnsureUserPermissionForContent("id", 'D')]
-        [HttpDelete]
-        [HttpPost]
-        public HttpResponseMessage DeleteById(int id)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-            {
-                return HandleContentNotFound(id, false);
-            }
-
-            //if the current item is in the recycle bin
-            if (foundContent.Trashed == false)
-            {
-                var moveResult = Services.ContentService.MoveToRecycleBin(foundContent, Security.GetUserId().ResultOr(0));
-                if (moveResult.Success == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-            else
-            {
-                var deleteResult = Services.ContentService.Delete(foundContent, Security.GetUserId().ResultOr(0));
-                if (deleteResult.Success == false)
-                {
-                    //returning an object of INotificationModel will ensure that any pending
-                    // notification messages are added to the response.
-                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
-                }
-            }
-
-            return Request.CreateResponse(HttpStatusCode.OK);
-        }
-
-        /// <summary>
-        /// Empties the recycle bin
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
-        /// </remarks>
-        [HttpDelete]
-        [HttpPost]
-        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent)]
-        public HttpResponseMessage EmptyRecycleBin()
-        {
-            Services.ContentService.EmptyRecycleBin();
-
-            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
-        }
-
-        /// <summary>
-        /// Change the sort order for content
-        /// </summary>
-        /// <param name="sorted"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
-        public HttpResponseMessage PostSort(ContentSortOrder sorted)
-        {
-            if (sorted == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
-
-            //if there's nothing to sort just return ok
-            if (sorted.IdSortOrder.Length == 0)
-            {
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-
-            try
-            {
-                var contentService = Services.ContentService;
-
-                // Save content with new sort order and update content xml in db accordingly
-                if (contentService.Sort(sorted.IdSortOrder) == false)
-                {
-                    Logger.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
-                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
-                }
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error<ContentController>("Could not update content sort order", ex);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Change the sort order for media
-        /// </summary>
-        /// <param name="move"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("move.ParentId", 'M')]
-        public HttpResponseMessage PostMove(MoveOrCopy move)
-        {
-            var toMove = ValidateMoveOrCopy(move);
-
-            Services.ContentService.Move(toMove, move.ParentId, Security.GetUserId().ResultOr(0));
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Copies a content item and places the copy as a child of a given parent Id
-        /// </summary>
-        /// <param name="copy"></param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
-        public HttpResponseMessage PostCopy(MoveOrCopy copy)
-        {
-            var toCopy = ValidateMoveOrCopy(copy);
-
-            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.GetUserId().ResultOr(0));
-
-            var response = Request.CreateResponse(HttpStatusCode.OK);
-            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
-            return response;
-        }
-
-        /// <summary>
-        /// Unpublishes a node with a given Id and returns the unpublished entity
-        /// </summary>
-        /// <param name="id">The content id to unpublish</param>
-        /// <param name="id">The culture variant for the content id to unpublish, if none specified will unpublish all variants of the content</param>
-        /// <returns></returns>
-        [EnsureUserPermissionForContent("id", 'U')]
-        [OutgoingEditorModelEvent]
-        public ContentItemDisplay PostUnPublish(int id, string culture = null)
-        {
-            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
-            if (foundContent == null)
-                HandleContentNotFound(id);
-
-            var unpublishResult = Services.ContentService.Unpublish(foundContent, culture: culture, userId: Security.GetUserId().ResultOr(0));
-
-            var content = MapToDisplay(foundContent, culture);
-
-            if (!unpublishResult.Success)
-            {
-                AddCancelMessage(content);
-                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
-            }
-            else
-            {
-                //fixme should have a better localized method for when we have the UnpublishResultType.SuccessMandatoryCulture status
-
-                content.AddSuccessNotification(
-                    Services.TextService.Localize("content/unPublish"),
-                    unpublishResult.Result == UnpublishResultType.SuccessCulture
-                        ? Services.TextService.Localize("speechBubbles/contentVariationUnpublished", new[] { culture })
-                        : Services.TextService.Localize("speechBubbles/contentUnpublished"));
-
-                return content;
-            }
-        }
-
-        [HttpPost]
-        public DomainSave PostSaveLanguageAndDomains(DomainSave model)
-        {
-            var node = Services.ContentService.GetById(model.NodeId);
-
-            if (node == null)
-            {
-                var response = Request.CreateResponse(HttpStatusCode.BadRequest);
-                response.Content = new StringContent($"There is no content node with id {model.NodeId}.");
-                response.ReasonPhrase = "Node Not Found.";
-                throw new HttpResponseException(response);
-            }
-
-            var permission = Services.UserService.GetPermissions(Security.CurrentUser, node.Path);
-
-            if (permission.AssignedPermissions.Contains(ActionAssignDomain.Instance.Letter.ToString(), StringComparer.Ordinal) == false)
-            {
-                var response = Request.CreateResponse(HttpStatusCode.BadRequest);
-                response.Content = new StringContent("You do not have permission to assign domains on that node.");
-                response.ReasonPhrase = "Permission Denied.";
-                throw new HttpResponseException(response);
-            }
-
-            model.Valid = true;
-            var domains = Services.DomainService.GetAssignedDomains(model.NodeId, true).ToArray();
-            var languages = Services.LocalizationService.GetAllLanguages().ToArray();
-            var language = model.Language > 0 ? languages.FirstOrDefault(l => l.Id == model.Language) : null;
-
-            // process wildcard
-            if (language != null)
-            {
-                // yet there is a race condition here...
-                var wildcard = domains.FirstOrDefault(d => d.IsWildcard);
-                if (wildcard != null)
-                {
-                    wildcard.LanguageId = language.Id;
-                }
-                else
-                {
-                    wildcard = new UmbracoDomain("*" + model.NodeId)
-                    {
-                        LanguageId = model.Language,
-                        RootContentId = model.NodeId
-                    };
-                }
-
-                var saveAttempt = Services.DomainService.Save(wildcard);
-                if (saveAttempt == false)
-                {
-                    var response = Request.CreateResponse(HttpStatusCode.BadRequest);
-                    response.Content = new StringContent("Saving domain failed");
-                    response.ReasonPhrase = saveAttempt.Result.Result.ToString();
-                    throw new HttpResponseException(response);
-                }
-            }
-            else
-            {
-                var wildcard = domains.FirstOrDefault(d => d.IsWildcard);
-                if (wildcard != null)
-                {
-                    Services.DomainService.Delete(wildcard);
-                }
-            }
-
-            // process domains
-            // delete every (non-wildcard) domain, that exists in the DB yet is not in the model
-            foreach (var domain in domains.Where(d => d.IsWildcard == false && model.Domains.All(m => m.Name.InvariantEquals(d.DomainName) == false)))
-            {
-                Services.DomainService.Delete(domain);
-            }
-            
-            var names = new List<string>();
-
-            // create or update domains in the model
-            foreach (var domainModel in model.Domains.Where(m => string.IsNullOrWhiteSpace(m.Name) == false))
-            {
-                language = languages.FirstOrDefault(l => l.Id == domainModel.Lang);
-                if (language == null)
-                {
-                    continue;
-                }
-
-                var name = domainModel.Name.ToLowerInvariant();
-                if (names.Contains(name))
-                {
-                    domainModel.Duplicate = true;
-                    continue;
-                }
-                names.Add(name);
-                var domain = domains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainModel.Name));
-                if (domain != null)
-                {
-                    domain.LanguageId = language.Id;
-                    Services.DomainService.Save(domain);
-                }
-                else if (Services.DomainService.Exists(domainModel.Name))
-                {
-                    domainModel.Duplicate = true;
-                    var xdomain = Services.DomainService.GetByName(domainModel.Name);
-                    var xrcid = xdomain.RootContentId;
-                    if (xrcid.HasValue)
-                    {
-                        var xcontent = Services.ContentService.GetById(xrcid.Value);
-                        var xnames = new List<string>();
-                        while (xcontent != null)
-                        {
-                            xnames.Add(xcontent.Name);
-                            if (xcontent.ParentId < -1)
-                                xnames.Add("Recycle Bin");
-                            xcontent = xcontent.Parent(Services.ContentService);
-                        }
-                        xnames.Reverse();
-                        domainModel.Other = "/" + string.Join("/", xnames);
-                    }
-                }
-                else
-                {
-                    // yet there is a race condition here...
-                    var newDomain = new UmbracoDomain(name)
-                    {
-                        LanguageId = domainModel.Lang,
-                        RootContentId = model.NodeId
-                    };
-                    var saveAttempt = Services.DomainService.Save(newDomain);
-                    if (saveAttempt == false)
-                    {
-                        var response = Request.CreateResponse(HttpStatusCode.BadRequest);
-                        response.Content = new StringContent("Saving new domain failed");
-                        response.ReasonPhrase = saveAttempt.Result.Result.ToString();
-                        throw new HttpResponseException(response);
-                    }
-                }
-            }
-
-            model.Valid = model.Domains.All(m => m.Duplicate == false);
-
-            return model;
-        }
-
-        /// <summary>
-        /// Maps the dto property values to the persisted model
-        /// </summary>
-        /// <param name="contentItem"></param>
-        private void MapPropertyValues(ContentItemSave contentItem)
-        {
-            //Don't update the name if it is empty
-            if (!contentItem.Name.IsNullOrWhiteSpace())
-            {
-                if (contentItem.PersistedContent.ContentType.VariesByCulture())
-                {
-                    if (contentItem.Culture.IsNullOrWhiteSpace())
-                        throw new InvalidOperationException($"Cannot set culture name without a culture.");
-                    contentItem.PersistedContent.SetCultureName(contentItem.Name, contentItem.Culture);
-                }
-                else
-                {
-                    contentItem.PersistedContent.Name = contentItem.Name;
-                }
-            }
-
-            //TODO: We need to support 'send to publish'
-
-            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
-            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
-            //only set the template if it didn't change
-            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
-                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
-            if (templateChanged)
-            {
-                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
-                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
-                {
-                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
-                    Logger.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
-                }
-                else
-                {
-                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
-                    contentItem.PersistedContent.Template = template;
-                }
-            }
-
-            bool Varies(Property property) => property.PropertyType.VariesByCulture();
-
-            MapPropertyValues<IContent, ContentItemSave>(
-                contentItem,
-                (save, property) => Varies(property) ? property.GetValue(save.Culture) : property.GetValue(),         //get prop val
-                (save, property, v) => { if (Varies(property)) property.SetValue(v, save.Culture); else property.SetValue(v); });  //set prop val
-        }
-
-        /// <summary>
-        /// Ensures the item can be moved/copied to the new location
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        private IContent ValidateMoveOrCopy(MoveOrCopy model)
-        {
-            if (model == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var contentService = Services.ContentService;
-            var toMove = contentService.GetById(model.Id);
-            if (toMove == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            if (model.ParentId < 0)
-            {
-                //cannot move if the content item is not allowed at the root
-                if (toMove.ContentType.AllowedAsRoot == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
-                }
-            }
-            else
-            {
-                var parent = contentService.GetById(model.ParentId);
-                if (parent == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-
-                //check if the item is allowed under this one
-                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
-                        .Any(x => x.Value == toMove.ContentType.Id) == false)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
-                }
-
-                // Check on paths
-                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
-                {
-                    throw new HttpResponseException(
-                            Request.CreateNotificationValidationErrorResponse(
-                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
-                }
-            }
-
-            return toMove;
-        }
-
-        private void ShowMessageForPublishStatus(PublishResult status, INotificationModel display)
-        {
-            switch (status.Result)
-            {
-                case PublishResultType.Success:
-                case PublishResultType.SuccessAlready:
-                    display.AddSuccessNotification(
-                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
-                            Services.TextService.Localize("speechBubbles/editContentPublishedText"));
-                    break;
-                case PublishResultType.FailedPathNotPublished:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
-                                new[] { $"{status.Content.Name} ({status.Content.Id})" }).Trim());
-                    break;
-                case PublishResultType.FailedCancelledByEvent:
-                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
-                    break;
-                case PublishResultType.FailedAwaitingRelease:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
-                                new[] { $"{status.Content.Name} ({status.Content.Id})" }).Trim());
-                    break;
-                case PublishResultType.FailedHasExpired:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
-                                new[] { $"{status.Content.Name} ({status.Content.Id})", }).Trim());
-                    break;
-                case PublishResultType.FailedIsTrashed:
-                    display.AddWarningNotification(
-                        Services.TextService.Localize("publish"),
-                        "publish/contentPublishedFailedIsTrashed"); // fixme properly localize!
-                    break;
-                case PublishResultType.FailedContentInvalid:
-                    display.AddWarningNotification(
-                            Services.TextService.Localize("publish"),
-                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
-                                new[]
-                                {
-                                    $"{status.Content.Name} ({status.Content.Id})",
-                                    string.Join(",", status.InvalidProperties.Select(x => x.Alias))
-                                }).Trim());
-                    break;
-                case PublishResultType.FailedByCulture:
-                    display.AddWarningNotification(
-                        Services.TextService.Localize("publish"),
-                        "publish/contentPublishedFailedByCulture"); // fixme properly localize!
-                    break;
-                default:
-                    throw new IndexOutOfRangeException($"PublishedResultType \"{status.Result}\" was not expected.");
-            }
-        }
-
-        /// <summary>
-        /// Performs a permissions check for the user to check if it has access to the node based on
-        /// start node and/or permissions for the node
-        /// </summary>
-        /// <param name="storage">The storage to add the content item to so it can be reused</param>
-        /// <param name="user"></param>
-        /// <param name="userService"></param>
-        /// <param name="contentService"></param>
-        /// <param name="entityService"></param>
-        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
-        /// <param name="permissionsToCheck"></param>
-        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
-        /// <returns></returns>
-        internal static bool CheckPermissions(
-                IDictionary<string, object> storage,
-                IUser user,
-                IUserService userService,
-                IContentService contentService,
-                IEntityService entityService,
-                int nodeId,
-                char[] permissionsToCheck = null,
-                IContent contentItem = null)
-        {
-            if (storage == null) throw new ArgumentNullException("storage");
-            if (user == null) throw new ArgumentNullException("user");
-            if (userService == null) throw new ArgumentNullException("userService");
-            if (contentService == null) throw new ArgumentNullException("contentService");
-            if (entityService == null) throw new ArgumentNullException("entityService");
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                contentItem = contentService.GetById(nodeId);
-                //put the content item into storage so it can be retreived
-                // in the controller (saves a lookup)
-                storage[typeof(IContent).ToString()] = contentItem;
-            }
-
-            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            var hasPathAccess = (nodeId == Constants.System.Root)
-                ? user.HasContentRootAccess(entityService)
-                : (nodeId == Constants.System.RecycleBinContent)
-                    ? user.HasContentBinAccess(entityService)
-                    : user.HasPathAccess(contentItem, entityService);
-
-            if (hasPathAccess == false)
-            {
-                return false;
-            }
-
-            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
-            {
-                return true;
-            }
-
-            //get the implicit/inherited permissions for the user for this path,
-            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
-            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
-            var permission = userService.GetPermissionsForPath(user, path);
-
-            var allowed = true;
-            foreach (var p in permissionsToCheck)
-            {
-                if (permission == null
-                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
-                {
-                    allowed = false;
-                }
-            }
-            return allowed;
-        }
-
-        /// <summary>
-        /// Used to map an <see cref="IContent"/> instance to a <see cref="ContentItemDisplay"/> and ensuring a language is present if required
-        /// </summary>
-        /// <param name="content"></param>
-        /// <param name="culture"></param>
-        /// <returns></returns>
-        private ContentItemDisplay MapToDisplay(IContent content, string culture = null)
-        {
-            //A culture must exist in the mapping context if this content type is CultureNeutral since for a culture variant to be edited,
-            // the Cuture property of ContentItemDisplay must exist (at least currently).
-            if (culture == null && content.ContentType.VariesByCulture())
-            {
-                //If a culture is not explicitly sent up, then it means that the user is editing the default variant language.
-                culture = Services.LocalizationService.GetDefaultLanguageIsoCode();
-            }
-
-            var display = ContextMapper.Map<IContent, ContentItemDisplay>(content, 
-                new Dictionary<string, object> { { ContextMapper.CultureKey, culture } });
-
-            return display;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.ModelBinding;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Models.Mapping;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Binders;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Web.PublishedCache;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models.Validation;
+using Umbraco.Web.Models;
+using Umbraco.Web.WebServices;
+using Umbraco.Web._Legacy.Actions;
+using Constants = Umbraco.Core.Constants;
+using ContentVariation = Umbraco.Core.Models.ContentVariation;
+using Language = Umbraco.Web.Models.ContentEditing.Language;
+
+namespace Umbraco.Web.Editors
+{
+    /// <summary>
+    /// The API controller used for editing content
+    /// </summary>
+    /// <remarks>
+    /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
+    /// access to ALL of the methods on this controller will need access to the content application.
+    /// </remarks>
+    [PluginController("UmbracoApi")]
+    [UmbracoApplicationAuthorize(Constants.Applications.Content)]
+    [ContentControllerConfiguration]
+    public class ContentController : ContentControllerBase
+    {
+        private readonly IPublishedSnapshotService _publishedSnapshotService;
+
+        public ContentController(IPublishedSnapshotService publishedSnapshotService)
+        {
+            if (publishedSnapshotService == null) throw new ArgumentNullException(nameof(publishedSnapshotService));
+            _publishedSnapshotService = publishedSnapshotService;
+        }
+
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))    
+                ));
+            }
+        }
+
+        /// <summary>
+        /// Returns true if any content types have culture variation enabled
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [WebApi.UmbracoAuthorize, OverrideAuthorization]
+        public bool AllowsCultureVariation()
+        {
+            var contentTypes = Services.ContentTypeService.GetAll();
+            return contentTypes.Any(contentType => contentType.VariesByCulture());
+        }
+
+        /// <summary>
+        /// Return content for the specified ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
+        public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
+        {
+            //fixme what about cultures?
+
+            var foundContent = Services.ContentService.GetByIds(ids);
+            return foundContent.Select(x => MapToDisplay(x));
+        }
+
+        /// <summary>
+        /// Updates the permissions for a content item for a particular user group
+        /// </summary>
+        /// <param name="saveModel"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
+        /// </remarks>
+        [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
+        {
+            if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be alowed to set granular permissions?
+
+            var content = Services.ContentService.GetById(saveModel.ContentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //current permissions explicitly assigned to this content item
+            var contentPermissions = Services.ContentService.GetPermissions(content)
+                .ToDictionary(x => x.UserGroupId, x => x);
+
+            var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
+
+            //loop through each user group
+            foreach (var userGroup in allUserGroups)
+            {
+                //check if there's a permission set posted up for this user group
+                IEnumerable<string> groupPermissions;
+                if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
+                {
+                    //create a string collection of the assigned letters
+                    var groupPermissionCodes = groupPermissions.ToArray();
+
+                    //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
+                    //for this group/node which will go back to the defaults
+                    if (groupPermissionCodes.Length == 0)
+                    {
+                        Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                    }
+                    //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
+                    else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
+                    {
+                        //only remove them if they are actually currently assigned
+                        if (contentPermissions.ContainsKey(userGroup.Id))
+                        {
+                            //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
+                            Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+                        }
+                    }
+                    //if they are different we need to update, otherwise there's nothing to update
+                    else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
+                    {
+
+                        Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
+                    }
+                }
+            }
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        /// <summary>
+        /// Returns the user group permissions for user groups assigned to this node
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
+        /// </remarks>
+        [EnsureUserPermissionForContent("contentId", 'R')]
+        public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
+        {
+            if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            //TODO: Should non-admins be able to see detailed permissions?
+
+            var allUserGroups = Services.UserService.GetAllUserGroups();
+
+            return GetDetailedPermissions(content, allUserGroups);
+        }
+
+        private IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(IContent content, IEnumerable<IUserGroup> allUserGroups)
+        {
+            //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
+            //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
+
+            var defaultPermissionsByGroup = Mapper.Map<IEnumerable<AssignedUserGroupPermissions>>(allUserGroups).ToArray();
+
+            var defaultPermissionsAsDictionary = defaultPermissionsByGroup
+                .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
+
+            //get the actual assigned permissions
+            var assignedPermissionsByGroup = Services.ContentService.GetPermissions(content).ToArray();
+
+            //iterate over assigned and update the defaults with the real values
+            foreach (var assignedGroupPermission in assignedPermissionsByGroup)
+            {
+                var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
+
+                //clone the default permissions model to the assigned ones
+                defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
+
+                //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
+                //and we'll re-check it if it's one of the explicitly assigned ones
+                foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
+                {
+                    permission.Checked = false;
+                    permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
+                }
+
+            }
+
+            return defaultPermissionsByGroup;
+        }
+
+        /// <summary>
+        /// Returns an item to be used to display the recycle bin for content
+        /// </summary>
+        /// <returns></returns>
+        public ContentItemDisplay GetRecycleBin()
+        {
+            var display = new ContentItemDisplay
+            {
+                Id = Constants.System.RecycleBinContent,
+                Alias = "recycleBin",
+                ParentId = -1,
+                Name = Services.TextService.Localize("general/recycleBin"),
+                ContentTypeAlias = "recycleBin",
+                CreateDate = DateTime.Now,
+                IsContainer = true,
+                Path = "-1," + Constants.System.RecycleBinContent
+            };
+
+            TabsAndPropertiesResolver.AddListView(display, "content", Services.DataTypeService, Services.TextService);
+
+            return display;
+        }
+
+        //fixme what about cultures?
+        public ContentItemDisplay GetBlueprintById(int id)
+        {
+            var foundContent = Services.ContentService.GetBlueprintById(id);
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+            }
+
+            var content = MapToDisplay(foundContent);
+
+            SetupBlueprint(content, foundContent);
+
+            return content;
+        }
+
+        private static void SetupBlueprint(ContentItemDisplay content, IContent persistedContent)
+        {
+            content.AllowPreview = false;
+
+            //set a custom path since the tree that renders this has the content type id as the parent
+            content.Path = string.Format("-1,{0},{1}", persistedContent.ContentTypeId, content.Id);
+
+            content.AllowedActions = new[] { "A" };
+            content.IsBlueprint = true;
+
+            var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
+            var propsTab = content.Tabs.Last();
+            propsTab.Properties = propsTab.Properties
+                .Where(p => excludeProps.Contains(p.Alias) == false);
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(int id, string culture = null)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+                return null;//irrelevant since the above throws
+            }
+            var content = MapToDisplay(foundContent, culture);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Guid id, string culture = null)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+            if (foundContent == null)
+            {
+                HandleContentNotFound(id);
+                return null;//irrelevant since the above throws
+            }
+
+            var content = MapToDisplay(foundContent, culture);
+            return content;
+        }
+
+        /// <summary>
+        /// Gets the content json for the content id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [EnsureUserPermissionForContent("id")]
+        public ContentItemDisplay GetById(Udi id, string culture = null)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetById(guidUdi.Guid, culture);
+            }
+
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }   
+
+        /// <summary>
+        /// Gets an empty content item for the
+        /// </summary>
+        /// <param name="contentTypeAlias"></param>
+        /// <param name="parentId"></param>
+        /// <returns>
+        /// If this is a container type, we'll remove the umbContainerView tab for a new item since
+        /// it cannot actually list children if it doesn't exist yet.
+        /// </returns>
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
+        {
+            var contentType = Services.ContentTypeService.Get(contentTypeAlias);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var emptyContent = Services.ContentService.Create("", parentId, contentType.Alias, Security.GetUserId().ResultOr(0));
+            var mapped = MapToDisplay(emptyContent);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+
+            if (contentType.VariesByCulture())
+            {
+                //Remove all variants except for the default since currently the default must be saved before other variants can be edited
+                //TODO: Allow for editing all variants at once ... this will be a future task
+                mapped.Variants = new[] { mapped.Variants.FirstOrDefault(x => x.IsCurrent) };
+            }
+
+            return mapped;
+        }
+
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
+        {
+            var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
+            if (blueprint == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            blueprint.Id = 0;
+            blueprint.Name = string.Empty;
+            blueprint.ParentId = parentId;
+
+            var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
+
+            //remove this tab if it exists: umbContainerView
+            var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+            mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+            return mapped;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(int id)
+        {
+            var url = Umbraco.Url(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Guid id)
+        {
+            var url = Umbraco.UrlProvider.GetUrl(id);
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(url, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Gets the Url for a given node ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public HttpResponseMessage GetNiceUrl(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi != null)
+            {
+                return GetNiceUrl(guidUdi.Guid);
+            }
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+        }
+
+        /// <summary>
+        /// Gets the children for the content id passed in
+        /// </summary>
+        /// <returns></returns>
+        [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic, IContent>>), "Items")]
+        public PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>> GetChildren(
+                int id,
+                string includeProperties,
+                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageSize = 0,
+                string orderBy = "SortOrder",
+                Direction orderDirection = Direction.Ascending,
+                bool orderBySystemField = true,
+                string filter = "")
+        {
+            long totalChildren;
+            IContent[] children;
+            if (pageNumber > 0 && pageSize > 0)
+            {
+                IQuery<IContent> queryFilter = null;
+                if (filter.IsNullOrWhiteSpace() == false)
+                {
+                    //add the default text filter
+                    queryFilter = SqlContext.Query<IContent>()
+                        .Where(x => x.Name.Contains(filter));
+                }
+
+                children = Services.ContentService
+                    .GetPagedChildren(
+                        id, (pageNumber - 1), pageSize,
+                        out totalChildren,
+                        orderBy, orderDirection, orderBySystemField,
+                        queryFilter).ToArray();
+            }
+            else
+            {
+                children = Services.ContentService.GetChildren(id).ToArray();
+                totalChildren = children.Length;
+            }
+
+            if (totalChildren == 0)
+            {
+                return new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(0, 0, 0);
+            }
+
+            var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic, IContent>>(totalChildren, pageNumber, pageSize);
+            pagedResult.Items = children.Select(content =>
+                Mapper.Map<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>(content,
+                    opts =>
+                    {
+                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
+                        if (String.IsNullOrWhiteSpace(includeProperties) == false)
+                        {
+                            opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
+                        }
+                    }));
+
+            return pagedResult;
+        }
+
+        /// <summary>
+        /// Returns permissions for all nodes passed in for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="nodeIds"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
+        {
+            var permissions = Services.UserService
+                    .GetPermissions(Security.CurrentUser, nodeIds);
+
+            var permissionsDictionary = new Dictionary<int, string[]>();
+            foreach (var nodeId in nodeIds)
+            {
+                var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
+                permissionsDictionary.Add(nodeId, aggregatePerms);
+            }
+
+            return permissionsDictionary;
+        }
+
+        /// <summary>
+        /// Checks a nodes permission for the current user
+        /// TODO: This should be moved to the CurrentUserController?
+        /// </summary>
+        /// <param name="permissionToCheck"></param>
+        /// <param name="nodeId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public bool HasPermission(string permissionToCheck, int nodeId)
+        {
+            var p = Services.UserService.GetPermissions(Security.CurrentUser, nodeId).GetAllPermissions();
+            if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a blueprint from a content item
+        /// </summary>
+        /// <param name="contentId">The content id to copy</param>
+        /// <param name="name">The name of the blueprint</param>
+        /// <returns></returns>
+        [HttpPost]
+        public SimpleNotificationModel CreateBlueprintFromContent([FromUri]int contentId, [FromUri]string name)
+        {
+            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
+
+            var content = Services.ContentService.GetById(contentId);
+            if (content == null)
+                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+            EnsureUniqueName(name, content, "name");
+
+            var blueprint = Services.ContentService.CreateContentFromBlueprint(content, name, Security.GetUserId().ResultOr(0));
+
+            Services.ContentService.SaveBlueprint(blueprint, Security.GetUserId().ResultOr(0));
+
+            var notificationModel = new SimpleNotificationModel();
+            notificationModel.AddSuccessNotification(
+                Services.TextService.Localize("blueprints/createdBlueprintHeading"),
+                Services.TextService.Localize("blueprints/createdBlueprintMessage", new[] { content.Name })
+            );
+
+            return notificationModel;
+        }
+
+        private void EnsureUniqueName(string name, IContent content, string modelName)
+        {
+            var existing = Services.ContentService.GetBlueprintsForContentTypes(content.ContentTypeId);
+            if (existing.Any(x => x.Name == name && x.Id != content.Id))
+            {
+                ModelState.AddModelError(modelName, Services.TextService.Localize("blueprints/duplicateBlueprintMessage"));
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
+            }
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        public ContentItemDisplay PostSaveBlueprint([ModelBinder(typeof(ContentItemBinder))] ContentItemSave contentItem)
+        {
+            var contentItemDisplay = PostSaveInternal(contentItem,
+                content =>
+                {
+                    EnsureUniqueName(content.Name, content, "Name");
+
+                    Services.ContentService.SaveBlueprint(contentItem.PersistedContent, Security.CurrentUser.Id);
+                    //we need to reuse the underlying logic so return the result that it wants
+                    return OperationResult.Succeed(new EventMessages());
+                });
+            SetupBlueprint(contentItemDisplay, contentItemDisplay.PersistedContent);
+
+            return contentItemDisplay;
+        }
+
+        /// <summary>
+        /// Saves content
+        /// </summary>
+        /// <returns></returns>
+        [FileUploadCleanupFilter]
+        [ContentPostValidate]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostSave([ModelBinder(typeof(ContentItemBinder))] ContentItemSave contentItem)
+        {
+            var contentItemDisplay = PostSaveInternal(contentItem, content => Services.ContentService.Save(contentItem.PersistedContent, Security.CurrentUser.Id));
+            //ensure the active culture is still selected
+            if (!contentItem.Culture.IsNullOrWhiteSpace())
+            {
+                foreach (var contentVariation in contentItemDisplay.Variants)
+                {
+                    contentVariation.IsCurrent = contentVariation.Language.IsoCode.InvariantEquals(contentItem.Culture);
+                }
+            }
+            return contentItemDisplay;
+        }
+
+        private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, OperationResult> saveMethod)
+        {
+            //If we've reached here it means:
+            // * Our model has been bound
+            // * and validated
+            // * any file attachments have been saved to their temporary location for us to use
+            // * we have a reference to the DTO object and the persisted object
+            // * Permissions are valid
+            MapPropertyValues(contentItem);
+
+            //We need to manually check the validation results here because:
+            // * We still need to save the entity even if there are validation value errors
+            // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
+            //      then we cannot continue saving, we can only display errors
+            // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
+            //      a message indicating this
+            if (ModelState.IsValid == false)
+            {
+                if (!RequiredForPersistenceAttribute.HasRequiredValuesForPersistence(contentItem) && IsCreatingAction(contentItem.Action))
+                {
+                    //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
+                    // add the modelstate to the outgoing object and throw a validation message
+                    var forDisplay = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
+                    forDisplay.Errors = ModelState.ToErrorDictionary();
+                    throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
+
+                }
+
+                //if the model state is not valid we cannot publish so change it to save
+                switch (contentItem.Action)
+                {
+                    case ContentSaveAction.Publish:
+                        contentItem.Action = ContentSaveAction.Save;
+                        break;
+                    case ContentSaveAction.PublishNew:
+                        contentItem.Action = ContentSaveAction.SaveNew;
+                        break;
+                }
+            }
+
+            //initialize this to successful
+            var publishStatus = new PublishResult(null, contentItem.PersistedContent);
+            var wasCancelled = false;
+
+            if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
+            {
+                //save the item
+                var saveResult = saveMethod(contentItem.PersistedContent);
+
+                wasCancelled = saveResult.Success == false && saveResult.Result == OperationResultType.FailedCancelledByEvent;
+            }
+            else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
+            {
+                var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
+                wasCancelled = sendResult == false;
+            }
+            else
+            {
+                PublishInternal(contentItem, ref publishStatus, ref wasCancelled);
+            }
+
+            //get the updated model
+            var display = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
+
+            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            HandleInvalidModelState(display);
+
+            //put the correct msgs in
+            switch (contentItem.Action)
+            {
+                case ContentSaveAction.Save:
+                case ContentSaveAction.SaveNew:
+                    if (wasCancelled == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
+                            Services.TextService.Localize("speechBubbles/editContentSavedText"));
+                    }
+                    else
+                    {
+                        AddCancelMessage(display);
+                    }
+                    break;
+                case ContentSaveAction.SendPublish:
+                case ContentSaveAction.SendPublishNew:
+                    if (wasCancelled == false)
+                    {
+                        display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
+                            Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
+                    }
+                    else
+                    {
+                        AddCancelMessage(display);
+                    }
+                    break;
+                case ContentSaveAction.Publish:
+                case ContentSaveAction.PublishNew:
+                    ShowMessageForPublishStatus(publishStatus, display);
+                    break;
+            }
+
+            //If the item is new and the operation was cancelled, we need to return a different
+            // status code so the UI can handle it since it won't be able to redirect since there
+            // is no Id to redirect to!
+            if (wasCancelled && IsCreatingAction(contentItem.Action))
+            {
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
+            }
+
+            display.PersistedContent = contentItem.PersistedContent;
+
+            return display;
+        }
+
+        /// <summary>
+        /// Performs the publishing operation for a content item
+        /// </summary>
+        /// <param name="contentItem"></param>
+        /// <param name="publishStatus"></param>
+        /// <param name="wasCancelled"></param>
+        /// <remarks>
+        /// If this is a culture variant than we need to do some validation, if it's not we'll publish as normal
+        /// </remarks>
+        private void PublishInternal(ContentItemSave contentItem, ref PublishResult publishStatus, ref bool wasCancelled)
+        {
+            if (!contentItem.PersistedContent.ContentType.VariesByCulture())
+            {
+                //its invariant, proceed normally
+                publishStatus = Services.ContentService.SaveAndPublish(contentItem.PersistedContent, userId: Security.CurrentUser.Id);
+                wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
+            }
+            else
+            {
+                var canPublish = true;
+
+                //check if we are publishing other variants and validate them
+                var allLangs = Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase);
+                var otherVariantsToValidate = contentItem.PublishVariations.Where(x => !x.Culture.InvariantEquals(contentItem.Culture)).ToList();
+
+                //validate any mandatory variants that are not in the list
+                var mandatoryLangs = Mapper.Map<IEnumerable<ILanguage>, IEnumerable<Language>>(allLangs.Values)
+                    .Where(x => otherVariantsToValidate.All(v => !v.Culture.InvariantEquals(x.IsoCode))) //don't include variants above
+                    .Where(x => !x.IsoCode.InvariantEquals(contentItem.Culture)) //don't include the current variant
+                    .Where(x => x.Mandatory);
+                foreach (var lang in mandatoryLangs)
+                {
+                    //cannot continue publishing since a required language that is not currently being published isn't published
+                    if (!contentItem.PersistedContent.IsCulturePublished(lang.IsoCode))
+                    {
+                        var errMsg = Services.TextService.Localize("speechBubbles/contentReqCulturePublishError", new[] { allLangs[lang.IsoCode].CultureName });
+                        ModelState.AddModelError("publish_variant_" + lang.IsoCode + "_", errMsg);
+                        canPublish = false;
+                    }
+                }
+
+                if (canPublish)
+                {
+                    //validate all other variants to be published
+                    foreach (var publishVariation in otherVariantsToValidate)
+                    {
+                        //validate the content item and the culture property values, we don't need to validate any invariant property values here because they will have
+                        //been validated in the post.
+                        var valid = contentItem.PersistedContent.IsValid(publishVariation.Culture);
+                        if (!valid)
+                        {
+                            var errMsg = Services.TextService.Localize("speechBubbles/contentCultureValidationError", new[] { allLangs[publishVariation.Culture].CultureName });
+                            ModelState.AddModelError("publish_variant_" + publishVariation.Culture + "_", errMsg);
+                            canPublish = false;
+                        }
+                    }
+                }
+
+                if (canPublish)
+                {
+                    //try to publish all the values on the model
+                    canPublish = PublishCulture(contentItem, otherVariantsToValidate, allLangs);
+                }
+
+                if (canPublish)
+                {
+                    //proceed to publish if all validation still succeeds
+                    publishStatus = Services.ContentService.SavePublishing(contentItem.PersistedContent, Security.CurrentUser.Id);
+                    wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
+                }
+                else
+                {
+                    //can only save
+                    var saveResult = Services.ContentService.Save(contentItem.PersistedContent, Security.CurrentUser.Id);
+                    publishStatus = new PublishResult(PublishResultType.FailedCannotPublish, null, contentItem.PersistedContent);
+                    wasCancelled = saveResult.Result == OperationResultType.FailedCancelledByEvent;
+                }
+            }
+        }
+
+        /// <summary>
+        /// This will call TryPublishValues on the content item for each culture that needs to be published including the invariant culture
+        /// </summary>
+        /// <param name="contentItem"></param>
+        /// <param name="otherVariantsToValidate"></param>
+        /// <param name="allLangs"></param>
+        /// <returns></returns>
+        private bool PublishCulture(ContentItemSave contentItem, IEnumerable<ContentVariationPublish> otherVariantsToValidate, IDictionary<string, ILanguage> allLangs)
+        {
+            var culturesToPublish = new List<string> { contentItem.Culture };
+            culturesToPublish.AddRange(otherVariantsToValidate.Select(x => x.Culture));
+
+            foreach(var culture in culturesToPublish)
+            {
+                // publishing any culture, implies the invariant culture
+                var valid = contentItem.PersistedContent.PublishCulture(culture);
+                if (!valid)
+                {
+                    var errMsg = Services.TextService.Localize("speechBubbles/contentCultureUnexpectedValidationError", new[] { allLangs[culture].CultureName });
+                    ModelState.AddModelError("publish_variant_" + culture + "_", errMsg);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Publishes a document with a given ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Publish access to this node.
+        /// </remarks>
+        ///
+        [EnsureUserPermissionForContent("id", 'U')]
+        public HttpResponseMessage PostPublishById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            var publishResult = Services.ContentService.SavePublishing(foundContent, Security.GetUserId().ResultOr(0));
+            if (publishResult.Success == false)
+            {
+                var notificationModel = new SimpleNotificationModel();
+                ShowMessageForPublishStatus(publishResult, notificationModel);
+                return Request.CreateValidationErrorResponse(notificationModel);
+            }
+
+            //return ok
+            return Request.CreateResponse(HttpStatusCode.OK);
+
+        }
+
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteBlueprint(int id)
+        {
+            var found = Services.ContentService.GetBlueprintById(id);
+
+            if (found == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            Services.ContentService.DeleteBlueprint(found);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+        /// does not have Delete access to this node.
+        /// </remarks>
+        [EnsureUserPermissionForContent("id", 'D')]
+        [HttpDelete]
+        [HttpPost]
+        public HttpResponseMessage DeleteById(int id)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+            {
+                return HandleContentNotFound(id, false);
+            }
+
+            //if the current item is in the recycle bin
+            if (foundContent.Trashed == false)
+            {
+                var moveResult = Services.ContentService.MoveToRecycleBin(foundContent, Security.GetUserId().ResultOr(0));
+                if (moveResult.Success == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+            else
+            {
+                var deleteResult = Services.ContentService.Delete(foundContent, Security.GetUserId().ResultOr(0));
+                if (deleteResult.Success == false)
+                {
+                    //returning an object of INotificationModel will ensure that any pending
+                    // notification messages are added to the response.
+                    return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+                }
+            }
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Empties the recycle bin
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
+        /// </remarks>
+        [HttpDelete]
+        [HttpPost]
+        [EnsureUserPermissionForContent(Constants.System.RecycleBinContent)]
+        public HttpResponseMessage EmptyRecycleBin()
+        {
+            Services.ContentService.EmptyRecycleBin();
+
+            return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
+        }
+
+        /// <summary>
+        /// Change the sort order for content
+        /// </summary>
+        /// <param name="sorted"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("sorted.ParentId", 'S')]
+        public HttpResponseMessage PostSort(ContentSortOrder sorted)
+        {
+            if (sorted == null)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            //if there's nothing to sort just return ok
+            if (sorted.IdSortOrder.Length == 0)
+            {
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+
+            try
+            {
+                var contentService = Services.ContentService;
+
+                // Save content with new sort order and update content xml in db accordingly
+                if (contentService.Sort(sorted.IdSortOrder) == false)
+                {
+                    Logger.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
+                    return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
+                }
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<ContentController>("Could not update content sort order", ex);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Change the sort order for media
+        /// </summary>
+        /// <param name="move"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("move.ParentId", 'M')]
+        public HttpResponseMessage PostMove(MoveOrCopy move)
+        {
+            var toMove = ValidateMoveOrCopy(move);
+
+            Services.ContentService.Move(toMove, move.ParentId, Security.GetUserId().ResultOr(0));
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Copies a content item and places the copy as a child of a given parent Id
+        /// </summary>
+        /// <param name="copy"></param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("copy.ParentId", 'C')]
+        public HttpResponseMessage PostCopy(MoveOrCopy copy)
+        {
+            var toCopy = ValidateMoveOrCopy(copy);
+
+            var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.GetUserId().ResultOr(0));
+
+            var response = Request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
+            return response;
+        }
+
+        /// <summary>
+        /// Unpublishes a node with a given Id and returns the unpublished entity
+        /// </summary>
+        /// <param name="id">The content id to unpublish</param>
+        /// <param name="id">The culture variant for the content id to unpublish, if none specified will unpublish all variants of the content</param>
+        /// <returns></returns>
+        [EnsureUserPermissionForContent("id", 'U')]
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay PostUnPublish(int id, string culture = null)
+        {
+            var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+            if (foundContent == null)
+                HandleContentNotFound(id);
+
+            var unpublishResult = Services.ContentService.Unpublish(foundContent, culture: culture, userId: Security.GetUserId().ResultOr(0));
+
+            var content = MapToDisplay(foundContent, culture);
+
+            if (!unpublishResult.Success)
+            {
+                AddCancelMessage(content);
+                throw new HttpResponseException(Request.CreateValidationErrorResponse(content));
+            }
+            else
+            {
+                //fixme should have a better localized method for when we have the UnpublishResultType.SuccessMandatoryCulture status
+
+                content.AddSuccessNotification(
+                    Services.TextService.Localize("content/unPublish"),
+                    unpublishResult.Result == UnpublishResultType.SuccessCulture
+                        ? Services.TextService.Localize("speechBubbles/contentVariationUnpublished", new[] { culture })
+                        : Services.TextService.Localize("speechBubbles/contentUnpublished"));
+
+                return content;
+            }
+        }
+
+        [HttpPost]
+        public DomainSave PostSaveLanguageAndDomains(DomainSave model)
+        {
+            var node = Services.ContentService.GetById(model.NodeId);
+
+            if (node == null)
+            {
+                var response = Request.CreateResponse(HttpStatusCode.BadRequest);
+                response.Content = new StringContent($"There is no content node with id {model.NodeId}.");
+                response.ReasonPhrase = "Node Not Found.";
+                throw new HttpResponseException(response);
+            }
+
+            var permission = Services.UserService.GetPermissions(Security.CurrentUser, node.Path);
+
+            if (permission.AssignedPermissions.Contains(ActionAssignDomain.Instance.Letter.ToString(), StringComparer.Ordinal) == false)
+            {
+                var response = Request.CreateResponse(HttpStatusCode.BadRequest);
+                response.Content = new StringContent("You do not have permission to assign domains on that node.");
+                response.ReasonPhrase = "Permission Denied.";
+                throw new HttpResponseException(response);
+            }
+
+            model.Valid = true;
+            var domains = Services.DomainService.GetAssignedDomains(model.NodeId, true).ToArray();
+            var languages = Services.LocalizationService.GetAllLanguages().ToArray();
+            var language = model.Language > 0 ? languages.FirstOrDefault(l => l.Id == model.Language) : null;
+
+            // process wildcard
+            if (language != null)
+            {
+                // yet there is a race condition here...
+                var wildcard = domains.FirstOrDefault(d => d.IsWildcard);
+                if (wildcard != null)
+                {
+                    wildcard.LanguageId = language.Id;
+                }
+                else
+                {
+                    wildcard = new UmbracoDomain("*" + model.NodeId)
+                    {
+                        LanguageId = model.Language,
+                        RootContentId = model.NodeId
+                    };
+                }
+
+                var saveAttempt = Services.DomainService.Save(wildcard);
+                if (saveAttempt == false)
+                {
+                    var response = Request.CreateResponse(HttpStatusCode.BadRequest);
+                    response.Content = new StringContent("Saving domain failed");
+                    response.ReasonPhrase = saveAttempt.Result.Result.ToString();
+                    throw new HttpResponseException(response);
+                }
+            }
+            else
+            {
+                var wildcard = domains.FirstOrDefault(d => d.IsWildcard);
+                if (wildcard != null)
+                {
+                    Services.DomainService.Delete(wildcard);
+                }
+            }
+
+            // process domains
+            // delete every (non-wildcard) domain, that exists in the DB yet is not in the model
+            foreach (var domain in domains.Where(d => d.IsWildcard == false && model.Domains.All(m => m.Name.InvariantEquals(d.DomainName) == false)))
+            {
+                Services.DomainService.Delete(domain);
+            }
+            
+            var names = new List<string>();
+
+            // create or update domains in the model
+            foreach (var domainModel in model.Domains.Where(m => string.IsNullOrWhiteSpace(m.Name) == false))
+            {
+                language = languages.FirstOrDefault(l => l.Id == domainModel.Lang);
+                if (language == null)
+                {
+                    continue;
+                }
+
+                var name = domainModel.Name.ToLowerInvariant();
+                if (names.Contains(name))
+                {
+                    domainModel.Duplicate = true;
+                    continue;
+                }
+                names.Add(name);
+                var domain = domains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainModel.Name));
+                if (domain != null)
+                {
+                    domain.LanguageId = language.Id;
+                    Services.DomainService.Save(domain);
+                }
+                else if (Services.DomainService.Exists(domainModel.Name))
+                {
+                    domainModel.Duplicate = true;
+                    var xdomain = Services.DomainService.GetByName(domainModel.Name);
+                    var xrcid = xdomain.RootContentId;
+                    if (xrcid.HasValue)
+                    {
+                        var xcontent = Services.ContentService.GetById(xrcid.Value);
+                        var xnames = new List<string>();
+                        while (xcontent != null)
+                        {
+                            xnames.Add(xcontent.Name);
+                            if (xcontent.ParentId < -1)
+                                xnames.Add("Recycle Bin");
+                            xcontent = xcontent.Parent(Services.ContentService);
+                        }
+                        xnames.Reverse();
+                        domainModel.Other = "/" + string.Join("/", xnames);
+                    }
+                }
+                else
+                {
+                    // yet there is a race condition here...
+                    var newDomain = new UmbracoDomain(name)
+                    {
+                        LanguageId = domainModel.Lang,
+                        RootContentId = model.NodeId
+                    };
+                    var saveAttempt = Services.DomainService.Save(newDomain);
+                    if (saveAttempt == false)
+                    {
+                        var response = Request.CreateResponse(HttpStatusCode.BadRequest);
+                        response.Content = new StringContent("Saving new domain failed");
+                        response.ReasonPhrase = saveAttempt.Result.Result.ToString();
+                        throw new HttpResponseException(response);
+                    }
+                }
+            }
+
+            model.Valid = model.Domains.All(m => m.Duplicate == false);
+
+            return model;
+        }
+
+        /// <summary>
+        /// Maps the dto property values to the persisted model
+        /// </summary>
+        /// <param name="contentItem"></param>
+        private void MapPropertyValues(ContentItemSave contentItem)
+        {
+            //Don't update the name if it is empty
+            if (!contentItem.Name.IsNullOrWhiteSpace())
+            {
+                if (contentItem.PersistedContent.ContentType.VariesByCulture())
+                {
+                    if (contentItem.Culture.IsNullOrWhiteSpace())
+                        throw new InvalidOperationException($"Cannot set culture name without a culture.");
+                    contentItem.PersistedContent.SetCultureName(contentItem.Name, contentItem.Culture);
+                }
+                else
+                {
+                    contentItem.PersistedContent.Name = contentItem.Name;
+                }
+            }
+
+            //TODO: We need to support 'send to publish'
+
+            contentItem.PersistedContent.ExpireDate = contentItem.ExpireDate;
+            contentItem.PersistedContent.ReleaseDate = contentItem.ReleaseDate;
+            //only set the template if it didn't change
+            var templateChanged = (contentItem.PersistedContent.Template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.PersistedContent.Template.Alias != contentItem.TemplateAlias)
+                                                        || (contentItem.PersistedContent.Template != null && contentItem.TemplateAlias.IsNullOrWhiteSpace());
+            if (templateChanged)
+            {
+                var template = Services.FileService.GetTemplate(contentItem.TemplateAlias);
+                if (template == null && contentItem.TemplateAlias.IsNullOrWhiteSpace() == false)
+                {
+                    //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
+                    Logger.Warn<ContentController>("No template exists with the specified alias: " + contentItem.TemplateAlias);
+                }
+                else
+                {
+                    //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
+                    contentItem.PersistedContent.Template = template;
+                }
+            }
+
+            bool Varies(Property property) => property.PropertyType.VariesByCulture();
+
+            MapPropertyValues<IContent, ContentItemSave>(
+                contentItem,
+                (save, property) => Varies(property) ? property.GetValue(save.Culture) : property.GetValue(),         //get prop val
+                (save, property, v) => { if (Varies(property)) property.SetValue(v, save.Culture); else property.SetValue(v); });  //set prop val
+        }
+
+        /// <summary>
+        /// Ensures the item can be moved/copied to the new location
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        private IContent ValidateMoveOrCopy(MoveOrCopy model)
+        {
+            if (model == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var contentService = Services.ContentService;
+            var toMove = contentService.GetById(model.Id);
+            if (toMove == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            if (model.ParentId < 0)
+            {
+                //cannot move if the content item is not allowed at the root
+                if (toMove.ContentType.AllowedAsRoot == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedAtRoot")));
+                }
+            }
+            else
+            {
+                var parent = contentService.GetById(model.ParentId);
+                if (parent == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
+
+                //check if the item is allowed under this one
+                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                        .Any(x => x.Value == toMove.ContentType.Id) == false)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByContentType")));
+                }
+
+                // Check on paths
+                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
+                {
+                    throw new HttpResponseException(
+                            Request.CreateNotificationValidationErrorResponse(
+                                    Services.TextService.Localize("moveOrCopy/notAllowedByPath")));
+                }
+            }
+
+            return toMove;
+        }
+
+        private void ShowMessageForPublishStatus(PublishResult status, INotificationModel display)
+        {
+            switch (status.Result)
+            {
+                case PublishResultType.Success:
+                case PublishResultType.SuccessAlready:
+                    display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
+                            Services.TextService.Localize("speechBubbles/editContentPublishedText"));
+                    break;
+                case PublishResultType.FailedPathNotPublished:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedByParent",
+                                new[] { $"{status.Content.Name} ({status.Content.Id})" }).Trim());
+                    break;
+                case PublishResultType.FailedCancelledByEvent:
+                    AddCancelMessage(display, "publish", "speechBubbles/contentPublishedFailedByEvent");
+                    break;
+                case PublishResultType.FailedAwaitingRelease:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedAwaitingRelease",
+                                new[] { $"{status.Content.Name} ({status.Content.Id})" }).Trim());
+                    break;
+                case PublishResultType.FailedHasExpired:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedExpired",
+                                new[] { $"{status.Content.Name} ({status.Content.Id})", }).Trim());
+                    break;
+                case PublishResultType.FailedIsTrashed:
+                    display.AddWarningNotification(
+                        Services.TextService.Localize("publish"),
+                        "publish/contentPublishedFailedIsTrashed"); // fixme properly localize!
+                    break;
+                case PublishResultType.FailedContentInvalid:
+                    display.AddWarningNotification(
+                            Services.TextService.Localize("publish"),
+                            Services.TextService.Localize("publish/contentPublishedFailedInvalid",
+                                new[]
+                                {
+                                    $"{status.Content.Name} ({status.Content.Id})",
+                                    string.Join(",", status.InvalidProperties.Select(x => x.Alias))
+                                }).Trim());
+                    break;
+                case PublishResultType.FailedByCulture:
+                    display.AddWarningNotification(
+                        Services.TextService.Localize("publish"),
+                        "publish/contentPublishedFailedByCulture"); // fixme properly localize!
+                    break;
+                default:
+                    throw new IndexOutOfRangeException($"PublishedResultType \"{status.Result}\" was not expected.");
+            }
+        }
+
+        /// <summary>
+        /// Performs a permissions check for the user to check if it has access to the node based on
+        /// start node and/or permissions for the node
+        /// </summary>
+        /// <param name="storage">The storage to add the content item to so it can be reused</param>
+        /// <param name="user"></param>
+        /// <param name="userService"></param>
+        /// <param name="contentService"></param>
+        /// <param name="entityService"></param>
+        /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
+        /// <param name="permissionsToCheck"></param>
+        /// <param name="contentItem">Specifies the already resolved content item to check against</param>
+        /// <returns></returns>
+        internal static bool CheckPermissions(
+                IDictionary<string, object> storage,
+                IUser user,
+                IUserService userService,
+                IContentService contentService,
+                IEntityService entityService,
+                int nodeId,
+                char[] permissionsToCheck = null,
+                IContent contentItem = null)
+        {
+            if (storage == null) throw new ArgumentNullException("storage");
+            if (user == null) throw new ArgumentNullException("user");
+            if (userService == null) throw new ArgumentNullException("userService");
+            if (contentService == null) throw new ArgumentNullException("contentService");
+            if (entityService == null) throw new ArgumentNullException("entityService");
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                contentItem = contentService.GetById(nodeId);
+                //put the content item into storage so it can be retreived
+                // in the controller (saves a lookup)
+                storage[typeof(IContent).ToString()] = contentItem;
+            }
+
+            if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var hasPathAccess = (nodeId == Constants.System.Root)
+                ? user.HasContentRootAccess(entityService)
+                : (nodeId == Constants.System.RecycleBinContent)
+                    ? user.HasContentBinAccess(entityService)
+                    : user.HasPathAccess(contentItem, entityService);
+
+            if (hasPathAccess == false)
+            {
+                return false;
+            }
+
+            if (permissionsToCheck == null || permissionsToCheck.Length == 0)
+            {
+                return true;
+            }
+
+            //get the implicit/inherited permissions for the user for this path,
+            //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
+            var path = contentItem != null ? contentItem.Path : nodeId.ToString();
+            var permission = userService.GetPermissionsForPath(user, path);
+
+            var allowed = true;
+            foreach (var p in permissionsToCheck)
+            {
+                if (permission == null
+                    || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
+                {
+                    allowed = false;
+                }
+            }
+            return allowed;
+        }
+
+        /// <summary>
+        /// Used to map an <see cref="IContent"/> instance to a <see cref="ContentItemDisplay"/> and ensuring a language is present if required
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        private ContentItemDisplay MapToDisplay(IContent content, string culture = null)
+        {
+            //A culture must exist in the mapping context if this content type is CultureNeutral since for a culture variant to be edited,
+            // the Cuture property of ContentItemDisplay must exist (at least currently).
+            if (culture == null && content.ContentType.VariesByCulture())
+            {
+                //If a culture is not explicitly sent up, then it means that the user is editing the default variant language.
+                culture = Services.LocalizationService.GetDefaultLanguageIsoCode();
+            }
+
+            var display = ContextMapper.Map<IContent, ContentItemDisplay>(content, 
+                new Dictionary<string, object> { { ContextMapper.CultureKey, culture } });
+
+            return display;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
index 3e29d88d5f..6eb568c6af 100644
--- a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
@@ -1,79 +1,79 @@
-using System;
-using System.Web.Mvc;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Xml;
-
-namespace Umbraco.Web.Mvc
-{
-    /// <summary>
-    /// Extension methods for UrlHelper
-    /// </summary>
-    public static class UrlHelperExtensions
-    {
-        /// <summary>
-        /// Utility method for checking for valid proxy urls or redirect urls to prevent Open Redirect security issues
-        /// </summary>
-        /// <param name="urlHelper"></param>
-        /// <param name="url">The url to validate</param>
-        /// <param name="callerUrl">The url of the current local domain (to ensure we can validate if the requested url is local without dependency on the request)</param>
-        /// <returns>True if it's an allowed url</returns>
-        public static bool ValidateProxyUrl(this UrlHelper urlHelper, string url, string callerUrl)
-        {
-            if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
-            {
-                return false;
-            }
-
-            if (url.StartsWith("//"))
-                return false;
-
-            Uri requestUri;
-            if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out requestUri))
-            {
-                if (string.IsNullOrEmpty(callerUrl) == false)
-                {
-                    Uri localUri;
-                    if (Uri.TryCreate(callerUrl, UriKind.RelativeOrAbsolute, out localUri))
-                    {
-                        // check for local urls
-
-                        //Cannot start with // since that is not a local url
-                        if (requestUri.OriginalString.StartsWith("//") == false
-                            //cannot be non-absolute and also contain the char : since that will indicate a protocol
-                            && (requestUri.IsAbsoluteUri == false && requestUri.OriginalString.Contains(":") == false)
-                            //needs to be non-absolute or the hosts must match the current request
-                            && (requestUri.IsAbsoluteUri == false || requestUri.Host == localUri.Host))
-                        {
-                            return true;
-                        }
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-
-                //we cannot continue if the url is not absolute
-                if (requestUri.IsAbsoluteUri == false)
-                {
-                    return false;
-                }
-
-                // check for valid proxy urls
-                var feedProxyXml = XmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-                if (feedProxyXml != null &&
-                    feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null)
-                {
-                    return true;
-                }
-            }
-            else
-            {
-                return false;
-            }
-            return false;
-        }
-    }
-}
+using System;
+using System.Web.Mvc;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Xml;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Extension methods for UrlHelper
+    /// </summary>
+    public static class UrlHelperExtensions
+    {
+        /// <summary>
+        /// Utility method for checking for valid proxy urls or redirect urls to prevent Open Redirect security issues
+        /// </summary>
+        /// <param name="urlHelper"></param>
+        /// <param name="url">The url to validate</param>
+        /// <param name="callerUrl">The url of the current local domain (to ensure we can validate if the requested url is local without dependency on the request)</param>
+        /// <returns>True if it's an allowed url</returns>
+        public static bool ValidateProxyUrl(this UrlHelper urlHelper, string url, string callerUrl)
+        {
+            if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
+            {
+                return false;
+            }
+
+            if (url.StartsWith("//"))
+                return false;
+
+            Uri requestUri;
+            if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out requestUri))
+            {
+                if (string.IsNullOrEmpty(callerUrl) == false)
+                {
+                    Uri localUri;
+                    if (Uri.TryCreate(callerUrl, UriKind.RelativeOrAbsolute, out localUri))
+                    {
+                        // check for local urls
+
+                        //Cannot start with // since that is not a local url
+                        if (requestUri.OriginalString.StartsWith("//") == false
+                            //cannot be non-absolute and also contain the char : since that will indicate a protocol
+                            && (requestUri.IsAbsoluteUri == false && requestUri.OriginalString.Contains(":") == false)
+                            //needs to be non-absolute or the hosts must match the current request
+                            && (requestUri.IsAbsoluteUri == false || requestUri.Host == localUri.Host))
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+
+                //we cannot continue if the url is not absolute
+                if (requestUri.IsAbsoluteUri == false)
+                {
+                    return false;
+                }
+
+                // check for valid proxy urls
+                var feedProxyXml = XmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
+                if (feedProxyXml != null &&
+                    feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null)
+                {
+                    return true;
+                }
+            }
+            else
+            {
+                return false;
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index 98856119c1..9b1c282aab 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -1,193 +1,193 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Management.Instrumentation;
-using System.Web.Mvc;
-using System.Web.Routing;
-using ClientDependency.Core.Config;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Exceptions;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Editors;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebServices;
-
-namespace Umbraco.Web
-{
-    /// <summary>
-    /// Extension methods for UrlHelper
-    /// </summary>
-    public static class UrlHelperExtensions
-    {
-        /// <summary>
-        /// Returns the base path (not including the 'action') of the MVC controller "ExamineManagementController"
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        public static string GetExamineManagementServicePath(this UrlHelper url)
-        {
-            // TODO: Possibly remove this method, I think it's unused...
-            var result = url.GetUmbracoApiService<ExamineManagementController>("GetIndexerDetails");
-            return result.TrimEnd("GetIndexerDetails").EnsureEndsWith('/');
-        }
-
-        /// <summary>
-        /// Return the Url for a Web Api service
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <param name="routeVals"></param>
-        /// <returns></returns>
-        public static string GetUmbracoApiService<T>(this UrlHelper url, string actionName, RouteValueDictionary routeVals = null)
-            where T : UmbracoApiController
-        {
-            return url.GetUmbracoApiService(actionName, typeof(T), routeVals);
-        }
-
-        /// <summary>
-        /// Return the Base Url (not including the action) for a Web Api service
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <returns></returns>
-        public static string GetUmbracoApiServiceBaseUrl<T>(this UrlHelper url, string actionName)
-            where T : UmbracoApiController
-        {
-            return url.GetUmbracoApiService<T>(actionName).TrimEnd(actionName);
-        }
-
-        public static string GetUmbracoApiServiceBaseUrl<T>(this UrlHelper url, Expression<Func<T, object>> methodSelector)
-            where T : UmbracoApiController
-        {
-            var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
-            if (method == null)
-            {
-                throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
-            }
-            return url.GetUmbracoApiService<T>(method.Name).TrimEnd(method.Name);
-        }
-
-        public static string GetUmbracoApiService<T>(this UrlHelper url, Expression<Func<T, object>> methodSelector)
-            where T : UmbracoApiController
-        {
-            var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
-            if (method == null)
-            {
-                throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
-            }
-            var parameters = Core.ExpressionHelper.GetMethodParams(methodSelector);
-            var routeVals = new RouteValueDictionary(parameters);
-            return url.GetUmbracoApiService<T>(method.Name, routeVals);
-        }
-
-        /// <summary>
-        /// Return the Url for a Web Api service
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <param name="apiControllerType"></param>
-        /// <param name="routeVals"></param>
-        /// <returns></returns>
-        public static string GetUmbracoApiService(this UrlHelper url, string actionName, Type apiControllerType, RouteValueDictionary routeVals = null)
-        {
-            if (string.IsNullOrEmpty(actionName)) throw new ArgumentNullOrEmptyException(nameof(actionName));
-            if (apiControllerType == null) throw new ArgumentNullException(nameof(apiControllerType));
-
-            var area = "";
-
-            var apiController = Current.UmbracoApiControllerTypes
-                .SingleOrDefault(x => x == apiControllerType);
-            if (apiController == null)
-                throw new InvalidOperationException("Could not find the umbraco api controller of type " + apiControllerType.FullName);
-            var metaData = PluginController.GetMetadata(apiController);
-            if (!metaData.AreaName.IsNullOrWhiteSpace())
-            {
-                //set the area to the plugin area
-                area = metaData.AreaName;
-            }
-            return url.GetUmbracoApiService(actionName, ControllerExtensions.GetControllerName(apiControllerType), area, routeVals);
-        }
-
-        /// <summary>
-        /// Return the Url for a Web Api service
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="routeVals"></param>
-        /// <returns></returns>
-        public static string GetUmbracoApiService(this UrlHelper url, string actionName, string controllerName, RouteValueDictionary routeVals = null)
-        {
-            return url.GetUmbracoApiService(actionName, controllerName, "", routeVals);
-        }
-
-        /// <summary>
-        /// Return the Url for a Web Api service
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="area"></param>
-        /// <param name="routeVals"></param>
-        /// <returns></returns>
-        public static string GetUmbracoApiService(this UrlHelper url, string actionName, string controllerName, string area, RouteValueDictionary routeVals = null)
-        {
-            if (string.IsNullOrEmpty(controllerName)) throw new ArgumentNullOrEmptyException(nameof(controllerName));
-            if (string.IsNullOrEmpty(actionName)) throw new ArgumentNullOrEmptyException(nameof(actionName));
-
-            if (routeVals == null)
-            {
-                routeVals = new RouteValueDictionary(new {httproute = "", area = area});
-            }
-            else
-            {
-                var requiredRouteVals = new RouteValueDictionary(new { httproute = "", area = area });
-                requiredRouteVals.MergeLeft(routeVals);
-                //copy it back now
-                routeVals = requiredRouteVals;
-            }
-
-            return url.Action(actionName, controllerName, routeVals);
-        }
-
-
-        /// <summary>
-        /// Return the Url for an action with a cache-busting hash appended
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="routeVals"></param>
-        /// <returns></returns>
-        public static string GetUrlWithCacheBust(this UrlHelper url, string actionName, string controllerName, RouteValueDictionary routeVals = null)
-        {
-            var applicationJs = url.Action(actionName, controllerName, routeVals);
-            applicationJs = applicationJs + "?umb__rnd=" + GetCacheBustHash();
-            return applicationJs;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        public static string GetCacheBustHash()
-        {
-            //make a hash of umbraco and client dependency version
-            //in case the user bypasses the installer and just bumps the web.config or clientdep config
-
-            //if in debug mode, always burst the cache
-            if (GlobalSettings.DebugMode)
-            {
-                return DateTime.Now.Ticks.ToString(CultureInfo.InvariantCulture).GenerateHash();
-            }
-
-            var version = Current.RuntimeState.SemanticVersion.ToSemanticString();
-            return $"{version}.{ClientDependencySettings.Instance.Version}".GenerateHash();
-        }
-    }
-}
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Management.Instrumentation;
+using System.Web.Mvc;
+using System.Web.Routing;
+using ClientDependency.Core.Config;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Exceptions;
+using Umbraco.Web.Composing;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebServices;
+
+namespace Umbraco.Web
+{
+    /// <summary>
+    /// Extension methods for UrlHelper
+    /// </summary>
+    public static class UrlHelperExtensions
+    {
+        /// <summary>
+        /// Returns the base path (not including the 'action') of the MVC controller "ExamineManagementController"
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public static string GetExamineManagementServicePath(this UrlHelper url)
+        {
+            // TODO: Possibly remove this method, I think it's unused...
+            var result = url.GetUmbracoApiService<ExamineManagementController>("GetIndexerDetails");
+            return result.TrimEnd("GetIndexerDetails").EnsureEndsWith('/');
+        }
+
+        /// <summary>
+        /// Return the Url for a Web Api service
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="url"></param>
+        /// <param name="actionName"></param>
+        /// <param name="routeVals"></param>
+        /// <returns></returns>
+        public static string GetUmbracoApiService<T>(this UrlHelper url, string actionName, RouteValueDictionary routeVals = null)
+            where T : UmbracoApiController
+        {
+            return url.GetUmbracoApiService(actionName, typeof(T), routeVals);
+        }
+
+        /// <summary>
+        /// Return the Base Url (not including the action) for a Web Api service
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="url"></param>
+        /// <param name="actionName"></param>
+        /// <returns></returns>
+        public static string GetUmbracoApiServiceBaseUrl<T>(this UrlHelper url, string actionName)
+            where T : UmbracoApiController
+        {
+            return url.GetUmbracoApiService<T>(actionName).TrimEnd(actionName);
+        }
+
+        public static string GetUmbracoApiServiceBaseUrl<T>(this UrlHelper url, Expression<Func<T, object>> methodSelector)
+            where T : UmbracoApiController
+        {
+            var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
+            if (method == null)
+            {
+                throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
+            }
+            return url.GetUmbracoApiService<T>(method.Name).TrimEnd(method.Name);
+        }
+
+        public static string GetUmbracoApiService<T>(this UrlHelper url, Expression<Func<T, object>> methodSelector)
+            where T : UmbracoApiController
+        {
+            var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
+            if (method == null)
+            {
+                throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
+            }
+            var parameters = Core.ExpressionHelper.GetMethodParams(methodSelector);
+            var routeVals = new RouteValueDictionary(parameters);
+            return url.GetUmbracoApiService<T>(method.Name, routeVals);
+        }
+
+        /// <summary>
+        /// Return the Url for a Web Api service
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="actionName"></param>
+        /// <param name="apiControllerType"></param>
+        /// <param name="routeVals"></param>
+        /// <returns></returns>
+        public static string GetUmbracoApiService(this UrlHelper url, string actionName, Type apiControllerType, RouteValueDictionary routeVals = null)
+        {
+            if (string.IsNullOrEmpty(actionName)) throw new ArgumentNullOrEmptyException(nameof(actionName));
+            if (apiControllerType == null) throw new ArgumentNullException(nameof(apiControllerType));
+
+            var area = "";
+
+            var apiController = Current.UmbracoApiControllerTypes
+                .SingleOrDefault(x => x == apiControllerType);
+            if (apiController == null)
+                throw new InvalidOperationException("Could not find the umbraco api controller of type " + apiControllerType.FullName);
+            var metaData = PluginController.GetMetadata(apiController);
+            if (!metaData.AreaName.IsNullOrWhiteSpace())
+            {
+                //set the area to the plugin area
+                area = metaData.AreaName;
+            }
+            return url.GetUmbracoApiService(actionName, ControllerExtensions.GetControllerName(apiControllerType), area, routeVals);
+        }
+
+        /// <summary>
+        /// Return the Url for a Web Api service
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="actionName"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="routeVals"></param>
+        /// <returns></returns>
+        public static string GetUmbracoApiService(this UrlHelper url, string actionName, string controllerName, RouteValueDictionary routeVals = null)
+        {
+            return url.GetUmbracoApiService(actionName, controllerName, "", routeVals);
+        }
+
+        /// <summary>
+        /// Return the Url for a Web Api service
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="actionName"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="area"></param>
+        /// <param name="routeVals"></param>
+        /// <returns></returns>
+        public static string GetUmbracoApiService(this UrlHelper url, string actionName, string controllerName, string area, RouteValueDictionary routeVals = null)
+        {
+            if (string.IsNullOrEmpty(controllerName)) throw new ArgumentNullOrEmptyException(nameof(controllerName));
+            if (string.IsNullOrEmpty(actionName)) throw new ArgumentNullOrEmptyException(nameof(actionName));
+
+            if (routeVals == null)
+            {
+                routeVals = new RouteValueDictionary(new {httproute = "", area = area});
+            }
+            else
+            {
+                var requiredRouteVals = new RouteValueDictionary(new { httproute = "", area = area });
+                requiredRouteVals.MergeLeft(routeVals);
+                //copy it back now
+                routeVals = requiredRouteVals;
+            }
+
+            return url.Action(actionName, controllerName, routeVals);
+        }
+
+
+        /// <summary>
+        /// Return the Url for an action with a cache-busting hash appended
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="actionName"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="routeVals"></param>
+        /// <returns></returns>
+        public static string GetUrlWithCacheBust(this UrlHelper url, string actionName, string controllerName, RouteValueDictionary routeVals = null)
+        {
+            var applicationJs = url.Action(actionName, controllerName, routeVals);
+            applicationJs = applicationJs + "?umb__rnd=" + GetCacheBustHash();
+            return applicationJs;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        public static string GetCacheBustHash()
+        {
+            //make a hash of umbraco and client dependency version
+            //in case the user bypasses the installer and just bumps the web.config or clientdep config
+
+            //if in debug mode, always burst the cache
+            if (GlobalSettings.DebugMode)
+            {
+                return DateTime.Now.Ticks.ToString(CultureInfo.InvariantCulture).GenerateHash();
+            }
+
+            var version = Current.RuntimeState.SemanticVersion.ToSemanticString();
+            return $"{version}.{ClientDependencySettings.Instance.Version}".GenerateHash();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.cs
index b8f4506cb1..6d91847888 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeService.cs
@@ -1,154 +1,154 @@
-using System;
-using Umbraco.Core.Security;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Script.Services;
-using System.Web.Services;
-using System.Web.UI;
-using umbraco;
-using umbraco.cms.businesslogic;
-using umbraco.cms.presentation.Trees;
-using umbraco.controls.Tree;
-using Umbraco.Core.Services;
-using Umbraco.Web;
-using Umbraco.Web.Security;
-using Umbraco.Web.WebServices;
-
-namespace umbraco.controls.Tree
-{
-    /// <summary>
-    /// Client side ajax utlities for the tree
-    /// </summary>
-    [ScriptService]
-    [WebService]
-    public class CustomTreeService : UmbracoWebService
-    {
-        /// <summary>
-        /// Returns some info about the node such as path and id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [WebMethod]
-        [ScriptMethod(ResponseFormat = ResponseFormat.Json)]
-        public NodeInfo GetNodeInfo(int id)
-        {
-            Authorize();
-
-            //var node = new CMSNode(id);
-            var node = Services.EntityService.Get(id);
-            return new NodeInfo()
-            {
-                Id = node.Id,
-                Path = node.Path,
-                PathAsNames = string.Join("->",
-                   GetPathNames(node.Path.Split(',')
-                                       .Select(x => int.Parse(x))
-                                       .ToArray()))
-            };
-        }
-
-        /// <summary>
-        /// returns the node names for each id passed in
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        private string[] GetPathNames(int[] ids)
-        {
-            return ids
-                .Where(x => x != -1)
-                //.Select(x => new CMSNode(x).Text).ToArray();
-                .Select(x => Services.EntityService.Get(x).Name).ToArray();
-        }
-
-        /// <summary>
-        /// Returns a key/value object with: json, app, js as the keys
-        /// </summary>
-        /// <returns></returns>
-        [WebMethod]
-        [ScriptMethod(ResponseFormat = ResponseFormat.Json)]
-        public Dictionary<string, string> GetInitAppTreeData(string app, string treeType, bool showContextMenu, bool isDialog, TreeDialogModes dialogMode, string functionToCall, string nodeKey)
-        {
-            Authorize();
-
-            var treeCtl = new TreeControl()
-            {
-                ShowContextMenu = showContextMenu,
-                IsDialog = isDialog,
-                DialogMode = dialogMode,
-                App = app,
-                TreeType = string.IsNullOrEmpty(treeType) ? "" : treeType, //don't set the tree type unless explicitly set
-                NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey,
-                //StartNodeID = -1, //TODO: set this based on parameters!
-                FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall
-            };
-
-            var returnVal = new Dictionary<string, string>();
-
-            if (string.IsNullOrEmpty(treeType))
-            {
-                //if there's not tree type specified, then render out the tree as per normal with the normal
-                //way of doing things
-                returnVal.Add("json", treeCtl.GetJSONInitNode());
-            }
-            else
-            {
-                //since 4.5.1 has a bug in it, it ignores if the treeType is specified and will always only render
-                //the whole APP not just a specific tree.
-                //this is a work around for this bug until it is fixed (which should be fixed in 4.5.2
-
-                //get the tree that we need to render
-                var tree = TreeDefinitionCollection.Instance.FindTree(treeType).CreateInstance();
-                tree.ShowContextMenu = showContextMenu;
-                tree.IsDialog = isDialog;
-                tree.DialogMode = dialogMode;
-                tree.NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey;
-                tree.FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall;
-
-                //now render it's start node
-                var xTree = new XmlTree();
-
-                //we're going to hijack the node name here to make it say content/media
-                var node = tree.RootNode;
-                if (node.Text.Equals("[FilteredContentTree]")) node.Text = Services.TextService.Localize("content");
-                else if (node.Text.Equals("[FilteredMediaTree]")) node.Text = Services.TextService.Localize("media");
-                xTree.Add(node);
-
-                returnVal.Add("json", xTree.ToString());
-            }
-
-            returnVal.Add("app", app);
-            returnVal.Add("js", treeCtl.JSCurrApp);
-
-            return returnVal;
-        }
-
-        internal void Authorize()
-        {
-            if (ValidateCurrentUser() == false)
-                throw new Exception("Client authorization failed. User is not logged in");
-        }
-
-
-        /// <summary>
-        /// Validates the currently logged in user and ensures they are not timed out
-        /// </summary>
-        /// <returns></returns>
-        private bool ValidateCurrentUser()
-        {
-            var identity = Context.GetCurrentIdentity(
-                //DO NOT AUTO-AUTH UNLESS THE CURRENT HANDLER IS WEBFORMS!
-                // Without this check, anything that is using this legacy API, like ui.Text will
-                // automatically log the back office user in even if it is a front-end request (if there is
-                // a back office user logged in. This can cause problems becaues the identity is changing mid
-                // request. For example: http://issues.umbraco.org/issue/U4-4010
-                HttpContext.Current.CurrentHandler is Page);
-
-            if (identity != null)
-            {
-                return true;
-            }
-            return false;
-        }
-    }
-}
+using System;
+using Umbraco.Core.Security;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Script.Services;
+using System.Web.Services;
+using System.Web.UI;
+using umbraco;
+using umbraco.cms.businesslogic;
+using umbraco.cms.presentation.Trees;
+using umbraco.controls.Tree;
+using Umbraco.Core.Services;
+using Umbraco.Web;
+using Umbraco.Web.Security;
+using Umbraco.Web.WebServices;
+
+namespace umbraco.controls.Tree
+{
+    /// <summary>
+    /// Client side ajax utlities for the tree
+    /// </summary>
+    [ScriptService]
+    [WebService]
+    public class CustomTreeService : UmbracoWebService
+    {
+        /// <summary>
+        /// Returns some info about the node such as path and id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ScriptMethod(ResponseFormat = ResponseFormat.Json)]
+        public NodeInfo GetNodeInfo(int id)
+        {
+            Authorize();
+
+            //var node = new CMSNode(id);
+            var node = Services.EntityService.Get(id);
+            return new NodeInfo()
+            {
+                Id = node.Id,
+                Path = node.Path,
+                PathAsNames = string.Join("->",
+                   GetPathNames(node.Path.Split(',')
+                                       .Select(x => int.Parse(x))
+                                       .ToArray()))
+            };
+        }
+
+        /// <summary>
+        /// returns the node names for each id passed in
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        private string[] GetPathNames(int[] ids)
+        {
+            return ids
+                .Where(x => x != -1)
+                //.Select(x => new CMSNode(x).Text).ToArray();
+                .Select(x => Services.EntityService.Get(x).Name).ToArray();
+        }
+
+        /// <summary>
+        /// Returns a key/value object with: json, app, js as the keys
+        /// </summary>
+        /// <returns></returns>
+        [WebMethod]
+        [ScriptMethod(ResponseFormat = ResponseFormat.Json)]
+        public Dictionary<string, string> GetInitAppTreeData(string app, string treeType, bool showContextMenu, bool isDialog, TreeDialogModes dialogMode, string functionToCall, string nodeKey)
+        {
+            Authorize();
+
+            var treeCtl = new TreeControl()
+            {
+                ShowContextMenu = showContextMenu,
+                IsDialog = isDialog,
+                DialogMode = dialogMode,
+                App = app,
+                TreeType = string.IsNullOrEmpty(treeType) ? "" : treeType, //don't set the tree type unless explicitly set
+                NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey,
+                //StartNodeID = -1, //TODO: set this based on parameters!
+                FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall
+            };
+
+            var returnVal = new Dictionary<string, string>();
+
+            if (string.IsNullOrEmpty(treeType))
+            {
+                //if there's not tree type specified, then render out the tree as per normal with the normal
+                //way of doing things
+                returnVal.Add("json", treeCtl.GetJSONInitNode());
+            }
+            else
+            {
+                //since 4.5.1 has a bug in it, it ignores if the treeType is specified and will always only render
+                //the whole APP not just a specific tree.
+                //this is a work around for this bug until it is fixed (which should be fixed in 4.5.2
+
+                //get the tree that we need to render
+                var tree = TreeDefinitionCollection.Instance.FindTree(treeType).CreateInstance();
+                tree.ShowContextMenu = showContextMenu;
+                tree.IsDialog = isDialog;
+                tree.DialogMode = dialogMode;
+                tree.NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey;
+                tree.FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall;
+
+                //now render it's start node
+                var xTree = new XmlTree();
+
+                //we're going to hijack the node name here to make it say content/media
+                var node = tree.RootNode;
+                if (node.Text.Equals("[FilteredContentTree]")) node.Text = Services.TextService.Localize("content");
+                else if (node.Text.Equals("[FilteredMediaTree]")) node.Text = Services.TextService.Localize("media");
+                xTree.Add(node);
+
+                returnVal.Add("json", xTree.ToString());
+            }
+
+            returnVal.Add("app", app);
+            returnVal.Add("js", treeCtl.JSCurrApp);
+
+            return returnVal;
+        }
+
+        internal void Authorize()
+        {
+            if (ValidateCurrentUser() == false)
+                throw new Exception("Client authorization failed. User is not logged in");
+        }
+
+
+        /// <summary>
+        /// Validates the currently logged in user and ensures they are not timed out
+        /// </summary>
+        /// <returns></returns>
+        private bool ValidateCurrentUser()
+        {
+            var identity = Context.GetCurrentIdentity(
+                //DO NOT AUTO-AUTH UNLESS THE CURRENT HANDLER IS WEBFORMS!
+                // Without this check, anything that is using this legacy API, like ui.Text will
+                // automatically log the back office user in even if it is a front-end request (if there is
+                // a back office user logged in. This can cause problems becaues the identity is changing mid
+                // request. For example: http://issues.umbraco.org/issue/U4-4010
+                HttpContext.Current.CurrentHandler is Page);
+
+            if (identity != null)
+            {
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs
index 00788fab3f..db04f26bcf 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs
@@ -1,83 +1,83 @@
-using System;
-using System.Text;
-using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.UI.Pages;
-using Umbraco.Web;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Editors;
-using Umbraco.Web.WebServices;
-using Umbraco.Web._Legacy.Actions;
-
-
-namespace umbraco.dialogs
-{
-    public partial class AssignDomain2 : UmbracoEnsuredPage
-    {
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            var nodeId = GetNodeId();
-            CheckPathAndPermissions(nodeId, UmbracoObjectTypes.Document, ActionAssignDomain.Instance);
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            var nodeId = GetNodeId();
-            var node = Services.ContentService.GetById(nodeId);
-
-            if (node == null)
-            {
-                feedback.Text = Services.TextService.Localize("assignDomain/invalidNode");
-                pane_language.Visible = false;
-                pane_domains.Visible = false;
-                p_buttons.Visible = false;
-                return;
-            }
-
-            pane_language.Title = Services.TextService.Localize("assignDomain/setLanguage");
-            pane_domains.Title = Services.TextService.Localize("assignDomain/setDomains");
-            prop_language.Text = Services.TextService.Localize("assignDomain/language");
-
-            var nodeDomains = Services.DomainService.GetAssignedDomains(nodeId, true).ToArray();
-            var wildcard = nodeDomains.FirstOrDefault(d => d.IsWildcard);
-
-            var sb = new StringBuilder();
-            sb.Append("languages: [");
-            var i = 0;
-            foreach (var language in Current.Services.LocalizationService.GetAllLanguages())
-                sb.AppendFormat("{0}{{ \"Id\": {1}, \"Code\": \"{2}\" }}", (i++ == 0 ? "" : ","), language.Id, language.IsoCode);
-            sb.Append("]\r\n");
-
-            sb.AppendFormat(",language: {0}", wildcard == null ? "undefined" : wildcard.LanguageId.ToString());
-
-            sb.Append(",domains: [");
-            i = 0;
-            foreach (var domain in nodeDomains.Where(d => d.IsWildcard == false))
-                sb.AppendFormat("{0}{{ \"Name\": \"{1}\", \"Lang\": \"{2}\" }}", (i++ == 0 ? "" :","), domain.DomainName, domain.LanguageId);
-            sb.Append("]\r\n");
-
-            data.Text = sb.ToString();
-        }
-
-        protected int GetNodeId()
-        {
-            int nodeId;
-            if (int.TryParse(Request.QueryString["id"], out nodeId) == false)
-                nodeId = -1;
-            return nodeId;
-        }
-
-        protected string GetRestServicePath()
-        {
-            const string action = "ListDomains";
-            var path = Url.GetUmbracoApiService<ContentController>(action);
-            return path.TrimEnd(action).EnsureEndsWith('/');
-        }
-    }
-}
+using System;
+using System.Text;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web.UI.Pages;
+using Umbraco.Web;
+using Umbraco.Web.Composing;
+using Umbraco.Web.Editors;
+using Umbraco.Web.WebServices;
+using Umbraco.Web._Legacy.Actions;
+
+
+namespace umbraco.dialogs
+{
+    public partial class AssignDomain2 : UmbracoEnsuredPage
+    {
+        protected override void OnInit(EventArgs e)
+        {
+            base.OnInit(e);
+
+            var nodeId = GetNodeId();
+            CheckPathAndPermissions(nodeId, UmbracoObjectTypes.Document, ActionAssignDomain.Instance);
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+
+            var nodeId = GetNodeId();
+            var node = Services.ContentService.GetById(nodeId);
+
+            if (node == null)
+            {
+                feedback.Text = Services.TextService.Localize("assignDomain/invalidNode");
+                pane_language.Visible = false;
+                pane_domains.Visible = false;
+                p_buttons.Visible = false;
+                return;
+            }
+
+            pane_language.Title = Services.TextService.Localize("assignDomain/setLanguage");
+            pane_domains.Title = Services.TextService.Localize("assignDomain/setDomains");
+            prop_language.Text = Services.TextService.Localize("assignDomain/language");
+
+            var nodeDomains = Services.DomainService.GetAssignedDomains(nodeId, true).ToArray();
+            var wildcard = nodeDomains.FirstOrDefault(d => d.IsWildcard);
+
+            var sb = new StringBuilder();
+            sb.Append("languages: [");
+            var i = 0;
+            foreach (var language in Current.Services.LocalizationService.GetAllLanguages())
+                sb.AppendFormat("{0}{{ \"Id\": {1}, \"Code\": \"{2}\" }}", (i++ == 0 ? "" : ","), language.Id, language.IsoCode);
+            sb.Append("]\r\n");
+
+            sb.AppendFormat(",language: {0}", wildcard == null ? "undefined" : wildcard.LanguageId.ToString());
+
+            sb.Append(",domains: [");
+            i = 0;
+            foreach (var domain in nodeDomains.Where(d => d.IsWildcard == false))
+                sb.AppendFormat("{0}{{ \"Name\": \"{1}\", \"Lang\": \"{2}\" }}", (i++ == 0 ? "" :","), domain.DomainName, domain.LanguageId);
+            sb.Append("]\r\n");
+
+            data.Text = sb.ToString();
+        }
+
+        protected int GetNodeId()
+        {
+            int nodeId;
+            if (int.TryParse(Request.QueryString["id"], out nodeId) == false)
+                nodeId = -1;
+            return nodeId;
+        }
+
+        protected string GetRestServicePath()
+        {
+            const string action = "ListDomains";
+            var path = Url.GetUmbracoApiService<ContentController>(action);
+            return path.TrimEnd(action).EnsureEndsWith('/');
+        }
+    }
+}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
index 95fe3626b6..ca26c5c08d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
@@ -1,262 +1,262 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Web.Script.Services;
-using System.Web.Services;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Web;
-using Umbraco.Web.Composing;
-using Umbraco.Web._Legacy.Actions;
-
-namespace umbraco.presentation.webservices
-{
-    /// <summary>
-    /// Summary description for nodeSorter
-    /// </summary>
-    [WebService(Namespace = "http://umbraco.org/")]
-    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
-    [ToolboxItem(false)]
-    [ScriptService]
-    public class nodeSorter : UmbracoAuthorizedWebService
-    {
-        [WebMethod]
-        public SortNode GetNodes(string ParentId, string App)
-        {
-            if (AuthorizeRequest())
-            {
-                var nodes = new List<SortNode>();
-
-                // "hack for stylesheet"
-                if (App == "settings")
-                {
-                    var stylesheet = Services.FileService.GetStylesheetByName(ParentId.EnsureEndsWith(".css"));
-                    if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + ParentId);
-
-                    var sort = 0;
-                    foreach (var child in stylesheet.Properties)
-                    {
-                        nodes.Add(new SortNode(child.Name.GetHashCode(), sort, child.Name, DateTime.Now));
-                        sort++;
-                    }
-
-                    return new SortNode()
-                    {
-                        SortNodes = nodes.ToArray()
-                    };
-                }
-                else
-                {
-                    var asInt = int.Parse(ParentId);
-
-                    var parent = new SortNode { Id = asInt };
-
-                    var entityService = Services.EntityService;
-
-                    // Root nodes?
-                    if (asInt == -1)
-                    {
-                        if (App == "media")
-                        {
-                            var rootMedia = entityService.GetRootEntities(UmbracoObjectTypes.Media);
-                            nodes.AddRange(rootMedia.Select(media => new SortNode(media.Id, media.SortOrder, media.Name, media.CreateDate)));
-                        }
-                        else
-                        {
-                            var rootContent = entityService.GetRootEntities(UmbracoObjectTypes.Document);
-                            nodes.AddRange(rootContent.Select(content => new SortNode(content.Id, content.SortOrder, content.Name, content.CreateDate)));
-                        }
-                    }
-                    else
-                    {
-                        var children = entityService.GetChildren(asInt);
-                        nodes.AddRange(children.Select(child => new SortNode(child.Id, child.SortOrder, child.Name, child.CreateDate)));
-                    }
-
-
-                    parent.SortNodes = nodes.ToArray();
-
-                    return parent;
-                }
-            }
-
-            throw new ArgumentException("User not logged in");
-        }
-
-        public void UpdateSortOrder(int ParentId, string SortOrder)
-        {
-            UpdateSortOrder(ParentId.ToString(), SortOrder);
-        }
-
-        [WebMethod]
-        public void UpdateSortOrder(string ParentId, string SortOrder)
-        {
-            if (AuthorizeRequest() == false) return;
-            if (SortOrder.Trim().Length <= 0) return;
-
-            var isContent = Context.Request.GetItemAsString("app") == "content" | Context.Request.GetItemAsString("app") == "";
-            var isMedia = Context.Request.GetItemAsString("app") == "media";
-
-            //ensure user is authorized for the app requested
-            if (isContent && AuthorizeRequest(Constants.Applications.Content.ToString()) == false) return;
-            if (isMedia && AuthorizeRequest(Constants.Applications.Media.ToString()) == false) return;
-
-            var ids = SortOrder.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
-            if (isContent)
-            {
-                SortContent(ids, int.Parse(ParentId));
-            }
-            else if (isMedia)
-            {
-                SortMedia(ids);
-            }
-            else
-            {
-                SortStylesheetProperties(ParentId, ids);
-            }
-        }
-
-        private void SortMedia(string[] ids)
-        {
-            var mediaService = Services.MediaService;
-            var sortedMedia = new List<IMedia>();
-            try
-            {
-                for (var i = 0; i < ids.Length; i++)
-                {
-                    var id = int.Parse(ids[i]);
-                    var m = mediaService.GetById(id);
-                    sortedMedia.Add(m);
-                }
-
-                // Save Media with new sort order and update content xml in db accordingly
-                var sorted = mediaService.Sort(sortedMedia);
-            }
-            catch (Exception ex)
-            {
-                Current.Logger.Error<nodeSorter>("Could not update media sort order", ex);
-            }
-        }
-
-
-        private void SortStylesheetProperties(string stylesheetName, string[] names)
-        {
-            var stylesheet = Services.FileService.GetStylesheetByName(stylesheetName.EnsureEndsWith(".css"));
-            if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + stylesheetName);
-
-            var currProps = stylesheet.Properties.ToArray();
-            //remove them all first
-            foreach (var prop in currProps)
-            {
-                stylesheet.RemoveProperty(prop.Name);
-            }
-
-            //re-add them in the right order
-            for (var i = 0; i < names.Length; i++)
-            {
-                var found = currProps.Single(x => x.Name == names[i]);
-                stylesheet.AddProperty(found);
-            }
-
-            Services.FileService.SaveStylesheet(stylesheet);
-        }
-
-        private void SortContent(string[] ids, int parentId)
-        {
-            var contentService = Services.ContentService;
-            try
-            {
-                // Save content with new sort order and update db+cache accordingly
-                var intIds = new List<int>();
-                foreach (var stringId in ids)
-                {
-                    int intId;
-                    if (int.TryParse(stringId, out intId))
-                        intIds.Add(intId);
-                }
-                var sorted = contentService.Sort(intIds.ToArray());
-
-                // refresh sort order on cached xml
-                // but no... this is not distributed - solely relying on content service & events should be enough
-                //content.Instance.SortNodes(parentId);
-
-                //send notifications! TODO: This should be put somewhere centralized instead of hard coded directly here
-                if (parentId > 0)
-                {
-                    Services.NotificationService.SendNotification(contentService.GetById(parentId), ActionSort.Instance, UmbracoContext, Services.TextService, GlobalSettings);
-                }
-
-            }
-            catch (Exception ex)
-            {
-                Current.Logger.Error<nodeSorter>("Could not update content sort order", ex);
-            }
-        }
-
-    }
-
-    [Serializable]
-    public class SortNode
-    {
-        public SortNode()
-        {
-        }
-
-        private SortNode[] _sortNodes;
-
-        public SortNode[] SortNodes
-        {
-            get { return _sortNodes; }
-            set { _sortNodes = value; }
-        }
-
-        public int TotalNodes
-        {
-            get { return _sortNodes != null ? _sortNodes.Length : 0; }
-            set { int test = value; }
-        }
-
-        public SortNode(int Id, int SortOrder, string Name, DateTime CreateDate)
-        {
-            _id = Id;
-            _sortOrder = SortOrder;
-            _name = Name;
-            _createDate = CreateDate;
-        }
-
-        private DateTime _createDate;
-
-        public DateTime CreateDate
-        {
-            get { return _createDate; }
-            set { _createDate = value; }
-        }
-
-        private string _name;
-
-        public string Name
-        {
-            get { return _name; }
-            set { _name = value; }
-        }
-
-        private int _sortOrder;
-
-        public int SortOrder
-        {
-            get { return _sortOrder; }
-            set { _sortOrder = value; }
-        }
-
-        private int _id;
-
-        public int Id
-        {
-            get { return _id; }
-            set { _id = value; }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web.Script.Services;
+using System.Web.Services;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Web;
+using Umbraco.Web.Composing;
+using Umbraco.Web._Legacy.Actions;
+
+namespace umbraco.presentation.webservices
+{
+    /// <summary>
+    /// Summary description for nodeSorter
+    /// </summary>
+    [WebService(Namespace = "http://umbraco.org/")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [ToolboxItem(false)]
+    [ScriptService]
+    public class nodeSorter : UmbracoAuthorizedWebService
+    {
+        [WebMethod]
+        public SortNode GetNodes(string ParentId, string App)
+        {
+            if (AuthorizeRequest())
+            {
+                var nodes = new List<SortNode>();
+
+                // "hack for stylesheet"
+                if (App == "settings")
+                {
+                    var stylesheet = Services.FileService.GetStylesheetByName(ParentId.EnsureEndsWith(".css"));
+                    if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + ParentId);
+
+                    var sort = 0;
+                    foreach (var child in stylesheet.Properties)
+                    {
+                        nodes.Add(new SortNode(child.Name.GetHashCode(), sort, child.Name, DateTime.Now));
+                        sort++;
+                    }
+
+                    return new SortNode()
+                    {
+                        SortNodes = nodes.ToArray()
+                    };
+                }
+                else
+                {
+                    var asInt = int.Parse(ParentId);
+
+                    var parent = new SortNode { Id = asInt };
+
+                    var entityService = Services.EntityService;
+
+                    // Root nodes?
+                    if (asInt == -1)
+                    {
+                        if (App == "media")
+                        {
+                            var rootMedia = entityService.GetRootEntities(UmbracoObjectTypes.Media);
+                            nodes.AddRange(rootMedia.Select(media => new SortNode(media.Id, media.SortOrder, media.Name, media.CreateDate)));
+                        }
+                        else
+                        {
+                            var rootContent = entityService.GetRootEntities(UmbracoObjectTypes.Document);
+                            nodes.AddRange(rootContent.Select(content => new SortNode(content.Id, content.SortOrder, content.Name, content.CreateDate)));
+                        }
+                    }
+                    else
+                    {
+                        var children = entityService.GetChildren(asInt);
+                        nodes.AddRange(children.Select(child => new SortNode(child.Id, child.SortOrder, child.Name, child.CreateDate)));
+                    }
+
+
+                    parent.SortNodes = nodes.ToArray();
+
+                    return parent;
+                }
+            }
+
+            throw new ArgumentException("User not logged in");
+        }
+
+        public void UpdateSortOrder(int ParentId, string SortOrder)
+        {
+            UpdateSortOrder(ParentId.ToString(), SortOrder);
+        }
+
+        [WebMethod]
+        public void UpdateSortOrder(string ParentId, string SortOrder)
+        {
+            if (AuthorizeRequest() == false) return;
+            if (SortOrder.Trim().Length <= 0) return;
+
+            var isContent = Context.Request.GetItemAsString("app") == "content" | Context.Request.GetItemAsString("app") == "";
+            var isMedia = Context.Request.GetItemAsString("app") == "media";
+
+            //ensure user is authorized for the app requested
+            if (isContent && AuthorizeRequest(Constants.Applications.Content.ToString()) == false) return;
+            if (isMedia && AuthorizeRequest(Constants.Applications.Media.ToString()) == false) return;
+
+            var ids = SortOrder.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+            if (isContent)
+            {
+                SortContent(ids, int.Parse(ParentId));
+            }
+            else if (isMedia)
+            {
+                SortMedia(ids);
+            }
+            else
+            {
+                SortStylesheetProperties(ParentId, ids);
+            }
+        }
+
+        private void SortMedia(string[] ids)
+        {
+            var mediaService = Services.MediaService;
+            var sortedMedia = new List<IMedia>();
+            try
+            {
+                for (var i = 0; i < ids.Length; i++)
+                {
+                    var id = int.Parse(ids[i]);
+                    var m = mediaService.GetById(id);
+                    sortedMedia.Add(m);
+                }
+
+                // Save Media with new sort order and update content xml in db accordingly
+                var sorted = mediaService.Sort(sortedMedia);
+            }
+            catch (Exception ex)
+            {
+                Current.Logger.Error<nodeSorter>("Could not update media sort order", ex);
+            }
+        }
+
+
+        private void SortStylesheetProperties(string stylesheetName, string[] names)
+        {
+            var stylesheet = Services.FileService.GetStylesheetByName(stylesheetName.EnsureEndsWith(".css"));
+            if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + stylesheetName);
+
+            var currProps = stylesheet.Properties.ToArray();
+            //remove them all first
+            foreach (var prop in currProps)
+            {
+                stylesheet.RemoveProperty(prop.Name);
+            }
+
+            //re-add them in the right order
+            for (var i = 0; i < names.Length; i++)
+            {
+                var found = currProps.Single(x => x.Name == names[i]);
+                stylesheet.AddProperty(found);
+            }
+
+            Services.FileService.SaveStylesheet(stylesheet);
+        }
+
+        private void SortContent(string[] ids, int parentId)
+        {
+            var contentService = Services.ContentService;
+            try
+            {
+                // Save content with new sort order and update db+cache accordingly
+                var intIds = new List<int>();
+                foreach (var stringId in ids)
+                {
+                    int intId;
+                    if (int.TryParse(stringId, out intId))
+                        intIds.Add(intId);
+                }
+                var sorted = contentService.Sort(intIds.ToArray());
+
+                // refresh sort order on cached xml
+                // but no... this is not distributed - solely relying on content service & events should be enough
+                //content.Instance.SortNodes(parentId);
+
+                //send notifications! TODO: This should be put somewhere centralized instead of hard coded directly here
+                if (parentId > 0)
+                {
+                    Services.NotificationService.SendNotification(contentService.GetById(parentId), ActionSort.Instance, UmbracoContext, Services.TextService, GlobalSettings);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                Current.Logger.Error<nodeSorter>("Could not update content sort order", ex);
+            }
+        }
+
+    }
+
+    [Serializable]
+    public class SortNode
+    {
+        public SortNode()
+        {
+        }
+
+        private SortNode[] _sortNodes;
+
+        public SortNode[] SortNodes
+        {
+            get { return _sortNodes; }
+            set { _sortNodes = value; }
+        }
+
+        public int TotalNodes
+        {
+            get { return _sortNodes != null ? _sortNodes.Length : 0; }
+            set { int test = value; }
+        }
+
+        public SortNode(int Id, int SortOrder, string Name, DateTime CreateDate)
+        {
+            _id = Id;
+            _sortOrder = SortOrder;
+            _name = Name;
+            _createDate = CreateDate;
+        }
+
+        private DateTime _createDate;
+
+        public DateTime CreateDate
+        {
+            get { return _createDate; }
+            set { _createDate = value; }
+        }
+
+        private string _name;
+
+        public string Name
+        {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        private int _sortOrder;
+
+        public int SortOrder
+        {
+            get { return _sortOrder; }
+            set { _sortOrder = value; }
+        }
+
+        private int _id;
+
+        public int Id
+        {
+            get { return _id; }
+            set { _id = value; }
+        }
+    }
+}

From c209bdde5b94c31f88f6ab1d3d7e29c4b8a9977d Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 30 Jul 2018 10:10:01 +0200
Subject: [PATCH 08/11] Fix routing, AliasUrlProvider

---
 .../ContentVariationExtensions.cs             | 20 +++++++++++++
 src/Umbraco.Web/PublishedContentExtensions.cs | 11 +++++++
 src/Umbraco.Web/Routing/AliasUrlProvider.cs   | 29 ++++++++++++++++---
 .../Routing/ContentFinderByUrlAlias.cs        | 21 ++++++++++++--
 src/Umbraco.Web/Routing/DefaultUrlProvider.cs |  3 ++
 .../Routing/UrlProviderExtensions.cs          | 13 +++++----
 6 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/ContentVariationExtensions.cs b/src/Umbraco.Core/ContentVariationExtensions.cs
index 092de4d6d6..d18fb4b091 100644
--- a/src/Umbraco.Core/ContentVariationExtensions.cs
+++ b/src/Umbraco.Core/ContentVariationExtensions.cs
@@ -75,6 +75,26 @@ namespace Umbraco.Core
         /// </summary>
         public static bool VariesByCultureAndSegment(this PublishedContentType contentType) => contentType.Variations.VariesByCultureAndSegment();
 
+        /// <summary>
+        /// Determines whether the property type is invariant.
+        /// </summary>
+        public static bool VariesByNothing(this PublishedPropertyType propertyType) => propertyType.Variations.VariesByNothing();
+
+        /// <summary>
+        /// Determines whether the property type varies by culture.
+        /// </summary>
+        public static bool VariesByCulture(this PublishedPropertyType propertyType) => propertyType.Variations.VariesByCulture();
+
+        /// <summary>
+        /// Determines whether the property type varies by segment.
+        /// </summary>
+        public static bool VariesBySegment(this PublishedPropertyType propertyType) => propertyType.Variations.VariesBySegment();
+
+        /// <summary>
+        /// Determines whether the property type varies by culture and segment.
+        /// </summary>
+        public static bool VariesByCultureAndSegment(this PublishedPropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
+
         /// <summary>
         /// Determines whether a variation is invariant.
         /// </summary>
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index d33372ce53..5350e05ef9 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -229,6 +229,17 @@ namespace Umbraco.Web
 
         #endregion
 
+        #region Variations
+
+        /// <summary>
+        /// Determines whether the content has a culture.
+        /// </summary>
+        /// <remarks>Culture is case-insensitive.</remarks>
+        public static bool HasCulture(this IPublishedContent content, string culture)
+            => content.Cultures.ContainsKey(culture);
+
+        #endregion
+
         #region Search
 
         public static IEnumerable<PublishedSearchResult> Search(this IPublishedContent content, string term, bool useWildCards = true, string indexName = null)
diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
index 900c41e1ff..8c851d139f 100644
--- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
@@ -54,25 +54,36 @@ namespace Umbraco.Web.Routing
         public IEnumerable<string> GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current)
         {
             var node = umbracoContext.ContentCache.GetById(id);
-            if (node == null)
-                return Enumerable.Empty<string>();
+            if (node == null) return Enumerable.Empty<string>();
 
             if (!node.HasProperty(Constants.Conventions.Content.UrlAlias))
                 return Enumerable.Empty<string>();
 
             var domainHelper = umbracoContext.GetDomainHelper(_siteDomainHelper);
 
+            // look for domains, walking up the tree
             var n = node;
             var domainUris = domainHelper.DomainsForNode(n.Id, current, false);
             while (domainUris == null && n != null) // n is null at root
             {
                 // move to parent node
                 n = n.Parent;
-                domainUris = n == null ? null : domainHelper.DomainsForNode(n.Id, current, false);
+                domainUris = n == null ? null : domainHelper.DomainsForNode(n.Id, current, excludeDefault: false);
             }
 
+            // determine whether the alias property varies
+            var varies = node.GetProperty(Constants.Conventions.Content.UrlAlias).PropertyType.VariesByCulture();
+
             if (domainUris == null)
             {
+                // no domain
+                // if the property is invariant, then url "/<alias>" is ok
+                // if the property varies, then what are we supposed to do?
+                //  the content finder may work, depending on the 'current' culture,
+                //  but there's no way we can return something meaningful here
+                if (varies)
+                    return Enumerable.Empty<string>();
+
                 var umbracoUrlName = node.Value<string>(Constants.Conventions.Content.UrlAlias);
                 if (string.IsNullOrWhiteSpace(umbracoUrlName))
                     return Enumerable.Empty<string>();
@@ -83,10 +94,20 @@ namespace Umbraco.Web.Routing
             }
             else
             {
+                // some domains: one url per domain, which is "<domain>/<alias>"
                 var result = new List<string>();
                 foreach(var domainUri in domainUris)
                 {
-                    var umbracoUrlName = node.Value<string>(Constants.Conventions.Content.UrlAlias, culture: domainUri.Culture.Name);
+                    // if the property is invariant, get the invariant value, url is "<domain>/<invariant-alias>"
+                    // if the property varies, get the variant value, url is "<domain>/<variant-alias>"
+
+                    // but! only if the culture is published, else ignore
+                    if (varies && !node.HasCulture(domainUri.Culture.Name)) continue;
+
+                    var umbracoUrlName = varies
+                        ? node.Value<string>(Constants.Conventions.Content.UrlAlias, culture: domainUri.Culture.Name)
+                        : node.Value<string>(Constants.Conventions.Content.UrlAlias);
+
                     if (!string.IsNullOrWhiteSpace(umbracoUrlName))
                     {
                         var path = "/" + umbracoUrlName;
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index 11de879bc8..59e30cc8b0 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -38,6 +38,7 @@ namespace Umbraco.Web.Routing
             {
                 node = FindContentByAlias(frequest.UmbracoContext.ContentCache,
                     frequest.HasDomain ? frequest.Domain.ContentId : 0,
+                    frequest.Culture.Name,
                     frequest.Uri.GetAbsolutePathDecoded());
 
                 if (node != null)
@@ -50,7 +51,7 @@ namespace Umbraco.Web.Routing
             return node != null;
         }
 
-        private static IPublishedContent FindContentByAlias(IPublishedContentCache cache, int rootNodeId, string alias)
+        private static IPublishedContent FindContentByAlias(IPublishedContentCache cache, int rootNodeId, string culture, string alias)
         {
             if (alias == null) throw new ArgumentNullException(nameof(alias));
 
@@ -62,7 +63,7 @@ namespace Umbraco.Web.Routing
             // can we normalize the values so that they contain no whitespaces, and no leading slashes?
             // and then the comparisons in IsMatch can be way faster - and allocate way less strings
 
-            const string propertyAlias = "umbracoUrlAlias";
+            const string propertyAlias = Constants.Conventions.Content.UrlAlias;
 
             var test1 = alias.TrimStart('/') + ",";
             var test2 = ",/" + test1; // test2 is ",/alias,"
@@ -78,12 +79,26 @@ namespace Umbraco.Web.Routing
                 // ")]"
 
                 if (!c.HasProperty(propertyAlias)) return false;
-                var v = c.Value<string>(propertyAlias);
+                var p = c.GetProperty(propertyAlias);
+                var varies = p.PropertyType.VariesByCulture();
+                string v;
+                if (varies)
+                {
+                    if (!c.HasCulture(culture)) return false;
+                    v = c.Value<string>(propertyAlias, culture);
+                }
+                else
+                {
+                    v = c.Value<string>(propertyAlias);
+                }
                 if (string.IsNullOrWhiteSpace(v)) return false;
                 v = "," + v.Replace(" ", "") + ",";
                 return v.Contains(a1) || v.Contains(a2);
             }
 
+            // fixme - even with Linq, what happens below has to be horribly slow
+            // but the only solution is to entirely refactor url providers to stop being dynamic
+
             if (rootNodeId > 0)
             {
                 var rootNode = cache.GetById(rootNodeId);
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index 9e89459774..fb9cdfa9bd 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -80,8 +80,11 @@ namespace Umbraco.Web.Routing
         public virtual IEnumerable<string> GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current)
         {
             var node = umbracoContext.ContentCache.GetById(id);
+            if (node == null) return Enumerable.Empty<string>();
+
             var domainHelper = umbracoContext.GetDomainHelper(_siteDomainHelper);
 
+            // look for domains, walking up the tree
             var n = node;
             var domainUris = domainHelper.DomainsForNode(n.Id, current, false);
             while (domainUris == null && n != null) // n is null at root
diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
index ce09bdc645..b8671b5735 100644
--- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
@@ -110,11 +110,14 @@ namespace Umbraco.Web.Routing
             foreach (var (text, infos) in dmsg)
                 ret.Add(UrlInfo.Message(text, infos.Count == cultures.Count ?  null : string.Join(", ", infos.Select(x => x.Culture))));
 
-            // fixme - need to add 'others' urls
-            // but, when?
-            //// get the 'other' urls
-            //foreach(var otherUrl in urlProvider.GetOtherUrls(content.Id))
-            //    urls.Add(otherUrl);
+            // get the 'other' urls - ie not what you'd get with GetUrl() but urls that would route to the document, nevertheless.
+            // for these 'other' urls, we don't check whether they are routable, collide, anything - we just report them.
+            // also, we are not dealing with cultures at all - that will have to wait
+            foreach(var otherUrl in umbracoContext.UrlProvider.GetOtherUrls(content.Id))
+            {
+                if (urls.Any(x => x.IsUrl && x.Text == otherUrl)) continue;
+                ret.Add(UrlInfo.Url(otherUrl));
+            }
 
             return ret;
         }

From a3f2372b6c02e88bd64803aaebf2ff04c103d5c9 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 31 Jul 2018 14:56:40 +0200
Subject: [PATCH 09/11] Post-merge namespace cleanup

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs |  1 -
 .../IncreaseLanguageIsoCodeColumnLength.cs         | 14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 5773547320..48ac39a630 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -5,7 +5,6 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Upgrade.V_7_12_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_0_0;
-using Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/IncreaseLanguageIsoCodeColumnLength.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/IncreaseLanguageIsoCodeColumnLength.cs
index 302069855a..400fc0bcdd 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/IncreaseLanguageIsoCodeColumnLength.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/IncreaseLanguageIsoCodeColumnLength.cs
@@ -1,14 +1,10 @@
-using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_12_0
 {
     public class IncreaseLanguageIsoCodeColumnLength : MigrationBase
     {
-        public IncreaseLanguageIsoCodeColumnLength(IMigrationContext context) : base(context)
-        {
-        }
+        public IncreaseLanguageIsoCodeColumnLength(IMigrationContext context)
+            : base(context)
+        { }
 
         public override void Migrate()
         {
@@ -26,7 +22,5 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
                 .Unique()
                 .Do();
         }
-
-
     }
 }

From ee5a834ab0aa381c79d656396a1e5c4e16713c8c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 31 Jul 2018 15:55:31 +0200
Subject: [PATCH 10/11] Ensure build respects NUGET_PACKAGES

---
 build/build.ps1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/build.ps1 b/build/build.ps1
index 5f85284431..964c29fb63 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -298,7 +298,11 @@
 
     # copy libs
     Write-Host "Copy SqlCE libraries"
-    $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
+    $nugetPackages = $env:NUGET_PACKAGES
+    if (-not $nugetPackages)
+    {
+      $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
+    }
     $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
     $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
     $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")

From 1bdd848582335ca4fa740a624c49041de66d513a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 31 Jul 2018 20:48:44 +0200
Subject: [PATCH 11/11] Post-merge color picker fixes

---
 .../components/umbcolorswatches.directive.js  |  2 --
 .../src/less/components/check-circle.less     |  1 -
 .../less/components/umb-color-swatches.less   |  6 ----
 .../src/less/property-editors.less            |  6 ----
 .../iconpicker/iconpicker.controller.js       | 28 ++++++++++++++++
 .../iconpicker/iconpicker.html                | 32 +++++--------------
 .../views/components/umb-color-swatches.html  |  4 +--
 .../colorpicker/colorpicker.html              |  4 +--
 .../colorpicker/colorpicker.prevalues.html    |  2 +-
 9 files changed, 41 insertions(+), 44 deletions(-)

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
index 6ed65a9431..2b4004da11 100644
--- 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
@@ -29,9 +29,7 @@ Use this directive to generate color swatches to pick from.
         function link(scope, el, attr, ctrl) {
 
             scope.setColor = function (color) {
-                //scope.selectedColor({color: color });
                 scope.selectedColor = color;
-
                 if (scope.onSelect) {
                     scope.onSelect(color);
                 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less b/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
index a4c3a89c99..fadf9c7940 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
@@ -1,6 +1,5 @@
 .check_circle {
     display: flex;
-    opacity: 0;
     width: 20px;
     height: 20px;
     margin: 0 auto;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
index e27bd0d654..c7905879d8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
@@ -18,12 +18,6 @@
             box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
         }
 
-        &.active {
-            .check_circle {
-                opacity: 1;
-            }
-        }
-
         &.umb-color-box--m {
             width: 40px;
             height: 40px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index fd9296259f..283d538b75 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -139,12 +139,6 @@ ul.color-picker li {
     border: 2px solid transparent;
     width: 60px;
 
-    &.active {
-        .check_circle {
-            opacity: 1;
-        }
-    }
-
     .thumbnail{
         min-width: auto;
         width: inherit;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index f428e64e3e..05c76beeae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -13,6 +13,28 @@ function IconPickerController($scope, iconHelper, localizationService) {
     vm.selectIcon = selectIcon;
     vm.close = close;
 
+    vm.colors = [
+        { name: "Black", value: "color-black" },
+        { name: "Blue Grey", value: "color-blue-grey" },
+        { name: "Grey", value: "color-grey" },
+        { name: "Brown", value: "color-brown" },
+        { name: "Blue", value: "color-blue" },
+        { name: "Light Blue", value: "color-light-blue" },
+        { name: "Indigo", value: "color-indigo" },
+        { name: "Purple", value: "color-purple" },
+        { name: "Deep Purple", value: "color-deep-purple" },
+        { name: "Cyan", value: "color-cyan" },
+        { name: "Green", value: "color-green" },
+        { name: "Light Green", value: "color-light-green" },
+        { name: "Lime", value: "color-lime" },
+        { name: "Yellow", value: "color-yellow" },
+        { name: "Amber", value: "color-amber" },
+        { name: "Orange", value: "color-orange" },
+        { name: "Deep Orange", value: "color-deep-orange" },
+        { name: "Red", value: "color-red" },
+        { name: "Pink", value: "color-pink" }
+    ];
+
     function onInit() {
 
         vm.loading = true;
@@ -24,6 +46,12 @@ function IconPickerController($scope, iconHelper, localizationService) {
             vm.loading = false;
         });
 
+        // set a default color if nothing is passed in
+        vm.color = $scope.model.color ? $scope.model.color :  vm.colors[0].value;
+
+        // if an icon is passed in - preselect it
+        vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
+
     }
 
     function setTitle() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index 320e0cee8a..8a7358116a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -32,35 +32,19 @@
                 </div>
                 
                 <div class="umb-control-group">
-                    <select ng-model="color" class="input-block-level">
-                        <option value=""><localize key="colors_black">Black</localize></option>
-                        <option value="color-blue-grey"><localize key="colors_bluegrey">Blue Grey</localize></option>
-                        <option value="color-grey"><localize key="colors_grey">Grey</localize></option>
-                        <option value="color-brown"><localize key="colors_brown">Brown</localize></option>
-                        <option value="color-blue"><localize key="colors_blue">Blue</localize></option>
-                        <option value="color-light-blue"><localize key="colors_lightblue">Light Blue</localize></option>
-                        <option value="color-cyan"><localize key="colors_cyan">Cyan</localize></option>
-                        <option value="color-green"><localize key="colors_green">Green</localize></option>
-                        <option value="color-light-green"><localize key="colors_lightgreen">Light Green</localize></option>
-                        <option value="color-yellow"><localize key="colors_yellow">Yellow</localize></option>
-                        <option value="color-lime"><localize key="colors_lime">Lime</localize></option>
-                        <option value="color-amber"><localize key="colors_amber">Amber</localize></option>
-                        <option value="color-orange"><localize key="colors_orange">Orange</localize></option>
-                        <option value="color-deep-orange"><localize key="colors_deeporange">Deep Orange</localize></option>
-                        <option value="color-red"><localize key="colors_red">Red</localize></option>
-                        <option value="color-pink"><localize key="colors_pink">Pink</localize></option>
-                        <option value="color-purple"><localize key="colors_purple">Purple</localize></option>
-                        <option value="color-deep-purple"><localize key="colors_deeppurple">Deep Purple</localize></option>
-                        <option value="color-indigo"><localize key="colors_indigo">Indigo</localize></option>
-                    </select>
+                    <umb-color-swatches 
+                        colors="vm.colors"
+                        selected-color="vm.color"
+                        size="s">
+                    </umb-color-swatches>
                 </div>
                 
                 <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
             
                 <div class="umb-control-group" ng-show="!vm.loading && filtered.length > 0 ">
-                    <ul class="umb-iconpicker" ng-class="color" ng-show="vm.icons">
-                        <li class="umb-iconpicker-item" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm) track by $id(icon)">
-                            <a href="#" title="{{icon}}" ng-click="vm.selectIcon(icon, color)" prevent-default>
+                    <ul class="umb-iconpicker" ng-class="vm.color" ng-show="vm.icons">
+                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm) track by $id(icon)">
+                            <a href="#" title="{{icon}}" ng-click="vm.selectIcon(icon, vm.color)" prevent-default>
                                 <i class="{{icon}} large"></i>
                             </a>
                         </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
index eae299e579..d3105d52a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
@@ -1,7 +1,7 @@
 <div class="umb-color-swatches">
 
-    <button class="umb-color-box umb-color-box--{{size}} btn-{{color.value}}" ng-repeat="color in colors" title="{{color.name}}" ng-class="{active:color.value === selectedColor}" ng-click="setColor(color.value)">
-        <div class="check_circle">
+    <button class="umb-color-box umb-color-box--{{size}} btn-{{color.value}}" ng-repeat="color in colors" title="{{color.name}}" ng-click="setColor(color.value)">
+        <div class="check_circle" ng-if="color.value === selectedColor">
             <i class="icon icon-check small"></i>
         </div>
     </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index 1cb61f4168..f726800696 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -5,9 +5,9 @@
 	</div>
 
     <ul class="thumbnails color-picker">
-        <li ng-repeat="(key, val) in model.config.items" ng-class="{active: isActiveColor(val)}">
+        <li ng-repeat="(key, val) in model.config.items">
             <a ng-click="toggleItem(val)" class="thumbnail" hex-bg-color="{{val.value}}">
-                <div class="check_circle">
+                <div class="check_circle" ng-if="isActiveColor(val)">
                     <i class="icon icon-check small"></i>
                 </div>
             </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
index 7d88fb068f..a70ecabf35 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
@@ -1,4 +1,4 @@
-<div class="umb-editor umb-prevalues-multivalues" ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController">
+<div class="umb-property-editor umb-prevalues-multivalues" ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController">
     <div class="control-group  umb-prevalues-multivalues__add color-picker-preval">
         <div class="umb-prevalues-multivalues__left">
             <input name="newColor" type="hidden" />