Merge pull request #6072 from callumbwhyte/v8/feature/block-editor

WIP - block editor prototype

src/Umbraco.Core/Constants-PropertyEditors.cs

@@ -36,6 +36,11 @@ namespace Umbraco.Core
             /// </summary>
             public static class Aliases
             {
+                /// <summary>
+                /// Block Editor.
+                /// </summary>
+                public const string BlockEditor = "Umbraco.BlockEditor";
+
                 /// <summary>
                 /// CheckBox List.
                 /// </summary>
@@ -203,6 +208,24 @@ namespace Umbraco.Core
                 /// <remarks>Must be a valid <see cref="ValueTypes"/> value.</remarks>
                 public const string DataValueType = "umbracoDataValueType";
             }
+
+            /// <summary>
+            /// Defines Umbraco's built-in property editor groups.
+            /// </summary>
+            public static class Groups
+            {
+                public const string Common = "Common";
+
+                public const string Lists = "Lists";
+
+                public const string Media = "Media";
+
+                public const string People = "People";
+
+                public const string Pickers = "Pickers";
+
+                public const string RichContent = "Rich Content";
+            }
         }
     }
 }

src/Umbraco.Core/PropertyEditors/DataEditor.cs

@@ -30,7 +30,7 @@ namespace Umbraco.Core.PropertyEditors
             // defaults
             Type = type;
             Icon = Constants.Icons.PropertyEditor;
-            Group = "common";
+            Group = Constants.PropertyEditors.Groups.Common;
 
             // assign properties based on the attribute, if it is found
             Attribute = GetType().GetCustomAttribute<DataEditorAttribute>(false);

src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs

@@ -121,7 +121,7 @@ namespace Umbraco.Core.PropertyEditors
         /// Gets or sets an optional group.
         /// </summary>
         /// <remarks>The group can be used for example to group the editors by category.</remarks>
-        public string Group { get; set; } = "common";
+        public string Group { get; set; } = Constants.PropertyEditors.Groups.Common;
 
         /// <summary>
         /// Gets or sets a value indicating whether the value editor is deprecated.

src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs

@@ -5,7 +5,11 @@ namespace Umbraco.Core.PropertyEditors
     /// <summary>
     /// Represents a property editor for label properties.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Label, "Label", "readonlyvalue", Icon = "icon-readonly")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Label,
+        "Label",
+        "readonlyvalue",
+        Icon = "icon-readonly")]
     public class LabelPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Examine/BaseValueSetBuilder.cs

@@ -45,7 +45,7 @@ namespace Umbraco.Examine
                             continue;
                         case string strVal:
                             {
-                                if (strVal.IsNullOrWhiteSpace()) return;
+                                if (strVal.IsNullOrWhiteSpace()) continue;
                                 var key = $"{keyVal.Key}{cultureSuffix}";
                                 if (values.TryGetValue(key, out var v))
                                     values[key] = new List<object>(v) { val }.ToArray();

src/Umbraco.Tests/Composing/TypeLoaderTests.cs

@@ -268,7 +268,7 @@ AnotherContentFinder
         public void GetDataEditors()
         {
             var types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(38, types.Count());
+            Assert.AreEqual(39, types.Count());
         }
 
         /// <summary>

src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs

@@ -81,6 +81,19 @@ namespace Umbraco.Tests.Routing
             Assert.AreEqual(expected, resolvedUrl);
         }
 
+        [Test]
+        public void Get_Media_Url_Returns_Absolute_Url_If_Stored_Url_Is_Absolute()
+        {
+            const string expected = "http://localhost/media/rfeiw584/test.jpg";
+
+            var umbracoContext = GetUmbracoContext("http://localhost", mediaUrlProviders: new[] { _mediaUrlProvider });
+            var publishedContent = CreatePublishedContent(Constants.PropertyEditors.Aliases.UploadField, expected, null);
+
+            var resolvedUrl = umbracoContext.UrlProvider.GetMediaUrl(publishedContent, UrlMode.Relative);
+
+            Assert.AreEqual(expected, resolvedUrl);
+        }
+
         [Test]
         public void Get_Media_Url_Returns_Empty_String_When_PropertyType_Is_Not_Supported()
         {

src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs

@@ -25,19 +25,23 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
         public async Task<Tuple<HttpResponseMessage, string>> Execute(string controllerName, string actionName, HttpMethod method,
             HttpContent content = null,
             MediaTypeWithQualityHeaderValue mediaTypeHeader = null,
-            bool assertOkResponse = true)
+            bool assertOkResponse = true, object routeDefaults = null, string url = null)
         {
             if (mediaTypeHeader == null)
             {
                 mediaTypeHeader = new MediaTypeWithQualityHeaderValue("application/json");
             }
+            if (routeDefaults == null)
+            {
+                routeDefaults = new { controller = controllerName, action = actionName, id = RouteParameter.Optional };
+            }
 
             var startup = new TestStartup(
                 configuration =>
                 {
                     configuration.Routes.MapHttpRoute("Default",
                         routeTemplate: "{controller}/{action}/{id}",
-                        defaults: new { controller = controllerName, action = actionName, id = RouteParameter.Optional });
+                        defaults: routeDefaults);
                 },
                 _controllerFactory);
 
@@ -45,7 +49,7 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
             {
                 var request = new HttpRequestMessage
                 {
-                    RequestUri = new Uri("https://testserver/"),
+                    RequestUri = new Uri("https://testserver/" + (url ?? "")),
                     Method = method
                 };
 

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -243,6 +243,7 @@
     <Compile Include="Cache\FullDataSetCachePolicyTests.cs" />
     <Compile Include="Cache\SingleItemsOnlyCachePolicyTests.cs" />
     <Compile Include="Collections\DeepCloneableListTests.cs" />
+    <Compile Include="Web\Controllers\AuthenticationControllerTests.cs" />
     <Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
     <Compile Include="CoreThings\DelegateExtensionsTests.cs" />
     <Compile Include="Web\Controllers\ContentControllerTests.cs" />

src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs

@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Web;
+using System.Web.Hosting;
+using System.Web.Http;
+using Moq;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.ControllerTesting;
+using Umbraco.Tests.Testing;
+using Umbraco.Web;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Features;
+using Umbraco.Web.Models.ContentEditing;
+using IUser = Umbraco.Core.Models.Membership.IUser;
+
+namespace Umbraco.Tests.Web.Controllers
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
+    public class AuthenticationControllerTests : TestWithDatabaseBase
+    {
+        protected override void ComposeApplication(bool withApplication)
+        {
+            base.ComposeApplication(withApplication);
+            //if (!withApplication) return;
+
+            // replace the true IUserService implementation with a mock
+            // so that each test can configure the service to their liking
+            Composition.RegisterUnique(f => Mock.Of<IUserService>());
+
+            // kill the true IEntityService too
+            Composition.RegisterUnique(f => Mock.Of<IEntityService>());
+
+            Composition.RegisterUnique<UmbracoFeatures>();
+        }
+
+
+        [Test]
+        public async System.Threading.Tasks.Task GetCurrentUser_Fips()
+        {
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            {
+                //setup some mocks
+                var userServiceMock = Mock.Get(Current.Services.UserService);
+                userServiceMock.Setup(service => service.GetUserById(It.IsAny<int>()))
+                    .Returns(() => null);
+
+                if (Thread.GetDomain().GetData(".appPath") != null)
+                {
+                    HttpContext.Current = new HttpContext(new SimpleWorkerRequest("", "", new StringWriter()));
+                }
+                else
+                {
+                    var baseDir = IOHelper.MapPath("", false).TrimEnd(IOHelper.DirSepChar);
+                    HttpContext.Current = new HttpContext(new SimpleWorkerRequest("/", baseDir, "", "", new StringWriter()));
+                }
+                IOHelper.ForceNotHosted = true;
+                var usersController = new AuthenticationController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContextAccessor,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+                return usersController;
+            }
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.Query<IUser>())
+                .Returns(new Query<IUser>(Current.SqlContext));
+
+            var syntax = new SqlCeSyntaxProvider();
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.SqlSyntax)
+                .Returns(syntax);
+
+            var mappers = new MapperCollection(new[]
+            {
+                new UserMapper(new Lazy<ISqlContext>(() => Current.SqlContext), new ConcurrentDictionary<Type, ConcurrentDictionary<string, string>>())
+            });
+
+            Mock.Get(Current.SqlContext)
+                .Setup(x => x.Mappers)
+                .Returns(mappers);
+
+            // Testing what happens if the system were configured to only use FIPS-compliant algorithms
+            var typ = typeof(CryptoConfig);
+            var flds = typ.GetFields(BindingFlags.Static | BindingFlags.NonPublic);
+            var haveFld = flds.FirstOrDefault(f => f.Name == "s_haveFipsAlgorithmPolicy");
+            var isFld = flds.FirstOrDefault(f => f.Name == "s_fipsAlgorithmPolicy");
+            var originalFipsValue = CryptoConfig.AllowOnlyFipsAlgorithms;
+
+            try
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, true);
+                    isFld.SetValue(null, true);
+                }
+
+                var runner = new TestRunner(CtrlFactory);
+                var response = await runner.Execute("Authentication", "GetCurrentUser", HttpMethod.Get);
+
+                var obj = JsonConvert.DeserializeObject<UserDetail>(response.Item2);
+                Assert.AreEqual(-1, obj.UserId);
+            }
+            finally
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, false);
+                    isFld.SetValue(null, false);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Formatting;
+using System.Reflection;
+using System.Security.Cryptography;
 using System.Web.Http;
 using Moq;
 using Newtonsoft.Json;
@@ -155,7 +157,7 @@ namespace Umbraco.Tests.Web.Controllers
             var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
-            var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
+            var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
             Assert.AreEqual(0, obj.TotalItems);
         }
 
@@ -190,9 +192,100 @@ namespace Umbraco.Tests.Web.Controllers
             var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
-            var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
+            var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
             Assert.AreEqual(10, obj.TotalItems);
             Assert.AreEqual(10, obj.Items.Count());
         }
+
+        [Test]
+        public async System.Threading.Tasks.Task GetPagedUsers_Fips()
+        {
+            await RunFipsTest("GetPagedUsers", mock =>
+            {
+                var users = MockedUser.CreateMulipleUsers(10);
+                long outVal = 10;
+                mock.Setup(service => service.GetAll(
+                        It.IsAny<long>(), It.IsAny<int>(), out outVal, It.IsAny<string>(), It.IsAny<Direction>(),
+                        It.IsAny<UserState[]>(), It.IsAny<string[]>(), It.IsAny<string[]>(), It.IsAny<IQuery<IUser>>()))
+                    .Returns(() => users);
+            }, response =>
+            {
+                var obj = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(response.Item2);
+                Assert.AreEqual(10, obj.TotalItems);
+                Assert.AreEqual(10, obj.Items.Count());
+            });
+        }
+
+        [Test]
+        public async System.Threading.Tasks.Task GetById_Fips()
+        {
+            const int mockUserId = 1234;
+            var user = MockedUser.CreateUser();
+
+            await RunFipsTest("GetById", mock =>
+            {
+                mock.Setup(service => service.GetUserById(1234))
+                    .Returns((int i) => i == mockUserId ? user : null);
+            }, response =>
+            {
+                var obj = JsonConvert.DeserializeObject<UserDisplay>(response.Item2);
+                Assert.AreEqual(user.Username, obj.Username);
+                Assert.AreEqual(user.Email, obj.Email);
+            }, new { controller = "Users", action = "GetById" }, $"Users/GetById/{mockUserId}");
+        }
+
+
+        private async System.Threading.Tasks.Task RunFipsTest(string action, Action<Mock<IUserService>> userServiceSetup,
+            Action<Tuple<HttpResponseMessage, string>> verification,
+            object routeDefaults = null, string url = null)
+        {
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            {
+                //setup some mocks
+                var userServiceMock = Mock.Get(Current.Services.UserService);
+                userServiceSetup(userServiceMock);
+
+                var usersController = new UsersController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContextAccessor,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+                return usersController;
+            }
+
+            // Testing what happens if the system were configured to only use FIPS-compliant algorithms
+            var typ = typeof(CryptoConfig);
+            var flds = typ.GetFields(BindingFlags.Static | BindingFlags.NonPublic);
+            var haveFld = flds.FirstOrDefault(f => f.Name == "s_haveFipsAlgorithmPolicy");
+            var isFld = flds.FirstOrDefault(f => f.Name == "s_fipsAlgorithmPolicy");
+            var originalFipsValue = CryptoConfig.AllowOnlyFipsAlgorithms;
+
+            try
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, true);
+                    isFld.SetValue(null, true);
+                }
+
+                MockForGetPagedUsers();
+
+                var runner = new TestRunner(CtrlFactory);
+                var response = await runner.Execute("Users", action, HttpMethod.Get, routeDefaults: routeDefaults, url: url);
+                verification(response);
+            }
+            finally
+            {
+                if (!originalFipsValue)
+                {
+                    haveFld.SetValue(null, false);
+                    isFld.SetValue(null, false);
+                }
+            }
+        }
     }
 }

src/Umbraco.Web.UI.Client/gulp/util/processJs.js

@@ -23,7 +23,7 @@ module.exports = function(files, out) {
     // sort files in stream by path or any custom sort comparator
     task = task.pipe(babel())
         .pipe(sort())
-        .pipe(embedTemplates({ basePath: "./src/" }))
+        .pipe(embedTemplates({ basePath: "./src/", minimize:{ loose: true } }))
         .pipe(concat(out))
         .pipe(wrap('(function(){\n%= body %\n})();'))
         .pipe(gulp.dest(config.root + config.targets.js));

src/Umbraco.Web.UI.Client/package-lock.json

@@ -1222,7 +1222,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
       "dev": true
     },
     "asap": {
@@ -1284,7 +1284,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
       "dev": true
     },
     "asynckit": {
@@ -1535,7 +1535,7 @@
     },
     "bl": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
       "requires": {
@@ -2516,7 +2516,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
       "dev": true
     },
     "continuable-cache": {
@@ -4045,7 +4045,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4081,7 +4081,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4476,7 +4476,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
       "dev": true
     },
     "exec-buffer": {
@@ -5309,8 +5309,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5331,14 +5330,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5353,20 +5350,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5483,8 +5477,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5496,7 +5489,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5511,7 +5503,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5519,14 +5510,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5545,7 +5534,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5626,8 +5614,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5639,7 +5626,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5725,8 +5711,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5762,7 +5747,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5782,7 +5766,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5826,14 +5809,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -7575,7 +7556,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7778,7 +7759,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -13616,7 +13597,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
       "dev": true
     },
     "qs": {
@@ -14787,7 +14768,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -15860,7 +15841,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15902,7 +15883,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
       "dev": true
     },
     "unc-path-regex": {
@@ -16505,7 +16486,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",

src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/blocklist.directive.js

@@ -0,0 +1,65 @@
+(function () {
+    "use strict";
+
+    /**
+     * A component used to render a list of blocks
+     */
+    var umbBlockList = {
+        templateUrl: 'views/components/blockeditor/umb-block-list.html',
+        bindings: {
+            blocks: "<",
+            config: "<",
+            scaffolds: "<",
+            onEdit: "&",
+            onRemove: "&",
+            onSettings: "&",           
+            onSort: "&?"
+        },
+        controllerAs: 'vm',
+        controller: umbBlockListController
+    };
+
+    function umbBlockListController() { 
+        var vm = this;
+
+        vm.sortableOptions = {
+            axis: "y",
+            cursor: "move",
+            handle: ".handle",
+            tolerance: 'pointer',
+            update: function (e, ui) {
+                if (vm.onSort) {
+                    vm.onSort({ e: e, ui: ui });
+                }
+            }
+        };
+
+        vm.editContent = function (block) {
+            var scaffold = _.findWhere(vm.scaffolds, {
+                udi: block.udi
+            });
+            var element = angular.copy(scaffold);
+            _.each(element.variants[0].tabs, function (tab) {
+                _.each(tab.properties, function (property) {
+                    if (block.content[property.alias]) {
+                        property.value = block.content[property.alias];
+                    }
+                });
+            });
+
+            vm.onEdit({ element: element, block: block });
+        }
+
+        vm.remove = function (block) {
+            // this should be replaced by a custom dialog (pending some PRs)
+            if (confirm("TODO: Are you sure?")) {
+                vm.onRemove({ block: block });
+            }
+        }
+
+    }
+
+    angular.module('umbraco').component('umbBlockList', umbBlockList);
+
+
+})();

src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js

@@ -509,6 +509,20 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 });
         },
 
+        getScaffoldByUdi: function (parentId, udi) {
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetEmpty",
+                        [{ udi: udi }, { parentId: parentId }])),
+                'Failed to retrieve data for empty content item with udi ' + udi)
+                .then(function (result) {
+                    return $q.when(umbDataFormatter.formatContentGetData(result));
+                });
+        },
+
         getBlueprintScaffold: function (parentId, blueprintId) {
 
             return umbRequestHelper.resourcePromise(

src/Umbraco.Web.UI.Client/src/common/services/editor.service.js

@@ -261,7 +261,7 @@ When building a custom infinite editor view you can use the same components as a
             */
             unbindKeyboardShortcuts();
 
-            // set flag so we know when the editor is open in "infinie mode"
+            // set flag so we know when the editor is open in "infinite mode"
             editor.infiniteMode = true;
 
             editors.push(editor);

src/Umbraco.Web.UI.Client/src/less/components/overlays.less

@@ -132,6 +132,10 @@
     &.umb-overlay--medium {
         width: 480px;
     }
+    
+    &.umb-overlay--large {
+        width:640px;
+    }
 }
 
 .umb-overlay.umb-overlay-target .umb-overlay-header {

src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less

@@ -94,6 +94,7 @@
         font-size: 14px;
         color: @black;
         margin-left: 10px;
+        text-align: left;
     }
 
     small {

src/Umbraco.Web.UI.Client/src/views/components/blockeditor/umb-block-list.html

@@ -0,0 +1,18 @@
+<ul class="unstyled" ui-sortable="vm.sortableOptions" ng-model="vm.blocks">
+    <li ng-repeat="block in vm.blocks">
+        <div class="handle">
+            <div class="umb-node-preview umb-node-preview--sortable">
+                <i ng-if="block.icon" class="umb-node-preview__icon {{ block.icon }}"></i>
+                <div class="umb-node-preview__content">
+                    <div class="umb-node-preview__name" ng-attr-title="{{block.alias}}">TODO: Figure out how to name a block</div>
+                    <div class="umb-node-preview__description" ng-if="block.description">{{ block.description }}</div>
+                </div>
+                <div class="umb-node-preview__actions">
+                    <a class="umb-node-preview__action" title="Edit" href="" ng-click="vm.editContent(block)"><localize key="general_edit">Edit</localize></a>
+                    <a class="umb-node-preview__action" title="Settings" href="" ng-click="vm.onSettings({block: block})"><localize key="general_settings">Settings</localize></a>
+                    <a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" ng-href="" ng-click="vm.remove(block)"><localize key="general_remove">Remove</localize></a>
+                </div>
+            </div>
+        </div>
+    </li>
+</ul>

src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html

@@ -32,7 +32,7 @@
     </div>
 
     <div class="text-center" ng-if="(availableItems | compareArrays:selectedItems:'alias').length === 0">
-        <small><localize key="general_all">Akk</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
+        <small><localize key="general_all">All</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
     </div>
 
 </div>

src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js

@@ -94,6 +94,11 @@ function contentCreateController($scope,
         navigationService.hideDialog(showMenu);
     };
 
+    $scope.editContentType = function() {
+        $location.path("/settings/documenttypes/edit/" + $scope.contentTypeId).search("view", "permissions");
+        close();
+    }
+
     $scope.createBlank = createBlank;
     $scope.createOrSelectBlueprintIfAny = createOrSelectBlueprintIfAny;
     $scope.createFromBlueprint = createFromBlueprint;

src/Umbraco.Web.UI.Client/src/views/content/create.html

@@ -10,7 +10,7 @@
                 <p class="abstract" ng-if="!hasSettingsAccess"><localize key="create_noDocumentTypesWithNoSettingsAccess"/></p>
                 <div ng-if="hasSettingsAccess">
                     <p class="abstract"><localize key="create_noDocumentTypes" /></p>
-                    <button class="btn umb-outline" href="#settings/documentTypes/edit/{{contentTypeId}}?view=permissions" ng-click="close()">
+                    <button class="btn umb-outline" ng-click="editContentType()">
                         <localize key="create_noDocumentTypesEditPermissions"/>
                     </button>
                 </div>

src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html

@@ -11,7 +11,7 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action" ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
-                    <a href="" class="umb-action-link" ng-click="vm.createBlueprint(documentType)" prevent-default>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)" prevent-default>
                         <i class="large icon {{documentType.icon}}"></i>
                         <span class="menu-label">
                             {{documentType.name}}
@@ -19,7 +19,7 @@
                                 {{documentType.description}}
                             </small>
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 

src/Umbraco.Web.UI.Client/src/views/datatypes/create.html

@@ -6,20 +6,20 @@
 
             <ul class="umb-actions umb-actions-child">           
                 <li data-element="action-data-type" class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="createDataType()" umb-auto-focus>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" umb-auto-focus>
                         <i class="large icon icon-autofill"></i>
                         <span class="menu-label">
                             <localize key="create_newDataType">New data type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-folder" class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label">
                             <localize key="create_newFolder">New folder</localize>...
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>

src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html

@@ -7,36 +7,36 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
-                    <a href="" ng-click="createDocType()" class="umb-action-link" umb-auto-focus>
+                    <button href="" ng-click="createDocType()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize key="content_documentType">Document type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-documentTypeWithoutTemplate" class="umb-action">
-                    <a href="" ng-click="createComponent()" class="umb-action-link">
+                    <button href="" ng-click="createComponent()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize ng-if="model.disableTemplates === false" key="create_documentTypeWithoutTemplate"></localize>
                             <localize ng-if="model.disableTemplates === true" key="content_documentType">Document type></localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-documentTypeCollection" class="umb-action">
-                    <a href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link">
+                    <button href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-thumbnail-list"></i>
                         <span class="menu-label">
                             Document Type Collection...
                             <!--                        <localize key="content_documentType_collection">Document Type Collection</localize>-->
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
-                    <a href="" ng-click="showCreateFolder()" class="umb-action-link">
+                    <button href="" ng-click="showCreateFolder()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>

src/Umbraco.Web.UI.Client/src/views/media/create.html

@@ -17,13 +17,13 @@
 			<ul class="umb-actions umb-actions-child">
 
 				<li data-element="action-{{docType.alias}}" class="umb-action" ng-repeat="docType in allowedTypes">
-					<a ng-href="" ng-click="createMediaItem(docType)" class="umb-action-link" prevent-default>
+					<button ng-click="createMediaItem(docType)" class="umb-action-link umb-outline btn-reset" prevent-default>
 						<i class="large icon {{docType.icon}}"></i>
 						<span class="menu-label">
 							{{docType.name}}
 							<small>{{docType.description}}</small>
 						</span>
-					</a>
+					</button>
 				</li>
 				<!--
 					<li class="add">

src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html

@@ -7,19 +7,19 @@
 
             <ul class="umb-actions umb-actions-child">           
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="createMediaType()" umb-auto-focus>
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
                         <i class="large icon icon-item-arrangement"></i>
                         <span class="menu-label">
                             <localize key="general_new">New</localize>
                             <localize key="content_mediatype">Media type</localize>
                         </span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
         </div>

src/Umbraco.Web.UI.Client/src/views/member/create.html

@@ -6,13 +6,13 @@
             <ul class="umb-actions umb-actions-child">
 
                 <li class="umb-action" ng-repeat="docType in allowedTypes">
-                    <a class="umb-action-link" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
+                    <button class="umb-action-link umb-outline btn-reset" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="hideActions()">
                         <i class="large icon {{docType.icon}}"></i>
                         <span class="menu-label">
                             {{docType.name}}
                             <small>{{docType.description}}</small>
                         </span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 

src/Umbraco.Web.UI.Client/src/views/membertypes/create.html

@@ -5,13 +5,13 @@
 
         <ul class="umb-actions umb-actions-child">
             <li class="umb-action">
-                <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                     <i class="large icon icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
-                </a>
+                </button>
             </li>
             <li class="umb-action">
-                <a href="" class="umb-action-link" ng-click="createMemberType()">
+                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
 
                     <i class="large icon icon-item-arrangement"></i>
 
@@ -20,7 +20,7 @@
                         <localize key="content_memberType">Member type</localize>
                     </span>
 
-                </a>
+                </button>
             </li>
         </ul>
     </div>

src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html

@@ -11,28 +11,28 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createFile()" umb-auto-focus>
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" umb-auto-focus>
                             <i class="large icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createFileWithoutMacro()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize>...</span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                             <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
@@ -44,10 +44,10 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <a href="" class="umb-action-link" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
                             <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>

src/Umbraco.Web.UI.Client/src/views/partialviews/create.html

@@ -10,22 +10,22 @@
             <div ng-if="!vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.createPartialView()" umb-auto-focus>
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" umb-auto-focus>
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize>...</span>
-                        </a>
+                        </button>
                     </li>
                     <li class="umb-action">
-                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                             <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>
@@ -34,10 +34,10 @@
             <div ng-if="vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <a href="" class="umb-action-link" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
                             <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-                        </a>
+                        </button>
                     </li>
                 </ul>
             </div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/block.settings.html

@@ -0,0 +1,90 @@
+<div>
+    <umb-editor-view>
+
+        <umb-editor-header name="model.title"
+                           name-locked="true"
+                           hide-alias="true"
+                           hide-icon="true"
+                           hide-description="true">
+        </umb-editor-header>
+
+        <umb-editor-container class="block-form">
+            <umb-box>
+                <umb-box-content>
+
+                    <div class="content-type-editor-dialog edit-property-settings">
+
+                        <div class="umb-control-group" ng-if="!model.property.locked">
+                            <div class="control-group">
+                                <textarea class="editor-label"
+                                          data-element="property-name"
+                                          name="propertyLabel"
+                                          ng-model="model.property.label"
+                                          localize="placeholder"
+                                          placeholder="@placeholders_entername"
+                                          umb-auto-focus
+                                          focus-on-filled="true"
+                                          umb-auto-resize
+                                          required
+                                          ng-keypress="submitOnEnter($event)">
+                                </textarea>
+                            </div>
+
+                            <div class="control-group -no-margin">
+                                <umb-generate-alias enable-lock="true" alias-from="model.property.label" alias="model.property.alias"></umb-generate-alias>
+                            </div>
+                        </div>
+
+                        <div class="editor-wrapper umb-control-group control-group" ng-model="model.property.editor" val-require-component ng-if="!model.property.locked">
+
+                            <a data-element="editor-add" href="" ng-if="!model.property.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="openDataTypePicker(model.property)">
+                                <localize key="shortcuts_addEditor"></localize>
+                            </a>
+
+                            <div class="editor clearfix" ng-if="model.property.editor">
+
+                                <a href="" class="editor-icon-wrapper" ng-click="openDataTypePicker(model.property)">
+                                    <i class="icon {{ model.property.dataTypeIcon }}" ng-class="{'icon-autofill': model.property.dataTypeIcon == null}"></i>
+                                </a>
+
+                                <div class="editor-details">
+                                    <a href="" class="editor-name" ng-click="openDataTypePicker(model.property)" ng-bind="model.property.dataTypeName"></a>
+                                    <a href="" class="editor-editor" ng-click="openDataTypePicker(model.property)" ng-bind="model.property.editor"></a>
+                                </div>
+
+                                <a href class="editor-settings-icon pull-right"
+                                   ng-click="vm.openDataTypeSettings(model.property)"
+                                   hotkey="alt+shift+d"
+                                   ng-if="model.property.editor">
+                                    <i class="icon icon-settings"></i>
+                                </a>
+
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                </umb-box-content>
+            </umb-box>
+        </umb-editor-container>
+
+        <umb-editor-footer>
+            <umb-editor-footer-content-right>
+                <umb-button type="button"
+                            button-style="link"
+                            label-key="general_close"
+                            shortcut="esc"
+                            action="close()">
+                </umb-button>
+                <umb-button type="button"
+                            button-style="success"
+                            label-key="general_submit"
+                            state="saveButtonState"
+                            action="submit(model)">
+                </umb-button>
+            </umb-editor-footer-content-right>
+        </umb-editor-footer>
+
+    </umb-editor-view>
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.controller.js

@@ -0,0 +1,204 @@
+(function () {
+    "use strict";
+
+    function BlockEditorController($scope, contentResource, editorService, iconHelper, clipboardService) {
+        var vm = this;
+
+        vm.scaffolds = [];
+        vm.loading = true;
+        
+        let allowedElements = [];
+
+        // it would be awesome if we could load all scaffolds in one go... however we need to have an eye out for performance,
+        // oddly enough it's been shown to actually be slower to load them all at once instead of one at a time
+        var scaffoldsLoaded = 0;
+
+        function init() {
+            
+            _.each($scope.model.config.blocks, function (config) {
+                contentResource.getScaffoldByUdi(-20, config.elementType).then(function (scaffold) {
+                    if (scaffold.isElement) {
+                        // the scaffold udi is not the same as the element type udi, but we need it to be for comparison
+                        scaffold.udi = config.elementType;
+                        vm.scaffolds.push(scaffold);
+                    }
+                    scaffoldsLoaded++;
+                    initIfAllScaffoldsHaveLoaded();
+                }, function (error) {
+                    scaffoldsLoaded++;
+                    initIfAllScaffoldsHaveLoaded();
+                });
+            });
+        }
+
+        function initIfAllScaffoldsHaveLoaded() {
+            // Initialize when all scaffolds have loaded
+            if ($scope.model.config.blocks.length === scaffoldsLoaded) {
+                vm.scaffolds = _.sortBy(vm.scaffolds, function (scaffold) {
+                    return _.findIndex($scope.model.config.blocks, function (blockConfig) {
+                        return blockConfig.elementType === scaffold.udi;
+                    });
+                });
+
+                _.each($scope.model.value, function (block) {
+                    applyFakeSettings(block);
+                });
+
+                allowedElements = vm.scaffolds.map(x => x.contentTypeAlias);
+
+                vm.loading = false;
+            }
+        }
+
+
+        vm.openNodeTypePicker = function ($event) {
+
+            vm.overlayMenu = {
+                show: false,
+                style: {},
+                filter: vm.scaffolds.length > 12 ? true : false,
+                orderBy: "$index",
+                view: "itempicker",
+                event: $event,
+                clickPasteItem: function (item) {
+                    vm.pasteFromClipboard(item.data);
+                    vm.overlayMenu.show = false;
+                    vm.overlayMenu = null;
+                },
+                submit: function (model) {
+                    if (model && model.selectedItem) {
+                        vm.add(vm.scaffolds.filter(x => x.contentTypeAlias === model.selectedItem.alias)[0]);
+                    }
+                    vm.overlayMenu.show = false;
+                    vm.overlayMenu = null;
+                },
+                close: function () {
+                    vm.overlayMenu.show = false;
+                    vm.overlayMenu = null;
+                }
+            };
+
+            // this could be used for future limiting on node types
+            vm.overlayMenu.availableItems = [];
+            vm.scaffolds.forEach(function (scaffold) {
+                vm.overlayMenu.availableItems.push({
+                    alias: scaffold.contentTypeAlias,
+                    name: scaffold.contentTypeName,
+                    icon: iconHelper.convertFromLegacyIcon(scaffold.icon),
+                    description: scaffold.documentType.description
+                });
+            });
+
+            if (vm.overlayMenu.availableItems.length === 0) {
+                return;
+            }
+
+            //TODO: If we support larger thumbnails of some sort one day, this could be large
+            vm.overlayMenu.size = vm.overlayMenu.availableItems.length > 6 ? "medium" : "small";
+
+            vm.overlayMenu.pasteItems = [];
+            var availableNodesForPaste = clipboardService.retriveDataOfType("elementType", allowedElements);
+            availableNodesForPaste.forEach(function (node) {
+                vm.overlayMenu.pasteItems.push({
+                    alias: node.contentTypeAlias,
+                    name: node.name, //contentTypeName
+                    data: node,
+                    icon: iconHelper.convertFromLegacyIcon(node.icon)
+                });
+            });
+
+            vm.overlayMenu.clickClearPaste = function ($event) {
+                $event.stopPropagation();
+                $event.preventDefault();
+                clipboardService.clearEntriesOfType("elementType", allowedElements);
+                vm.overlayMenu.pasteItems = []; // This dialog is not connected via the clipboardService events, so we need to update manually.
+            };
+
+            if (vm.overlayMenu.availableItems.length === 1 && vm.overlayMenu.pasteItems.length === 0) {
+                // only one scaffold type - no need to display the picker
+                vm.add(vm.scaffolds[0]);
+                return;
+            }
+
+            vm.overlayMenu.show = true;
+        }
+
+        vm.add = function (scaffold) {
+            var element = angular.copy(scaffold);
+            var block = {
+                udi: element.udi,
+                icon: element.icon,
+                description: element.documentType.description, // probably don't want to persist these.
+                content: {},
+                settings: {
+                    view: 'views/propertyeditors/blockeditor/blockeditor.block.html'
+                }
+            };
+            openContent(element, block);
+        }
+
+        vm.editSettings = function (block) {
+            var options = {
+                settings: block.settings,
+                title: "Edit settings",
+                view: "views/propertyeditors/blockeditor/blockeditor.editsettings.html",
+                size: "small",
+                submit: function (model) {
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.open(options);
+        }
+
+        vm.onRemove = function (block) {
+            $scope.model.value.splice($scope.model.value.indexOf(block), 1);
+        }
+
+        vm.onEdit = function (element, block) {
+            openContent(element, block);
+        }
+
+        function openContent(element, block) {
+            var options = {
+                element: element,
+                title: 'Edit block',
+                //fixme: This isn't really a component if its strongly tied to views in the property editor :/
+                view: "views/propertyeditors/blockeditor/blockeditor.editcontent.html",
+                submit: function (model) {
+                    _.each(element.variants[0].tabs, function (tab) {
+                        _.each(tab.properties, function (property) {
+                            block.content[property.alias] = property.value;
+                        });
+                    });
+                    if ($scope.model.value.indexOf(block) < 0) {
+                        $scope.model.value.push(block);
+                        applyFakeSettings(block);
+                    }
+
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.open(options);
+        }
+
+        // TODO: remove this (only for testing)
+        // currently pushes random values for setting a css grid location
+        function applyFakeSettings(block) {
+            block.settings["col"] = 1 + Math.floor(Math.random() * 7);
+            block.settings["row"] = 1 + Math.floor(Math.random() * 7);
+            block.settings["w"] = 1 + Math.floor(Math.random() * 3);
+            block.settings["h"] = 1 + Math.floor(Math.random() * 3);
+        }
+
+        init();
+    }
+
+    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockEditorController", BlockEditorController);
+
+})();

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editcontent.controller.js

@@ -0,0 +1,34 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.PropertyEditors.BlockEditor.EditContentController
+ * @function
+ *
+ * @description
+ * The controller for editing content with the block editor
+ */
+
+function BlockEditorEditContentController($scope) {
+    var vm = this;
+    vm.submit = submit;
+    vm.close = close;
+    vm.content = $scope.model.element.variants[0];
+
+    function init() {
+
+    }
+
+    function submit() {
+        if($scope.model.submit) {
+            $scope.model.submit($scope.model);
+        }
+    }
+
+    function close() {
+        if($scope.model.close) {
+            $scope.model.close();
+        }
+    }
+
+    init();
+}
+angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockEditor.EditContentController", BlockEditorEditContentController);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editcontent.html

@@ -0,0 +1,38 @@
+<div ng-controller="Umbraco.PropertyEditors.BlockEditor.EditContentController as vm">
+    <umb-editor-view>
+        <umb-editor-header name="model.title"
+                           name-locked="true"
+                           hide-alias="true"
+                           hide-icon="true"
+                           hide-description="true">
+        </umb-editor-header>
+
+        <umb-editor-container>
+            <umb-load-indicator ng-if="vm.loading" />
+
+            <div ng-if="!loading">
+                <ng-form name="editBlockForm" val-form-manager>
+                    <umb-tabbed-content content="vm.content" />
+                </ng-form>
+            </div>
+        </umb-editor-container>
+
+        <umb-editor-footer>
+            <umb-editor-footer-content-right>
+                <umb-button type="button"
+                            button-style="link"
+                            label-key="general_cancel"
+                            shortcut="esc"
+                            action="vm.close()">
+                </umb-button>
+                <umb-button type="button"
+                            button-style="success"
+                            label-key="general_ok"
+                            action="vm.submit()">
+                </umb-button>
+            </umb-editor-footer-content-right>
+        </umb-editor-footer>
+
+    </umb-editor-view>
+
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editsettings.controller.js

@@ -0,0 +1,26 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.PropertyEditors.BlockEditor.EditSettingsController
+ * @function
+ *
+ * @description
+ * The controller for editing the configuration of an individual block
+ */
+
+//fixme: Need to figure out the name of a block settings, is it block config or block settings?
+function BlockEditorEditSettingsController($scope) {
+
+    this.submit = () => {
+        if($scope.model.submit) {
+            $scope.model.submit($scope.model);
+        }
+    }
+
+    this.close = () => {
+        if($scope.model.close) {
+            $scope.model.close();
+        }
+    } 
+}
+angular.module("umbraco")
+    .controller("Umbraco.PropertyEditors.BlockEditor.EditSettingsController", ['$scope', BlockEditorEditSettingsController]);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editsettings.html

@@ -0,0 +1,44 @@
+<div ng-controller="Umbraco.PropertyEditors.BlockEditor.EditSettingsController as vm">
+    <umb-editor-view>
+        <umb-editor-header name="model.title"
+                           name-locked="true"
+                           hide-alias="true"
+                           hide-icon="true"
+                           hide-description="true">
+        </umb-editor-header>
+
+        <umb-editor-container>
+            <umb-load-indicator ng-if="vm.loading" />
+
+            <div ng-if="!loading">
+                <umb-box>
+                    <umb-box-content>
+                        <ng-form name="editBlockForm" class="form-horizontal" val-form-manager>                            
+                            <umb-control-group label="{{key}}" description="" ng-repeat="(key, value) in model.settings">
+                                <input type="text" ng-model="model.settings[key]" ng-model-options="{ debounce: 5000 }"/>
+                            </umb-control-group>
+                        </ng-form>
+                    </umb-box-content>
+                </umb-box>
+            </div>
+        </umb-editor-container>
+
+        <umb-editor-footer>
+            <umb-editor-footer-content-right>
+                <umb-button type="button"
+                            button-style="link"
+                            label-key="general_cancel"
+                            shortcut="esc"
+                            action="vm.close()">
+                </umb-button>
+                <umb-button type="button"
+                            button-style="success"
+                            label-key="general_ok"
+                            action="vm.submit()">
+                </umb-button>
+            </umb-editor-footer-content-right>
+        </umb-editor-footer>
+
+    </umb-editor-view>
+
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.html

@@ -0,0 +1,31 @@
+<div ng-controller="Umbraco.PropertyEditors.BlockEditorController as vm">
+    <div style="position:relative" ng-if="vm.loading">
+        <umb-load-indicator />
+    </div>
+
+    <div ng-if="!vm.loading">
+        <umb-block-list blocks="model.value"
+                        config="model.config.blocks"
+                        scaffolds="vm.scaffolds"
+                        on-edit="vm.onEdit(element, block)"
+                        on-remove="vm.onRemove(element, block)"
+                        on-settings="vm.editSettings(block)">
+        </umb-block-list>
+    </div>
+
+    <div ng-if="!vm.loading" class="umb-nested-content__footer-bar">
+        <a href class="umb-nested-content__add-content" ng-class="{ '--disabled': !vm.scaffolds.length }" ng-click="vm.openNodeTypePicker($event)" prevent-default>
+            <localize key="grid_addElement" ng-if="vm.scaffolds.length > 1"></localize>
+            <span ng-if="vm.scaffolds.length === 1">
+                <localize key="general_add"></localize> {{ vm.scaffolds[0].contentTypeName }}
+            </span>
+        </a>
+    </div>
+
+    <umb-overlay ng-if="vm.overlayMenu.show"
+                 position="target"
+                 size="vm.overlayMenu.size"
+                 view="vm.overlayMenu.view"
+                 model="vm.overlayMenu">
+    </umb-overlay>
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.settings.controller.js

@@ -0,0 +1,96 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.PropertyEditors.BlockEditor.SettingsController
+ * @function
+ *
+ * @description
+ * The controller for the block editor's data type configuration
+ */
+
+//fixme: Rename this! it shouldn't be called Settings, it should be called Configuration because that is what we call pre-values in v8 (data type config)
+angular.module("umbraco")
+    .controller("Umbraco.PropertyEditors.BlockEditor.SettingsController", [
+        "$scope",
+        "contentTypeResource",
+        "editorService",
+        function ($scope, contentTypeResource, editorService) {
+
+            $scope.blocks = [];
+            $scope.elementTypes = [];
+
+            if ($scope.model.value) {
+                $scope.blocks = $scope.model.value;
+            } else {
+                $scope.model.value = [];
+            }
+
+            contentTypeResource.getAll()
+                .then(function (contentType) {
+                    $scope.elementTypes.push(contentType);
+                });
+
+            $scope.$on("formSubmitting", function () {
+                $scope.model.value = $scope.blocks;
+            });
+
+            //fixme: This shouldn't be a method, using methods to return values in angular is a performance issue
+            $scope.getBlockName = function(udi) {
+                return 'TODO: Get block name from somewhere...';
+            }
+            
+            $scope.addBlock = function () {
+
+                var block = {};
+
+                var pickerOptions = {
+                    title: "Pick an element type",
+                    view: "views/common/infiniteeditors/treepicker/treepicker.html",
+                    size: "small",
+                    multiPicker: false,
+                    section: "settings",
+                    treeAlias: "documentTypes",
+                    entityType: "documentType",
+                    submit: function (model) {
+                        _.each(model.selection, function (elementType) {
+                            block.elementType = elementType.udi;
+                            block.settings = {
+                                view: 'views/propertyeditors/blockeditor/blockeditor.block.html'
+                            }
+                            $scope.model.value.push(block);
+                        });
+
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+
+                editorService.open(pickerOptions);
+            }
+
+            $scope.removeBlock = function (index) {
+                $scope.model.value.splice(index, 1);
+            };
+
+            //fixme: This currently doesn't work or do anything
+            $scope.editSettings = function (block) {
+
+                var pickerOptions = {
+                    title: "Block settings",
+                    //fixme: This file needs to be renamed since it's inconsistent with other blockeditor file names, probably blockeditor.blocksettings.html
+                    view: "views/propertyeditors/blockeditor/block.settings.html",
+                    size: "small",                    
+                    submit: function (model) {
+                        block.settings = model;
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+
+                editorService.open(pickerOptions);
+            }
+        }
+    ]);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.settings.html

@@ -0,0 +1,20 @@
+<div ng-controller="Umbraco.PropertyEditors.BlockEditor.SettingsController">
+
+    <umb-node-preview ng-repeat="block in blocks"
+                      name="getBlockName(block)"
+                      alias="block.elementType"
+                      icon="icon-folder"
+                      allow-edit="true"
+                      on-edit="editSettings(block)"
+                      allow-remove="true"
+                      on-remove="removeBlock($index)">
+    </umb-node-preview>
+
+    <a href="" class="umb-node-preview-add" ng-click="addBlock()">
+        <localize key="general_add">Add</localize>
+    </a>
+
+    <hr />
+    <pre>{{model.value | json}}</pre>
+
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.controller.js

@@ -0,0 +1,9 @@
+function BlockEditorSimpleListController($scope) {
+    $scope.sortableOptions = {
+        axis: "y", 
+        cursor: "move",
+        handle: ".handle",
+        tolerance: 'pointer'
+    };
+}
+angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockEditor.SimpleListController", ['$scope', BlockEditorSimpleListController]);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js

@@ -307,22 +307,22 @@ angular.module("umbraco")
             $scope.openEditorOverlay = function (event, area, index, key) {
                 var title = "";
                 localizationService.localize("grid_insertControl").then(function (value) {
-                    title = value;
-                    $scope.editorOverlay = {
-                        view: "itempicker", 
-                        filter: area.$allowedEditors.length > 15,
-                        title: title,
-                        availableItems: area.$allowedEditors,
-                        event: event,
-                        show: true,
-                        submit: function (model) {
-                            if (model.selectedItem) {
-                                $scope.addControl(model.selectedItem, area, index);
-                                $scope.editorOverlay.show = false;
-                                $scope.editorOverlay = null;
+                        title = value;
+                        $scope.editorOverlay = {
+                            view: "itempicker", 
+                            filter: area.$allowedEditors.length > 15,
+                            title: title,
+                            availableItems: area.$allowedEditors,
+                            event: event,
+                            show: true,
+                            submit: function (model) {
+                                if (model.selectedItem) {
+                                    $scope.addControl(model.selectedItem, area, index);
+                                    $scope.editorOverlay.show = false;
+                                    $scope.editorOverlay = null;
+                                }
                             }
-                        }
-                    };
+                        };
                 });
             };
 

src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js

@@ -18,7 +18,7 @@
         $scope.remove = function (index) {
             $scope.model.value.splice(index, 1);
         }
-
+  
         $scope.sortableOptions = {
             axis: "y",
             cursor: "move",
@@ -184,7 +184,8 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 $scope.overlayMenu.availableItems.push({
                     alias: scaffold.contentTypeAlias,
                     name: scaffold.contentTypeName,
-                    icon: iconHelper.convertFromLegacyIcon(scaffold.icon)
+                    icon: iconHelper.convertFromLegacyIcon(scaffold.icon),
+                    description: scaffold.documentType.description
                 });
             });
 
@@ -192,7 +193,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 return;
             }
             
-            $scope.overlayMenu.size = $scope.overlayMenu.availableItems.length > 6 ? "medium" : "small";
+                $scope.overlayMenu.size = $scope.overlayMenu.availableItems.length > 6 ? "medium" : "small";            
             
             $scope.overlayMenu.pasteItems = [];
             var availableNodesForPaste = clipboardService.retriveDataOfType("elementType", contentTypeAliases);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html

@@ -40,7 +40,8 @@
 
         <div class="umb-nested-content__footer-bar" ng-hide="hasContentTypes === false || nodes.length >= maxItems">
             <a href class="umb-nested-content__add-content" ng-class="{ '--disabled': !scaffolds.length }" ng-click="openNodeTypePicker($event)" prevent-default>
-                <localize key="grid_addElement"></localize>
+                <localize key="grid_addElement" ng-if="scaffolds.length > 1"></localize>
+                <span ng-if="scaffolds.length === 1"><localize key="general_add"></localize> {{ scaffolds[0].contentTypeName }}</span>
             </a>
         </div>
 

src/Umbraco.Web.UI.Client/src/views/scripts/create.html

@@ -7,16 +7,16 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 

src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html

@@ -7,22 +7,22 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" ng-click="vm.createRichtextStyle()" class="umb-action-link">
+                    <button href="" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-script"></i>
                         <span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
-                    </a>
+                    </button>
                 </li>
                 <li class="umb-action">
-                    <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
                         <i class="large icon icon-folder"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
-                    </a>
+                    </button>
                 </li>
             </ul>
 

src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html

@@ -90,6 +90,7 @@
                                       ng-repeat="node in model.user.startContentIds"
                                       icon="node.icon"
                                       name="node.name"
+                                      allow-remove="true"
                                       on-remove="model.removeSelectedItem($index, model.user.startContentIds)">
                     </umb-node-preview>
 
@@ -114,6 +115,7 @@
                                       ng-repeat="node in model.user.startMediaIds"
                                       icon="node.icon"
                                       name="node.name"
+                                      allow-remove="true"
                                       on-remove="model.removeSelectedItem($index, model.user.startMediaIds)">
                     </umb-node-preview>
 

src/Umbraco.Web.UI/config/umbracoSettings.config

@@ -60,7 +60,7 @@
 
   <security>
     <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>false</keepUserLoggedIn>
+    <keepUserLoggedIn>true</keepUserLoggedIn>
     <!-- by default this is true and if not specified in config will be true. set to false to always show a separate username field in the back office user editor -->
     <usernameIsEmail>true</usernameIsEmail>
     <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->

src/Umbraco.Web/Editors/ContentController.cs

@@ -354,12 +354,34 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
+            return EmptyContent(parentId, contentType);
+        }
+
+        /// <summary>
+        /// Gets an empty content item for the
+        /// </summary>
+        /// <param name="udi"></param>
+        /// <param name="parentId"></param>
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmpty(GuidUdi udi, int parentId)
+        {
+            var contentType = Services.ContentTypeService.Get(udi.Guid);
+            if(contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            return EmptyContent(parentId, contentType);
+        }
+
+        private ContentItemDisplay EmptyContent(int parentId, IContentType contentType)
+        {
             var emptyContent = Services.ContentService.Create("", parentId, contentType.Alias, Security.GetUserId().ResultOr(0));
             var mapped = MapToDisplay(emptyContent);
             // translate the content type name if applicable
             mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
             // if your user type doesn't have access to the Settings section it would not get this property mapped
-            if (mapped.DocumentType != null)
+            if(mapped.DocumentType != null)
                 mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
 
             //remove the listview app if it exists

src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs

@@ -301,7 +301,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache);
             target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString();
             target.Email = source.Email;
-            target.EmailHash = source.Email.ToLowerInvariant().Trim().ToMd5();
+            target.EmailHash = source.Email.ToLowerInvariant().Trim().GenerateHash();
             target.Id = source.Id;
             target.Key = source.Key;
             target.LastLoginDate = source.LastLoginDate == default ? null : (DateTime?) source.LastLoginDate;

src/Umbraco.Web/PropertyEditors/BlockEditorConfiguration.cs

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    public class BlockEditorConfiguration
+    {
+        [ConfigurationField("blocks", "Blocks", "views/propertyeditors/blockeditor/blockeditor.settings.html")]
+        public Block[] Blocks { get; set; }
+
+        [ConfigurationField("view", "View", "textstring", Description = "The path to a custom view for rendering the editor")]
+        public string View { get; set; }
+
+        public class Block
+        {
+            [JsonProperty("elementType")]
+            public Udi ElementType { get; set; }
+
+            [JsonProperty("settings")]
+            public BlockSetting Settings { get; set; }
+        }
+
+        public class BlockSetting
+        {
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("alias")]
+            public string Alias { get; set; }
+
+            [JsonProperty("dataType")]
+            public Udi DataType { get; set; }
+        }
+    }
+}

src/Umbraco.Web/PropertyEditors/BlockEditorConfigurationEditor.cs

@@ -0,0 +1,9 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    public class BlockEditorConfigurationEditor : ConfigurationEditor<BlockEditorConfiguration>
+    {
+
+    }
+}

src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs

@@ -0,0 +1,18 @@
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    [DataEditor(Constants.PropertyEditors.Aliases.BlockEditor, EditorType.PropertyValue , "Block Editor", "blockeditor", ValueType = ValueTypes.Json, Group="rich content", Icon="icon-application-window-alt")]
+    public class BlockEditorPropertyEditor : DataEditor
+    {
+        public BlockEditorPropertyEditor(ILogger logger)
+            : base(logger)
+        { }
+
+        protected override IConfigurationEditor CreateConfigurationEditor() => new BlockEditorConfigurationEditor();
+
+        protected override IDataValueEditor CreateValueEditor() => base.CreateValueEditor();
+    }
+}

src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs

@@ -8,7 +8,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// A property editor to allow multiple checkbox selection of pre-defined items.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.CheckBoxList, "Checkbox list", "checkboxlist", Icon="icon-bulleted-list", Group="lists")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.CheckBoxList,
+        "Checkbox list",
+        "checkboxlist",
+        Icon = "icon-bulleted-list",
+        Group = Constants.PropertyEditors.Groups.Lists)]
     public class CheckBoxListPropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;

src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs

@@ -4,7 +4,12 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.ColorPicker, "Color Picker", "colorpicker", Icon="icon-colorpicker", Group="Pickers")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ColorPicker,
+        "Color Picker",
+        "colorpicker",
+        Icon = "icon-colorpicker",
+        Group = Constants.PropertyEditors.Groups.Pickers)]
     public class ColorPickerPropertyEditor : DataEditor
     {
         public ColorPickerPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs

@@ -8,7 +8,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Content property editor that stores UDI
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.ContentPicker, EditorType.PropertyValue | EditorType.MacroParameter, "Content Picker", "contentpicker", ValueType = ValueTypes.String, Group = "Pickers")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ContentPicker,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Content Picker",
+        "contentpicker",
+        ValueType = ValueTypes.String,
+        Group = Constants.PropertyEditors.Groups.Pickers)]
     public class ContentPickerPropertyEditor : DataEditor
     {
         public ContentPickerPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs

@@ -7,7 +7,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a date and time property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.DateTime, "Date/Time", "datepicker", ValueType = ValueTypes.DateTime, Icon="icon-time")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.DateTime,
+        "Date/Time",
+        "datepicker",
+        ValueType = ValueTypes.DateTime,
+        Icon = "icon-time")]
     public class DateTimePropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs

@@ -8,7 +8,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a decimal property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Decimal, EditorType.PropertyValue | EditorType.MacroParameter, "Decimal", "decimal", ValueType = ValueTypes.Decimal)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Decimal,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Decimal",
+        "decimal",
+        ValueType = ValueTypes.Decimal)]
     public class DecimalPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs

@@ -5,7 +5,12 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.DropDownListFlexible, "Dropdown", "dropdownFlexible", Group = "lists", Icon = "icon-indent")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.DropDownListFlexible,
+        "Dropdown",
+        "dropdownFlexible",
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-indent")]
     public class DropDownFlexiblePropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;

src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs

@@ -5,7 +5,12 @@ using Umbraco.Core.PropertyEditors.Validators;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.EmailAddress, EditorType.PropertyValue | EditorType.MacroParameter, "Email address", "email", Icon="icon-message")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.EmailAddress,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Email address",
+        "email",
+        Icon = "icon-message")]
     public class EmailAddressPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs

@@ -12,7 +12,12 @@ using Umbraco.Web.Media;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.UploadField, "File upload", "fileupload", Icon = "icon-download-alt", Group = "media")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.UploadField,
+        "File upload",
+        "fileupload",
+        Group = Constants.PropertyEditors.Groups.Media,
+        Icon = "icon-download-alt")]
     public class FileUploadPropertyEditor : DataEditor
     {
         private readonly IMediaFileSystem _mediaFileSystem;

src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs

@@ -12,7 +12,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a grid property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Grid, "Grid layout", "grid", HideLabel = true, ValueType = ValueTypes.Json, Group="rich content", Icon="icon-layout")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Grid,
+        "Grid layout",
+        "grid",
+        HideLabel = true,
+        ValueType = ValueTypes.Json,
+        Icon = "icon-layout",
+        Group = Constants.PropertyEditors.Groups.RichContent)]
     public class GridPropertyEditor : DataEditor
     {
         public GridPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs

@@ -19,7 +19,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents an image cropper property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.ImageCropper, "Image Cropper", "imagecropper", ValueType = ValueTypes.Json, HideLabel = false, Group="media", Icon="icon-crop")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ImageCropper,
+        "Image Cropper",
+        "imagecropper",
+        ValueType = ValueTypes.Json,
+        HideLabel = false,
+        Group = Constants.PropertyEditors.Groups.Media,
+        Icon = "icon-crop")]
     public class ImageCropperPropertyEditor : DataEditor
     {
         private readonly IMediaFileSystem _mediaFileSystem;

src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs

@@ -8,7 +8,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents an integer property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Integer, EditorType.PropertyValue | EditorType.MacroParameter, "Numeric", "integer", ValueType = ValueTypes.Integer)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Integer,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Numeric",
+        "integer",
+        ValueType = ValueTypes.Integer)]
     public class IntegerPropertyEditor : DataEditor
     {
         public IntegerPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs

@@ -8,7 +8,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a list-view editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.ListView, "List view", "listview", HideLabel = true, Group = "lists", Icon = Constants.Icons.ListView)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ListView,
+        "List view",
+        "listview",
+        HideLabel = true,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = Constants.Icons.ListView)]
     public class ListViewPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs

@@ -5,7 +5,14 @@ using Umbraco.Core.PropertyEditors;
 namespace Umbraco.Web.PropertyEditors
 {
     // TODO: MacroContainerPropertyEditor is deprecated, but what's the alternative?
-    [DataEditor(Constants.PropertyEditors.Aliases.MacroContainer, "(Obsolete) Macro Picker", "macrocontainer", ValueType = ValueTypes.Text, Group = "rich content", Icon = Constants.Icons.Macro, IsDeprecated = true)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MacroContainer,
+        "(Obsolete) Macro Picker",
+        "macrocontainer",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.RichContent,
+        Icon = Constants.Icons.Macro,
+        IsDeprecated = true)]
     public class MacroContainerPropertyEditor : DataEditor
     {
         public MacroContainerPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs

@@ -7,7 +7,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a markdown editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MarkdownEditor, "Markdown editor", "markdowneditor", ValueType = ValueTypes.Text, Icon="icon-code", Group="rich content")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MarkdownEditor,
+        "Markdown editor",
+        "markdowneditor",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.RichContent,
+        Icon = "icon-code")]
     public class MarkdownPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs

@@ -7,8 +7,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a media picker property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MediaPicker, EditorType.PropertyValue | EditorType.MacroParameter,
-        "Media Picker", "mediapicker", ValueType = ValueTypes.Text, Group = "media", Icon = Constants.Icons.MediaImage)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MediaPicker,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Media Picker",
+        "mediapicker",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.Media,
+        Icon = Constants.Icons.MediaImage)]
     public class MediaPickerPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs

@@ -4,7 +4,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MemberGroupPicker, "Member Group Picker", "membergrouppicker", ValueType = ValueTypes.Text, Group = "People", Icon = Constants.Icons.MemberGroup)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MemberGroupPicker,
+        "Member Group Picker",
+        "membergrouppicker",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.People,
+        Icon = Constants.Icons.MemberGroup)]
     public class MemberGroupPickerPropertyEditor : DataEditor
     {
          public MemberGroupPickerPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs

@@ -4,7 +4,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MemberPicker, "Member Picker", "memberpicker", ValueType = ValueTypes.String, Group = "People", Icon = Constants.Icons.Member)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MemberPicker,
+        "Member Picker",
+        "memberpicker",
+        ValueType = ValueTypes.String,
+        Group = Constants.PropertyEditors.Groups.People,
+        Icon = Constants.Icons.Member)]
     public class MemberPickerPropertyEditor : DataEditor
     {
         public MemberPickerPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs

@@ -4,7 +4,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, "Multinode Treepicker", "contentpicker", ValueType = ValueTypes.Text, Group = "pickers", Icon = "icon-page-add")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultiNodeTreePicker,
+        "Multinode Treepicker",
+        "contentpicker",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.Pickers,
+        Icon = "icon-page-add")]
     public class MultiNodeTreePickerPropertyEditor : DataEditor
     {
         public MultiNodeTreePickerPropertyEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs

@@ -7,7 +7,14 @@ using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MultiUrlPicker, EditorType.PropertyValue, "Multi Url Picker", "multiurlpicker", ValueType = ValueTypes.Json, Group = "pickers", Icon = "icon-link")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultiUrlPicker,
+        EditorType.PropertyValue,
+        "Multi Url Picker",
+        "multiurlpicker",
+        ValueType = ValueTypes.Json,
+        Group = Constants.PropertyEditors.Groups.Pickers,
+        Icon = "icon-link")]
     public class MultiUrlPickerPropertyEditor : DataEditor
     {
         private readonly IEntityService _entityService;

src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs

@@ -13,7 +13,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a multiple text string property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MultipleTextstring, "Repeatable textstrings", "multipletextbox", ValueType = ValueTypes.Text, Icon="icon-ordered-list", Group="lists")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultipleTextstring,
+        "Repeatable textstrings",
+        "multipletextbox",
+        ValueType = ValueTypes.Text,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-ordered-list")]
     public class MultipleTextStringPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs

@@ -18,7 +18,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a nested content property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.NestedContent, "Nested Content", "nestedcontent", ValueType = "JSON", Group = "lists", Icon = "icon-thumbnail-list")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.NestedContent,
+        "Nested Content",
+        "nestedcontent",
+        ValueType = ValueTypes.Json,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-thumbnail-list")]
     public class NestedContentPropertyEditor : DataEditor
     {
         private readonly Lazy<PropertyEditorCollection> _propertyEditors;

src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs

@@ -6,7 +6,11 @@ namespace Umbraco.Web.PropertyEditors.ParameterEditors
     /// <summary>
     /// Represents a content type parameter editor.
     /// </summary>
-    [DataEditor("contentType", EditorType.MacroParameter, "Content Type Picker", "entitypicker")]
+    [DataEditor(
+        "contentType",
+        EditorType.MacroParameter,
+        "Content Type Picker",
+        "entitypicker")]
     public class ContentTypeParameterEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs

@@ -7,7 +7,11 @@ namespace Umbraco.Web.PropertyEditors.ParameterEditors
     /// <summary>
     /// Represents a parameter editor of some sort.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, EditorType.MacroParameter, "Multiple Content Picker", "contentpicker")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.MultiNodeTreePicker,
+        EditorType.MacroParameter,
+        "Multiple Content Picker",
+        "contentpicker")]
     public class MultipleContentPickerParameterEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs

@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("contentTypeMultiple", EditorType.MacroParameter, "Multiple Content Type Picker", "entitypicker")]
+    [DataEditor(
+        "contentTypeMultiple",
+        EditorType.MacroParameter,
+        "Multiple Content Type Picker",
+        "entitypicker")]
     public class MultipleContentTypeParameterEditor : DataEditor
     {
         public MultipleContentTypeParameterEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs

@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("tabPickerMultiple", EditorType.MacroParameter, "Multiple Tab Picker", "entitypicker")]
+    [DataEditor(
+        "tabPickerMultiple",
+        EditorType.MacroParameter,
+        "Multiple Tab Picker",
+        "entitypicker")]
     public class MultiplePropertyGroupParameterEditor : DataEditor
     {
         public MultiplePropertyGroupParameterEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs

@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("propertyTypePickerMultiple", EditorType.MacroParameter, "Multiple Property Type Picker", "entitypicker")]
+    [DataEditor(
+        "propertyTypePickerMultiple",
+        EditorType.MacroParameter,
+        "Multiple Property Type Picker",
+        "entitypicker")]
     public class MultiplePropertyTypeParameterEditor : DataEditor
     {
         public MultiplePropertyTypeParameterEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs

@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("tabPicker", EditorType.MacroParameter, "Tab Picker", "entitypicker")]
+    [DataEditor(
+        "tabPicker",
+        EditorType.MacroParameter,
+        "Tab Picker",
+        "entitypicker")]
     public class PropertyGroupParameterEditor : DataEditor
     {
         public PropertyGroupParameterEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs

@@ -3,7 +3,11 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [DataEditor("propertyTypePicker", EditorType.MacroParameter, "Property Type Picker", "entitypicker")]
+    [DataEditor(
+        "propertyTypePicker",
+        EditorType.MacroParameter,
+        "Property Type Picker",
+        "entitypicker")]
     public class PropertyTypeParameterEditor : DataEditor
     {
         public PropertyTypeParameterEditor(ILogger logger)

src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs

@@ -8,7 +8,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// A property editor to allow the individual selection of pre-defined items.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.RadioButtonList, "Radio button list", "radiobuttons", ValueType = ValueTypes.String, Group="lists", Icon="icon-target")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.RadioButtonList,
+        "Radio button list",
+        "radiobuttons",
+        ValueType = ValueTypes.String,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-target")]
     public class RadioButtonsPropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;

src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs

@@ -15,7 +15,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a rich text property editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.TinyMce, "Rich Text Editor", "rte", ValueType = ValueTypes.Text,  HideLabel = false, Group="Rich Content", Icon="icon-browser-window")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.TinyMce,
+        "Rich Text Editor",
+        "rte",
+        ValueType = ValueTypes.Text,
+        HideLabel = false,
+        Group = Constants.PropertyEditors.Groups.RichContent,
+        Icon = "icon-browser-window")]
     public class RichTextPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs

@@ -7,7 +7,11 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a slider editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Slider, "Slider", "slider", Icon = "icon-navigation-horizontal")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Slider,
+        "Slider",
+        "slider",
+        Icon = "icon-navigation-horizontal")]
     public class SliderPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs

@@ -15,7 +15,11 @@ namespace Umbraco.Web.PropertyEditors
     /// Represents a tags property editor.
     /// </summary>
     [TagsPropertyEditor]
-    [DataEditor(Constants.PropertyEditors.Aliases.Tags, "Tags", "tags", Icon="icon-tags")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Tags,
+        "Tags",
+        "tags",
+        Icon = "icon-tags")]
     public class TagsPropertyEditor : DataEditor
     {
         private readonly ManifestValueValidatorCollection _validators;

src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs

@@ -7,7 +7,13 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a textarea property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.TextArea, EditorType.PropertyValue | EditorType.MacroParameter, "Textarea", "textarea", ValueType = ValueTypes.Text, Icon="icon-application-window-alt")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.TextArea,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Textarea",
+        "textarea",
+        ValueType = ValueTypes.Text,
+        Icon = "icon-application-window-alt")]
     public class TextAreaPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs

@@ -7,7 +7,12 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a textbox property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.TextBox, EditorType.PropertyValue | EditorType.MacroParameter, "Textbox", "textbox", Group = "Common")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.TextBox,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Textbox",
+        "textbox",
+        Group = Constants.PropertyEditors.Groups.Common)]
     public class TextboxPropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs

@@ -7,7 +7,14 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents a checkbox property and parameter editor.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.Boolean, EditorType.PropertyValue | EditorType.MacroParameter, "Checkbox", "boolean", ValueType = ValueTypes.Integer, Group = "Common", Icon="icon-checkbox")]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.Boolean,
+        EditorType.PropertyValue | EditorType.MacroParameter,
+        "Checkbox",
+        "boolean",
+        ValueType = ValueTypes.Integer,
+        Group = Constants.PropertyEditors.Groups.Common,
+        Icon = "icon-checkbox")]
     public class TrueFalsePropertyEditor : DataEditor
     {
         /// <summary>

src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs

@@ -6,7 +6,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.UserPicker, "User picker", "entitypicker", ValueType = ValueTypes.Integer, Group = "People", Icon = Constants.Icons.User)]
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.UserPicker,
+        "User picker",
+        "entitypicker",
+        ValueType = ValueTypes.Integer,
+        Group = Constants.PropertyEditors.Groups.People,
+        Icon = Constants.Icons.User)]
     public class UserPickerPropertyEditor : DataEditor
     {
         public UserPickerPropertyEditor(ILogger logger)

src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs

@@ -45,6 +45,10 @@ namespace Umbraco.Web.Routing
             if (string.IsNullOrEmpty(path))
                 return null;
 
+            // the stored path is absolute so we just return it as is
+            if(Uri.IsWellFormedUriString(path, UriKind.Absolute))
+                return new Uri(path);
+
             Uri uri;
 
             if (current == null)

src/Umbraco.Web/Umbraco.Web.csproj

@@ -222,6 +222,9 @@
     <Compile Include="Mvc\HttpUmbracoFormRouteStringException.cs" />
     <Compile Include="Mvc\ModelBindingExceptionFilter.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
+    <Compile Include="PropertyEditors\BlockEditorConfiguration.cs" />
+    <Compile Include="PropertyEditors\BlockEditorConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\BlockEditorPropertyEditor.cs" />
     <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />