Updates examine to latest version

.github/CONTRIBUTING_DETAILED.md

@@ -103,9 +103,11 @@ There's two big areas that you should know about:
   1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
   You may need to run the following commands to set up gulp properly:
   ```
-  npm cache clean --force
+  npm cache clean
+  npm install -g gulp
+  npm install -g gulp-cli
   npm install
-  npm run build
+  gulp build
   ```
   2. "The rest" is a C# based codebase, with some traces of our WebForms past but mostly ASP.NET MVC based these days. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 
 - [ ] I have added steps to test this contribution in the description below
 
-If there's an existing issue for this PR then this fixes <!-- link to the issue here! -->
+If there's an existing issue for this PR then this fixes: <!-- link to the issue here! -->
 
 ### Description
 <!-- A description of the changes proposed in the pull-request and how to test these changes -->

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="3.4.4">
         <id>UmbracoCms.Core</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="3.4.4">
         <id>UmbracoCms.Web</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
@@ -27,7 +27,7 @@
                 <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
                 <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
                 <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.0,1.999999)" />
+                <dependency id="Examine" version="[1.0.1,1.999999)" />
                 <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
                 <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
                 <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />

build/NuSpecs/UmbracoCms.nuspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="3.4.4">
         <id>UmbracoCms</id>
         <version>8.0.0</version>
         <title>Umbraco Cms</title>
@@ -25,7 +25,7 @@
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
                 <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.4]" />
+                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.1]" />
                 <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
                 <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
                 <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />

build/NuSpecs/tools/install.core.ps1

@@ -0,0 +1,93 @@
+param($installPath, $toolsPath, $package, $project)
+
+Write-Host "installPath:" "${installPath}"
+Write-Host "toolsPath:" "${toolsPath}"
+
+Write-Host " "
+
+if ($project) {
+	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
+
+	# Create paths and list them
+	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
+	Write-Host "projectPath:" "${projectPath}"		
+	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
+	Write-Host "backupPath:" "${backupPath}"		
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	Write-Host "copyLogsPath:" "${copyLogsPath}"			
+	$umbracoBinFolder = Join-Path $projectPath "bin"
+	Write-Host "umbracoBinFolder:" "${umbracoBinFolder}"		
+
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
+	# After backing up, remove all umbraco dlls from bin folder in case dll files are included in the VS project
+	# See: http://issues.umbraco.org/issue/U4-4930
+	
+	if(Test-Path $umbracoBinFolder) {
+		$umbracoBinBackupPath = Join-Path $backupPath "bin"
+		
+		New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
+		
+		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
+		
+		# Delete files Umbraco ships with
+		if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Web.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Core.dll) { Remove-Item $umbracoBinFolder\Umbraco.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Examine.dll) { Remove-Item $umbracoBinFolder\Umbraco.Examine.dll -Force -Confirm:$false }
+		
+		# Delete files Umbraco depends upon
+		$amd64Folder = Join-Path $umbracoBinFolder "amd64"
+		if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false }
+		$x86Folder = Join-Path $umbracoBinFolder "x86"
+		if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\AutoMapper.dll) { Remove-Item $umbracoBinFolder\AutoMapper.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\AutoMapper.Net4.dll) { Remove-Item $umbracoBinFolder\AutoMapper.Net4.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.Mvc.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\CookComputing.XmlRpcV2.dll) { Remove-Item $umbracoBinFolder\CookComputing.XmlRpcV2.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Examine.dll) { Remove-Item $umbracoBinFolder\Examine.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\HtmlAgilityPack.dll) { Remove-Item $umbracoBinFolder\HtmlAgilityPack.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ICSharpCode.SharpZipLib.dll) { Remove-Item $umbracoBinFolder\ICSharpCode.SharpZipLib.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll) { Remove-Item $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Owin.dll) { Remove-Item $umbracoBinFolder\Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Semver.dll) { Remove-Item $umbracoBinFolder\Semver.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Collections.Immutable.dll) { Remove-Item $umbracoBinFolder\System.Collections.Immutable.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Reflection.Metadata.dll) { Remove-Item $umbracoBinFolder\System.Reflection.Metadata.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Extensions.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Extensions.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Primitives.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Primitives.dll -Force -Confirm:$false }	
+		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.Razor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Deployment.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Deployment.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }		
+	}
+}

build/NuSpecs/tools/install.ps1

@@ -11,15 +11,37 @@ if ($project) {
 	# Create paths and list them
 	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
 	Write-Host "projectPath:" "${projectPath}"
+	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
+	Write-Host "backupPath:" "${backupPath}"
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	Write-Host "copyLogsPath:" "${copyLogsPath}"	
 	$webConfigSource = Join-Path $projectPath "Web.config"
 	Write-Host "webConfigSource:" "${webConfigSource}"
 	$configFolder = Join-Path $projectPath "Config"
 	Write-Host "configFolder:" "${configFolder}"
 
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
+	# Create a backup of original web.config
+	Copy-Item $webConfigSource $backupPath -Force
+	
+	# Backup config files folder	
+	if(Test-Path $configFolder) {
+		$umbracoBackupPath = Join-Path $backupPath "Config"
+		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
+		
+		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
+	}
+	
 	# Copy umbraco and umbraco_files from package to project folder
 	$umbracoFolder = Join-Path $projectPath "Umbraco"
 	New-Item -ItemType Directory -Force -Path $umbracoFolder
 	$umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco"		
+	$umbracoBackupPath = Join-Path $backupPath "Umbraco"
+	New-Item -ItemType Directory -Force -Path $umbracoBackupPath		
+	robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
 	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
 
 	$copyWebconfig = $true
@@ -78,6 +100,11 @@ if ($project) {
 		}
 	}
 	
+	$installFolder = Join-Path $projectPath "Install"
+	if(Test-Path $installFolder) {
+		Remove-Item $installFolder -Force -Recurse -Confirm:$false
+	}
+	
 	# Open appropriate readme
 	if($copyWebconfig -eq $true)  
 	{

build/build.ps1

@@ -15,12 +15,7 @@
     [Parameter(Mandatory=$false)]
     [Alias("c")]
     [Alias("cont")]
-    [switch] $continue = $false,
-
-    # execute a command
-    [Parameter(Mandatory=$false, ValueFromRemainingArguments=$true)]
-    [String[]]
-    $command
+    [switch] $continue = $false
   )
 
   # ################################################################
@@ -480,11 +475,7 @@
   # run
   if (-not $get)
   {
-    if ($command.Length -eq 0)
-    {
-      $command = @( "Build" )
-    }
-    $ubuild.RunMethod($command);
+    $ubuild.Build()
     if ($ubuild.OnError()) { return }
   }
   if ($get) { return $ubuild }

src/Umbraco.Core/Composing/Composition.cs

@@ -133,11 +133,7 @@ namespace Umbraco.Core.Composing
 
             Configs.RegisterWith(_register);
 
-            IFactory factory = null;
-            // ReSharper disable once AccessToModifiedClosure -- on purpose
-            _register.Register(_ => factory, Lifetime.Singleton);
-            factory = _register.CreateFactory();
-            return factory;
+            return _register.CreateFactory();
         }
 
         /// <summary>

src/Umbraco.Core/Composing/IComposer.cs

@@ -8,6 +8,7 @@
         /// <summary>
         /// Compose.
         /// </summary>
+        /// <param name="composition"></param>
         void Compose(Composition composition);
     }
-}
+}

src/Umbraco.Core/Composing/ICoreComposer.cs

@@ -4,8 +4,10 @@
     /// Represents a core <see cref="IComposer"/>.
     /// </summary>
     /// <remarks>
-    /// <para>Core composers compose after the initial composer, and before user composers.</para>
+    /// <para>All core composers are required by (compose before) all user composers,
+    /// and require (compose after) all runtime composers.</para>
     /// </remarks>
+    [ComposeAfter(typeof(IRuntimeComposer))]
     public interface ICoreComposer : IComposer
     { }
-}
+}

src/Umbraco.Core/Composing/IRuntimeComposer.cs

@@ -0,0 +1,11 @@
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Represents a runtime <see cref="IComposer"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>All runtime composers are required by (compose before) all core composers</para>
+    /// </remarks>
+    public interface IRuntimeComposer : IComposer
+    { }
+}

src/Umbraco.Core/Composing/IUserComposer.cs

@@ -4,9 +4,9 @@
     /// Represents a user <see cref="IComposer"/>.
     /// </summary>
     /// <remarks>
-    /// <para>User composers compose after core composers, and before the final composer.</para>
+    /// <para>All user composers require (compose after) all core composers.</para>
     /// </remarks>
     [ComposeAfter(typeof(ICoreComposer))]
     public interface IUserComposer : IComposer
     { }
-}
+}

src/Umbraco.Core/Composing/TypeCollectionBuilderBase.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Provides a base class for collections of types.
-    /// </summary>
-    public abstract class TypeCollectionBuilderBase<TCollection, TConstraint> : ICollectionBuilder<TCollection, Type>
-        where TCollection : class, IBuilderCollection<Type>
-    {
-        private readonly HashSet<Type> _types = new HashSet<Type>();
-
-        private Type Validate(Type type, string action)
-        {
-            if (!typeof(TConstraint).IsAssignableFrom(type))
-                throw new InvalidOperationException($"Cannot {action} type {type.FullName} as it does not inherit from/implement {typeof(TConstraint).FullName}.");
-            return type;
-        }
-
-        public void Add(Type type) => _types.Add(Validate(type, "add"));
-
-        public void Add<T>() => Add(typeof(T));
-
-        public void Add(IEnumerable<Type> types)
-        {
-            foreach (var type in types) Add(type);
-        }
-
-        public void Remove(Type type) => _types.Remove(Validate(type, "remove"));
-
-        public void Remove<T>() => Remove(typeof(T));
-
-        public TCollection CreateCollection(IFactory factory)
-        {
-            return factory.CreateInstance<TCollection>(_types);
-        }
-
-        public void RegisterWith(IRegister register)
-        {
-            register.Register(CreateCollection, Lifetime.Singleton);
-        }
-    }
-}

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Net.Configuration;
 using System.Web;
 using System.Web.Configuration;
-using System.Web.Hosting;
 using System.Xml.Linq;
 using Umbraco.Core.IO;
 
@@ -18,15 +17,16 @@ namespace Umbraco.Core.Configuration
     /// </summary>
     public class GlobalSettings : IGlobalSettings
     {
-        private string _localTempPath;
 
-        // TODO these should not be static
+        #region Private static fields
+
+        
         private static string _reservedPaths;
         private static string _reservedUrls;
-
         //ensure the built on (non-changeable) reserved paths are there at all times
         internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
         internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
+        #endregion
 
         /// <summary>
         /// Used in unit testing to reset all config items that were set with property setters (i.e. did not come from config)
@@ -131,7 +131,7 @@ namespace Umbraco.Core.Configuration
                     : "~/App_Data/umbraco.config";
             }
         }
-
+        
         /// <summary>
         /// Gets the path to umbraco's root directory (/umbraco by default).
         /// </summary>
@@ -163,7 +163,7 @@ namespace Umbraco.Core.Configuration
                 SaveSetting(Constants.AppSettings.ConfigurationStatus, value);
             }
         }
-
+        
         /// <summary>
         /// Saves a setting into the configuration file.
         /// </summary>
@@ -206,7 +206,7 @@ namespace Umbraco.Core.Configuration
                 ConfigurationManager.RefreshSection("appSettings");
             }
         }
-
+              
         /// <summary>
         /// Gets a value indicating whether umbraco is running in [debug mode].
         /// </summary>
@@ -250,7 +250,7 @@ namespace Umbraco.Core.Configuration
                 }
             }
         }
-
+        
         /// <summary>
         /// Returns the number of days that should take place between version checks.
         /// </summary>
@@ -269,7 +269,7 @@ namespace Umbraco.Core.Configuration
                 }
             }
         }
-
+        
         /// <inheritdoc />
         public LocalTempStorage LocalTempStorageLocation
         {
@@ -288,43 +288,25 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (_localTempPath != null)
-                    return _localTempPath;
-
                 switch (LocalTempStorageLocation)
                 {
                     case LocalTempStorage.AspNetTemp:
-                        return _localTempPath = System.IO.Path.Combine(HttpRuntime.CodegenDir, "UmbracoData");
-
+                        return System.IO.Path.Combine(HttpRuntime.CodegenDir, "UmbracoData");
                     case LocalTempStorage.EnvironmentTemp:
-
-                        // environment temp is unique, we need a folder per site
-
-                        // use a hash
-                        // combine site name and application id
-                        //  site name is a Guid on Cloud
-                        //  application id is eg /LM/W3SVC/123456/ROOT
-                        // the combination is unique on one server
-                        // and, if a site moves from worker A to B and then back to A...
-                        //  hopefully it gets a new Guid or new application id?
-
-                        var siteName = HostingEnvironment.SiteName;
-                        var applicationId = HostingEnvironment.ApplicationID; // ie HttpRuntime.AppDomainAppId
-
-                        var hashString = siteName + "::" + applicationId;
-                        var hash = hashString.GenerateHash();
-                        var siteTemp = System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", hash);
-
-                        return _localTempPath = System.IO.Path.Combine(siteTemp, "umbraco.config");
-
+                        // include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path - assuming we cannot have SHA1 collisions on AppDomainAppId
+                        var appDomainHash = HttpRuntime.AppDomainAppId.GenerateHash();
+                        return System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", appDomainHash);
                     //case LocalTempStorage.Default:
                     //case LocalTempStorage.Unknown:
                     default:
-                        return _localTempPath = IOHelper.MapPath("~/App_Data/TEMP");
+                        return IOHelper.MapPath("~/App_Data/TEMP");
                 }
             }
         }
 
+
         /// <summary>
         /// Gets the default UI language.
         /// </summary>

src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Newtonsoft.Json;
 using Serilog.Events;
 using Serilog.Formatting.Compact.Reader;
 
@@ -11,15 +10,13 @@ namespace Umbraco.Core.Logging.Viewer
     internal class JsonLogViewer : LogViewerSourceBase
     {
         private readonly string _logsPath;
-        private readonly ILogger _logger;
 
-        public JsonLogViewer(ILogger logger, string logsPath = "", string searchPath = "") : base(searchPath)
+        public JsonLogViewer(string logsPath = "", string searchPath = "") : base(searchPath)
         {
             if (string.IsNullOrEmpty(logsPath))
                 logsPath = $@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\Logs\";
 
             _logsPath = logsPath;
-            _logger = logger;
         }
 
         private const int FileSizeCap = 100;
@@ -80,14 +77,8 @@ namespace Umbraco.Core.Logging.Viewer
                         using (var stream = new StreamReader(fs))
                         {
                             var reader = new LogEventReader(stream);
-                            while (TryRead(reader, out var evt))
+                            while (reader.TryRead(out var evt))
                             {
-                                //We may get a null if log line is malformed
-                                if (evt == null)
-                                {
-                                    continue;
-                                }
-
                                 if (count > skip + take)
                                 {
                                     break;
@@ -114,21 +105,5 @@ namespace Umbraco.Core.Logging.Viewer
             return logs;
         }
 
-        private bool TryRead(LogEventReader reader, out LogEvent evt)
-        {
-            try
-            {
-                return reader.TryRead(out evt);
-            }
-            catch (JsonReaderException ex)
-            {
-                // As we are reading/streaming one line at a time in the JSON file
-                // Thus we can not report the line number, as it will always be 1
-                _logger.Error<JsonLogViewer>(ex, "Unable to parse a line in the JSON log file");
-
-                evt = null;
-                return true;
-            }
-        }
     }
 }

src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Logging.Viewer
     {
         public void Compose(Composition composition)
         {
-            composition.SetLogViewer(_ => new JsonLogViewer(composition.Logger));
+            composition.SetLogViewer(_ => new JsonLogViewer());
         }
     }
 }

src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs

@@ -5,7 +5,6 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Migrations.Upgrade.V_7_12_0;
 using Umbraco.Core.Migrations.Upgrade.V_7_14_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_0_0;
-using Umbraco.Core.Migrations.Upgrade.V_8_0_1;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -138,8 +137,6 @@ namespace Umbraco.Core.Migrations.Upgrade
 
             To<RenameLabelAndRichTextPropertyEditorAliases>("{E0CBE54D-A84F-4A8F-9B13-900945FD7ED9}");
             To<MergeDateAndDateTimePropertyEditor>("{78BAF571-90D0-4D28-8175-EF96316DA789}");
-            To<ChangeNuCacheJsonFormat>("{80C0A0CB-0DD5-4573-B000-C4B7C313C70D}");
-
             //FINAL
 
 
@@ -170,7 +167,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             From("{init-7.12.4}").To("{init-7.10.0}"); // same as 7.12.0
             From("{init-7.13.0}").To("{init-7.10.0}"); // same as 7.12.0
             From("{init-7.13.1}").To("{init-7.10.0}"); // same as 7.12.0
-                
+
             // 7.14.0 has migrations, handle it...
             //  clone going from 7.10 to 1350617A (the last one before we started to merge 7.12 migrations), then
             //  clone going from CF51B39B (after 7.12 migrations) to 0009109C (the last one before we started to merge 7.12 migrations),

src/Umbraco.Core/Migrations/Upgrade/V_8_0_1/ChangeNuCacheJsonFormat.cs

@@ -1,16 +0,0 @@
-using Umbraco.Core.Migrations.PostMigrations;
-
-namespace Umbraco.Core.Migrations.Upgrade.V_8_0_1
-{
-    public class ChangeNuCacheJsonFormat : MigrationBase
-    {
-        public ChangeNuCacheJsonFormat(IMigrationContext context) : base(context)
-        { }
-
-        public override void Migrate()
-        {
-            // nothing - just adding the post-migration
-            Context.AddPostMigration<RebuildPublishedSnapshot>();
-        }
-    }
-}

src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ChangeNuCacheJsonFormat.cs

@@ -1,16 +0,0 @@
-using Umbraco.Core.Migrations.PostMigrations;
-
-namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
-{
-    public class ChangeNuCacheJsonFormat : MigrationBase
-    {
-        public ChangeNuCacheJsonFormat(IMigrationContext context) : base(context)
-        { }
-
-        public override void Migrate()
-        {
-            // nothing - just adding the post-migration
-            Context.AddPostMigration<RebuildPublishedSnapshot>();
-        }
-    }
-}

src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs

@@ -11,14 +11,14 @@ namespace Umbraco.Core.Models.PublishedContent
         /// <summary>
         /// Initializes a new instance of the <see cref="PublishedCultureInfo"/> class.
         /// </summary>
-        public PublishedCultureInfo(string culture, string name, string urlSegment, DateTime date)
+        public PublishedCultureInfo(string culture, string name, DateTime date)
         {
             if (string.IsNullOrWhiteSpace(culture)) throw new ArgumentNullOrEmptyException(nameof(culture));
             if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
 
             Culture = culture;
             Name = name;
-            UrlSegment = urlSegment;
+            UrlSegment = name.ToUrlSegment(culture);
             Date = date;
         }
 

src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs

@@ -292,6 +292,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     if (psql.Arguments[i] is string s && s == "[[[ISOCODE]]]")
                     {
                         psql.Arguments[i] = ordering.Culture;
+                        break;
                     }
                 }
             }

src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs

@@ -982,14 +982,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 // invariant: left join will yield NULL and we must use pcv to determine published
                 // variant: left join may yield NULL or something, and that determines published
 
-
                 var joins = Sql()
-                    .InnerJoin<ContentTypeDto>("ctype").On<ContentDto, ContentTypeDto>((content, contentType) => content.ContentTypeId == contentType.NodeId, aliasRight: "ctype")
-                    // left join on optional culture variation
-                    //the magic "[[[ISOCODE]]]" parameter value will be replaced in ContentRepositoryBase.GetPage() by the actual ISO code
-                    .LeftJoin<ContentVersionCultureVariationDto>(nested =>
-                        nested.InnerJoin<LanguageDto>("langp").On<ContentVersionCultureVariationDto, LanguageDto>((ccv, lang) => ccv.LanguageId == lang.Id && lang.IsoCode == "[[[ISOCODE]]]", "ccvp", "langp"), "ccvp")
-                    .On<ContentVersionDto, ContentVersionCultureVariationDto>((version, ccv) => version.Id == ccv.VersionId, aliasLeft: "pcv", aliasRight: "ccvp");
+                    .InnerJoin<ContentTypeDto>("ctype").On<ContentDto, ContentTypeDto>((content, contentType) => content.ContentTypeId == contentType.NodeId, aliasRight: "ctype");
 
                 sql = InsertJoins(sql, joins);
 
@@ -999,7 +993,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
                     // when invariant, ie 'variations' does not have the culture flag (value 1), use the global 'published' flag on pcv.id,
                     // otherwise check if there's a version culture variation for the lang, via ccv.id
-                    ", (CASE WHEN (ctype.variations & 1) = 0 THEN (CASE WHEN pcv.id IS NULL THEN 0 ELSE 1 END) ELSE (CASE WHEN ccvp.id IS NULL THEN 0 ELSE 1 END) END) AS ordering "); // trailing space is important!
+                    ", (CASE WHEN (ctype.variations & 1) = 0 THEN (CASE WHEN pcv.id IS NULL THEN 0 ELSE 1 END) ELSE (CASE WHEN ccv.id IS NULL THEN 0 ELSE 1 END) END) AS ordering "); // trailing space is important!
 
                 sql = Sql(sqlText, sql.Arguments);
 

src/Umbraco.Core/PropertyEditors/ValueConverters/YesNoValueConverter.cs

@@ -36,10 +36,6 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             if (source is int)
                 return (int)source == 1;
 
-            // this is required for correct true/false handling in nested content elements
-            if (source is long)
-                return (long)source == 1;
-
             if (source is bool)
                 return (bool)source;
 

src/Umbraco.Core/Runtime/CoreRuntime.cs

@@ -168,7 +168,7 @@ namespace Umbraco.Core.Runtime
                     _state.BootFailedException = bfe;
                 }
 
-                timer?.Fail(exception: bfe); // be sure to log the exception - even if we repeat ourselves
+                timer.Fail(exception: bfe); // be sure to log the exception - even if we repeat ourselves
 
                 // if something goes wrong above, we may end up with no factory
                 // meaning nothing can get the runtime state, etc - so let's try
@@ -242,7 +242,7 @@ namespace Umbraco.Core.Runtime
                 }
                 catch
                 {
-                    timer?.Fail();
+                    timer.Fail();
                     throw;
                 }
             }

src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs

@@ -5,11 +5,11 @@ using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Runtime
 {
-    public class CoreInitialComponent : IComponent
+    public class CoreRuntimeComponent : IComponent
     {
         private readonly IEnumerable<Profile> _mapperProfiles;
 
-        public CoreInitialComponent(IEnumerable<Profile> mapperProfiles)
+        public CoreRuntimeComponent(IEnumerable<Profile> mapperProfiles)
         {
             _mapperProfiles = mapperProfiles;
         }

src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs

@@ -24,9 +24,7 @@ using IntegerValidator = Umbraco.Core.PropertyEditors.Validators.IntegerValidato
 
 namespace Umbraco.Core.Runtime
 {
-    // core's initial composer composes before all core composers
-    [ComposeBefore(typeof(ICoreComposer))]
-    public class CoreInitialComposer : ComponentComposer<CoreInitialComponent>
+    public class CoreRuntimeComposer : ComponentComposer<CoreRuntimeComponent>, IRuntimeComposer
     {
         public override void Compose(Composition composition)
         {

src/Umbraco.Core/Services/Implement/ContentService.cs

@@ -2875,14 +2875,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 foreach (var property in blueprint.Properties)
                 {
-                    if (property.PropertyType.VariesByCulture())
-                    {
-                        content.SetValue(property.Alias, property.GetValue(culture), culture);
-                    }
-                    else
-                    {
-                        content.SetValue(property.Alias, property.GetValue());
-                    }
+                    content.SetValue(property.Alias, property.GetValue(culture), culture);
                 }
 
                 content.Name = blueprint.Name;

src/Umbraco.Core/Umbraco.Core.csproj

@@ -168,6 +168,7 @@
     <Compile Include="Composing\EnableComposerAttribute.cs" />
     <Compile Include="Composing\IComposer.cs" />
     <Compile Include="Composing\ICoreComposer.cs" />
+    <Compile Include="Composing\IRuntimeComposer.cs" />
     <Compile Include="Composing\IComponent.cs" />
     <Compile Include="Composing\IUserComposer.cs" />
     <Compile Include="Compose\ManifestWatcherComposer.cs" />
@@ -208,13 +209,11 @@
     <Compile Include="Composing\TypeLoader.cs" />
     <Compile Include="IO\MediaPathSchemes\UniqueMediaPathScheme.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MergeDateAndDateTimePropertyEditor.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_1\ChangeNuCacheJsonFormat.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
     <Compile Include="PublishedModelFactoryExtensions.cs" />
     <Compile Include="Services\PropertyValidationService.cs" />
-    <Compile Include="Composing\TypeCollectionBuilderBase.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="Composing\WeightAttribute.cs" />
     <Compile Include="Composing\WeightedCollectionBuilderBase.cs" />
@@ -531,7 +530,7 @@
     <Compile Include="RuntimeLevelReason.cs" />
     <Compile Include="RuntimeOptions.cs" />
     <Compile Include="Runtime\CoreRuntime.cs" />
-    <Compile Include="Runtime\CoreInitialComponent.cs" />
+    <Compile Include="Runtime\CoreRuntimeComponent.cs" />
     <Compile Include="CustomBooleanTypeConverter.cs" />
     <Compile Include="Migrations\Expressions\Common\ExecutableBuilder.cs" />
     <Compile Include="Migrations\Expressions\Common\IExecutableBuilder.cs" />
@@ -1312,7 +1311,7 @@
     <Compile Include="ReflectionUtilities.cs" />
     <Compile Include="RuntimeLevel.cs" />
     <Compile Include="RuntimeState.cs" />
-    <Compile Include="Runtime\CoreInitialComposer.cs" />
+    <Compile Include="Runtime\CoreRuntimeComposer.cs" />
     <Compile Include="SafeCallContext.cs" />
     <Compile Include="Scoping\IInstanceIdentifiable.cs" />
     <Compile Include="Scoping\IScope.cs" />

src/Umbraco.Examine/ExamineExtensions.cs

@@ -28,8 +28,6 @@ namespace Umbraco.Examine
         /// </remarks>
         internal static readonly Regex CultureIsoCodeFieldNameMatchExpression = new Regex("^([_\\w]+)_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled);
 
-        //TODO: We need a public method here to just match a field name against CultureIsoCodeFieldNameMatchExpression
-
         /// <summary>
         /// Returns all index fields that are culture specific (suffixed)
         /// </summary>

src/Umbraco.Examine/Umbraco.Examine.csproj

@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0" />
+    <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>

src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs

@@ -158,7 +158,7 @@ namespace Umbraco.Tests.Cache
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetUmbracoSettings(),
                 TestObjects.GetGlobalSettings(),
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             // just assert it does not throw

src/Umbraco.Tests/Composing/CompositionTests.cs

@@ -1,53 +0,0 @@
-using System;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Tests.Composing
-{
-    [TestFixture]
-    public class CompositionTests
-    {
-        [Test]
-        public void FactoryIsResolvable()
-        {
-            Func<IFactory, IFactory> factoryFactory = null;
-
-            var mockedRegister = Mock.Of<IRegister>();
-            var mockedFactory = Mock.Of<IFactory>();
-
-            // the mocked register creates the mocked factory
-            Mock.Get(mockedRegister)
-                .Setup(x => x.CreateFactory())
-                .Returns(mockedFactory);
-
-            // the mocked register can register a factory factory
-            Mock.Get(mockedRegister)
-                .Setup(x => x.Register(It.IsAny<Func<IFactory, IFactory>>(), Lifetime.Singleton))
-                .Callback<Func<IFactory, IFactory>, Lifetime>((ff, lt) => factoryFactory = ff);
-
-            // the mocked factory can invoke the factory factory
-            Mock.Get(mockedFactory)
-                .Setup(x => x.GetInstance(typeof(IFactory)))
-                .Returns(() => factoryFactory?.Invoke(mockedFactory));
-
-            var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeLoader = new TypeLoader(Mock.Of<IAppPolicyCache>(), "", logger);
-            var composition = new Composition(mockedRegister, typeLoader, logger, Mock.Of<IRuntimeState>());
-
-            // create the factory, ensure it is the mocked factory
-            var factory = composition.CreateFactory();
-            Assert.AreSame(mockedFactory, factory);
-
-            // ensure we can get an IFactory instance,
-            // meaning that it has been properly registered
-
-            var resolved = factory.GetInstance<IFactory>();
-            Assert.IsNotNull(resolved);
-            Assert.AreSame(factory, resolved);
-        }
-    }
-}

src/Umbraco.Tests/Logging/LogviewerTests.cs

@@ -1,5 +1,4 @@
-using Moq;
-using NUnit.Framework;
+using NUnit.Framework;
 using System;
 using System.IO;
 using System.Linq;
@@ -48,8 +47,7 @@ namespace Umbraco.Tests.Logging
             File.Copy(exampleLogfilePath, _newLogfilePath, true);
             File.Copy(exampleSearchfilePath, _newSearchfilePath, true);
 
-            var logger = Mock.Of<Core.Logging.ILogger>();
-            _logViewer = new JsonLogViewer(logger, logsPath: _newLogfileDirPath, searchPath: _newSearchfilePath);
+            _logViewer = new JsonLogViewer(logsPath: _newLogfileDirPath, searchPath: _newSearchfilePath);
         }
 
         [OneTimeTearDown]

src/Umbraco.Tests/PublishedContent/NuCacheTests.cs

@@ -15,7 +15,6 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
-using Umbraco.Core.Strings;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects;
 using Umbraco.Tests.Testing.Objects.Accessors;
@@ -182,8 +181,7 @@ namespace Umbraco.Tests.PublishedContent
                 globalSettings,
                 new SiteDomainHelper(),
                 Mock.Of<IEntityXmlSerializer>(),
-                Mock.Of<IPublishedModelFactory>(),
-                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }));
+                Mock.Of<IPublishedModelFactory>());
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();

src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs

@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Routing
         {
             base.SetUp();
 
-            WebFinalComponent.CreateRoutes(
+            WebRuntimeComponent.CreateRoutes(
                 new TestUmbracoContextAccessor(),
                 TestObjects.GetGlobalSettings(),
                 new SurfaceControllerTypeCollection(Enumerable.Empty<Type>()),

src/Umbraco.Tests/Runtimes/StandaloneTests.cs

@@ -81,7 +81,7 @@ namespace Umbraco.Tests.Runtimes
 
             var composerTypes = typeLoader.GetTypes<IComposer>() // all of them
                 .Where(x => !x.FullName.StartsWith("Umbraco.Tests.")) // exclude test components
-                .Where(x => x != typeof(WebInitialComposer)); // exclude web runtime
+                .Where(x => x != typeof(WebRuntimeComposer)); // exclude web runtime
             var composers = new Composers(composition, composerTypes, profilingLogger);
             composers.Compose();
 

src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs

@@ -18,7 +18,7 @@ namespace Umbraco.Tests.Runtimes
                     new PluginViewEngine()
                 };
 
-            WebInitialComponent.WrapViewEngines(engines);
+            WebRuntimeComponent.WrapViewEngines(engines);
 
             Assert.That(engines.Count, Is.EqualTo(2));
             Assert.That(engines[0], Is.InstanceOf<ProfilingViewEngine>());
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Runtimes
                     new PluginViewEngine()
                 };
 
-            WebInitialComponent.WrapViewEngines(engines);
+            WebRuntimeComponent.WrapViewEngines(engines);
 
             Assert.That(engines.Count, Is.EqualTo(2));
             Assert.That(((ProfilingViewEngine)engines[0]).Inner, Is.InstanceOf<RenderViewEngine>());
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Runtimes
                     profiledEngine
                 };
 
-            WebInitialComponent.WrapViewEngines(engines);
+            WebRuntimeComponent.WrapViewEngines(engines);
 
             Assert.That(engines[0], Is.SameAs(profiledEngine));
         }
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Runtimes
         [Test]
         public void WrapViewEngines_CollectionIsNull_DoesNotThrow()
         {
-            Assert.DoesNotThrow(() => WebInitialComponent.WrapViewEngines(null));
+            Assert.DoesNotThrow(() => WebRuntimeComponent.WrapViewEngines(null));
         }
     }
 }

src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs

@@ -17,7 +17,6 @@ using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
-using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -100,8 +99,7 @@ namespace Umbraco.Tests.Scoping
                 new DatabaseDataSource(),
                 Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
-                Mock.Of<IPublishedModelFactory>(),
-                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }));
+                Mock.Of<IPublishedModelFactory>());
         }
 
         protected UmbracoContext GetUmbracoContextNu(string url, int templateId = 1234, RouteData routeData = null, bool setSingleton = false, IUmbracoSettingsSection umbracoSettings = null, IEnumerable<IUrlProvider> urlProviders = null)

src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs

@@ -15,7 +15,6 @@ using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
-using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 using Umbraco.Tests.Testing;
 using Umbraco.Web;
@@ -73,8 +72,7 @@ namespace Umbraco.Tests.Services
                 new DatabaseDataSource(),
                 Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
-                Mock.Of<IPublishedModelFactory>(),
-                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }));
+                Mock.Of<IPublishedModelFactory>());
         }
 
         public class LocalServerMessenger : ServerMessengerBase

src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs

@@ -116,7 +116,7 @@ namespace Umbraco.Tests.TestHelpers
 
             var umbracoSettings = GetUmbracoSettings();
             var globalSettings = GetGlobalSettings();
-            var urlProviders = new UrlProviderCollection(Enumerable.Empty<IUrlProvider>());
+            var urlProviders = Enumerable.Empty<IUrlProvider>();
 
             if (accessor == null) accessor = new TestUmbracoContextAccessor();
 

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -80,7 +80,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="Castle.Core" Version="4.3.1" />
-    <PackageReference Include="Examine" Version="1.0.0" />
+    <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
@@ -118,7 +118,6 @@
     <Compile Include="Cache\SnapDictionaryTests.cs" />
     <Compile Include="Clr\ReflectionUtilitiesTests.cs" />
     <Compile Include="Collections\OrderedHashSetTests.cs" />
-    <Compile Include="Composing\CompositionTests.cs" />
     <Compile Include="Composing\LightInjectValidation.cs" />
     <Compile Include="Composing\ContainerConformingTests.cs" />
     <Compile Include="CoreThings\CallContextTests.cs" />

src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs

@@ -71,7 +71,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetUmbracoSettings(),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());
@@ -100,7 +100,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetUmbracoSettings(),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());
@@ -129,7 +129,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetUmbracoSettings(),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());
@@ -158,7 +158,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetUmbracoSettings(),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());

src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs

@@ -46,7 +46,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetUmbracoSettings(),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());
@@ -73,7 +73,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetUmbracoSettings(),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());
@@ -103,7 +103,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == Mock.Of<IWebRoutingSection>(routingSection => routingSection.UrlProviderMode == "Auto")),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());
@@ -140,7 +140,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == webRoutingSettings),
                 globalSettings,
-                new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
+                Enumerable.Empty<IUrlProvider>(),
                 Mock.Of<IUserService>());
 
             var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>());

src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs

@@ -104,7 +104,7 @@ namespace Umbraco.Tests.Web
                 new TestDefaultCultureAccessor(),
                 Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == Mock.Of<IWebRoutingSection>(routingSection => routingSection.UrlProviderMode == "Auto")),
                 globalSettings,
-                new UrlProviderCollection(new[] { testUrlProvider.Object }),
+                new[] { testUrlProvider.Object },
                 Mock.Of<IUserService>());
 
             using (var reference = umbracoContextFactory.EnsureUmbracoContext(Mock.Of<HttpContextBase>()))

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

@@ -5210,12 +5210,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5230,17 +5232,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5357,7 +5362,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5369,6 +5375,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5383,6 +5390,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5390,12 +5398,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5414,6 +5424,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5494,7 +5505,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5506,6 +5518,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5627,6 +5640,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",

src/Umbraco.Web.UI.Client/setupgulp.bat

@@ -0,0 +1,22 @@
+@ECHO OFF
+
+ECHO.
+ECHO.
+ECHO This will only work when you have NPM available on the command line
+ECHO Works great with NodeJS Portable - https://gareth.flowers/nodejs-portable/
+ECHO.
+ECHO.
+set /P c=Are you sure you want to continue [Y/N]?
+if /I "%c%" EQU "Y" goto :setupgulp
+if /I "%c%" EQU "N" goto :eof
+
+:setupgulp
+call npm install
+call npm -g install gulp
+call npm -g install gulp-cli
+
+ECHO.
+ECHO.
+ECHO You should now be able to run: gulp build or gulp dev
+ECHO.
+ECHO.

src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js

@@ -331,35 +331,8 @@
 
         // This is a helper method to reduce the amount of code repitition for actions: Save, Publish, SendToPublish
         function performSave(args) {
-            
-            // Check that all variants for publishing have a name.
-            if (args.action === "publish" || args.action === "sendToPublish") {
-                
-                if ($scope.content.variants) {
-                    var iVariant;
-                    for (var i = 0; i < $scope.content.variants.length; i++) {
-                        iVariant = $scope.content.variants[i];
-                        
-                        iVariant.notifications = [];// maybe not needed, need to investigate.
-                        
-                        if(iVariant.publish === true) {
-                            if (iVariant.name == null) {
-                                
-                                var tokens = [iVariant.language.name];
-                                
-                                localizationService.localize("publish_contentPublishedFailedByMissingName", tokens).then(function (value) {
-                                    iVariant.notifications.push({"message": value, "type": 1});
-                                });
-                                
-                                return $q.reject();
-                            }
-                        }
-                    }
-                }
-                
-            }
-            
-            
+
+
             //Used to check validility of nested form - coming from Content Apps mostly
             //Set them all to be invalid
             var fieldsToRollback = checkValidility();

src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js

@@ -344,8 +344,8 @@
                     loadAuditTrail(true);
                     loadRedirectUrls();
                     setNodePublishStatus();
+                    updateCurrentUrls();
                 }
-                updateCurrentUrls();
             });
 
             //ensure to unregister from all events!

src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js

@@ -1,72 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbCheckbox
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 7.14.0</b> Use this directive to render an umbraco checkbox.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-checkbox
-            name="checkboxlist"
-            value="{{key}}"
-            model="true"
-            text="{{text}}">
-        </umb-checkbox>
-
-    </div>
-</pre>
-
-@param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
-@param {string} input-id Set the <code>id</code> of the checkbox.
-@param {string} value Set the value of the checkbox.
-@param {string} name Set the name of the checkbox.
-@param {string} text Set the text for the checkbox label.
-@param {string} server-validation-field Set the <code>val-server-field</code> of the checkbox.
-@param {boolean} disabled Set the checkbox to be disabled.
-@param {boolean} required Set the checkbox to be required.
-@param {string} on-change Callback when the value of the checkbox changed by interaction.
-
-**/
-
-(function () {
-    'use strict';
-    
-    
-    function UmbCheckboxController($timeout) {
-        
-        var vm = this;
-        
-        vm.callOnChange = function() {
-            $timeout(function() {
-                vm.onChange({model:vm.model, value:vm.value});
-            }, 0);
-        }
-        
-    }
-    
-    
-    var component = {
-        templateUrl: 'views/components/forms/umb-checkbox.html',
-        controller: UmbCheckboxController,
-        controllerAs: 'vm',
-        bindings: {
-            model: "=",
-            inputId: "@",
-            value: "@",
-            name: "@",
-            text: "@",
-            serverValidationField: "@",
-            disabled: "<",
-            required: "<",
-            onChange: "&"
-        }
-    };
-
-    angular.module('umbraco.directives').component('umbCheckbox', component);
-
-})();

src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js

@@ -1,57 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbRadiobutton
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 7.14.0</b> Use this directive to render an umbraco radio button.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-radiobutton
-            name="radiobuttonlist"
-            value="{{key}}"
-            model="true"
-            text="{{text}}">
-        </umb-radiobutton>
-
-    </div>
-</pre>
-
-@param {boolean} model Set to <code>true</code> or <code>false</code> to set the radiobutton to checked or unchecked.
-@param {string} value Set the value of the radiobutton.
-@param {string} name Set the name of the radiobutton.
-@param {string} text Set the text for the radiobutton label.
-@param {boolean} disabled Set the radiobutton to be disabled.
-@param {boolean} required Set the radiobutton to be required.
-
-**/
-
-(function () {
-    'use strict';
-
-    function RadiobuttonDirective() {
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/forms/umb-radiobutton.html',
-            scope: {
-                model: "=",
-                value: "@",
-                name: "@",
-                text: "@",
-                disabled: "=",
-                required: "="
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbRadiobutton', RadiobuttonDirective);
-
-})();

src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js

@@ -19,15 +19,9 @@ angular.module("umbraco.directives")
                     promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", scope));
                 }
 
-                var editorConfig = scope.configuration ? scope.configuration : null;
-                if (!editorConfig || angular.isString(editorConfig)) {
-                    editorConfig = tinyMceService.defaultPrevalues();
-                    //for the grid by default, we don't want to include the macro toolbar
-                    editorConfig.toolbar = _.without(editorConfig, "umbmacro");
-                }
-                //make sure there's a max image size
-                if (!scope.configuration.maxImageSize && scope.configuration.maxImageSize !== 0) {
-                    editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize;
+                var toolbar = ["code", "styleselect", "bold", "italic", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "link", "umbmediapicker", "umbembeddialog"];
+                if (scope.configuration && scope.configuration.toolbar) {
+                    toolbar = scope.configuration.toolbar;
                 }
 
                 //stores a reference to the editor
@@ -35,9 +29,9 @@ angular.module("umbraco.directives")
 
                 promises.push(tinyMceService.getTinyMceEditorConfig({
                     htmlId: scope.uniqueId,
-                    stylesheets: editorConfig.stylesheets,
-                    toolbar: editorConfig.toolbar,
-                    mode: editorConfig.mode
+                    stylesheets: scope.configuration ? scope.configuration.stylesheets : null,
+                    toolbar: toolbar,
+                    mode: scope.configuration.mode
                 }));
 
                 // pin toolbar to top of screen if we have focus and it scrolls off the screen
@@ -52,16 +46,9 @@ angular.module("umbraco.directives")
 
                 $q.all(promises).then(function (result) {
 
-                    var standardConfig = result[promises.length - 1];
+                    var tinyMceEditorConfig = result[promises.length - 1];
 
-                    //create a baseline Config to extend upon
-                    var baseLineConfigObj = {
-                        maxImageSize: editorConfig.maxImageSize
-                    };
-
-                    angular.extend(baseLineConfigObj, standardConfig);
-
-                    baseLineConfigObj.setup = function (editor) {
+                    tinyMceEditorConfig.setup = function (editor) {
 
                         //set the reference
                         tinyMceEditor = editor;
@@ -124,7 +111,7 @@ angular.module("umbraco.directives")
                         //the elements needed
                         $timeout(function () {
                             tinymce.DOM.events.domLoaded = true;
-                            tinymce.init(baseLineConfigObj);
+                            tinymce.init(tinyMceEditorConfig);
                         }, 150, false);
                     }
 

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

@@ -117,11 +117,9 @@ Use this directive to generate a list of content items presented as a flexbox gr
          };
 
          scope.clickItemName = function(item, $event, $index) {
-            if(scope.onClickName && !($event.metaKey || $event.ctrlKey)) {
+            if(scope.onClickName) {
                scope.onClickName(item, $event, $index);
-               $event.preventDefault();
             }
-            $event.stopPropagation();
          };
 
       }

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

@@ -117,11 +117,10 @@
         var vm = this;
 
         vm.clickItem = function (item, $event) {
-            if (vm.onClick && !($event.metaKey || $event.ctrlKey)) {
+            if (vm.onClick) {
                 vm.onClick({ item: item});
-                $event.preventDefault();
+                $event.stopPropagation();
             }
-            $event.stopPropagation();
         };
 
         vm.selectItem = function (item, $index, $event) {

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

@@ -301,19 +301,6 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
             return allProps;
         },
 
-        /**
-         * @ngdoc method
-         * @name umbraco.services.contentEditingHelper#buildCompositeVariantId
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Returns a id for the variant that is unique between all variants on the content
-         */
-        buildCompositeVariantId: function (variant) {
-            return (variant.language ? variant.language.culture : "invariant") + "_" + (variant.segment ? variant.segment : "");
-        },
-
 
         /**
          * @ngdoc method

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

@@ -427,8 +427,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     data["rel"] = img.id;
                     data["data-id"] = img.id;
                 }
-                
-                editor.selection.setContent(editor.dom.createHTML('img', data));
+
+                editor.insertContent(editor.dom.createHTML('img', data));
 
                 $timeout(function () {
                     var imgElm = editor.dom.get('__mcenew');

src/Umbraco.Web.UI.Client/src/less/belle.less

@@ -117,7 +117,6 @@
 @import "components/umb-confirm-action.less";
 @import "components/umb-keyboard-shortcuts-overview.less";
 @import "components/umb-checkbox-list.less";
-@import "components/umb-form-check.less";
 @import "components/umb-locked-field.less";
 @import "components/umb-tabs.less";
 @import "components/umb-load-indicator.less";
@@ -167,7 +166,6 @@
 @import "components/umb-property-file-upload.less";
 
 @import "components/users/umb-user-cards.less";
-@import "components/users/umb-user-table.less";
 @import "components/users/umb-user-details.less";
 @import "components/users/umb-user-group-picker-list.less";
 @import "components/users/umb-user-group-preview.less";

src/Umbraco.Web.UI.Client/src/less/buttons.less

@@ -195,9 +195,12 @@ input[type="button"] {
 }
 // Made for Umbraco, 2019
 .btn-action {
-  .buttonBackground(@blueExtraDark, lighten(@blueExtraDark, 10), @white, @u-white);
-  transition: background-color 240ms;
-  font-weight: 700;
+  .buttonBackground(@blueExtraDark, @blueDark, @white, @u-white);
+}
+// Made for Umbraco, 2019
+.btn-selection {
+    @btnSelectionBackgroundHover: darken(@pinkLight, 10%);
+  .buttonBackground(@pinkLight, @btnSelectionBackgroundHover, @blueExtraDark, @blueDark);
 }
 // Made for Umbraco, 2019, used for buttons that has to stand back.
 .btn-white {

src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less

@@ -1,7 +1,7 @@
 .umb-editor-sub-header {
    padding: 10px 0;
    margin-bottom: 10px;
-   background: @brownGrayLight;
+   background: @gray-10;
    display: flex;
    justify-content: space-between;
    margin-top: -10px;
@@ -12,7 +12,7 @@
     &.nested {
         margin-top: 0;
         margin-bottom: 0;
-    	background: @brownGrayLight;
+        background: @gray-10;
     }
 }
 

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

@@ -250,11 +250,3 @@
 .form-horizontal .umb-overlay .controls {
     margin-left: 0 !important;
 }
-
-.umb-overlay .text-error {
-    color: @formErrorText;
-}
-
-.umb-overlay .text-success {
-    color: @formSuccessText;
-}

src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less

@@ -1,6 +1,3 @@
-@checkboxWidth: 15px;
-@checkboxHeight: 15px;
-
 .umb-checkbox-list {
   list-style: none;
   margin-left: 0;

src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less

@@ -13,6 +13,7 @@
    user-select: none;
    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
    border-radius: 3px;
+   
 }
 
 .umb-content-grid__item.-selected {    
@@ -58,8 +59,7 @@
    display: inline-flex;
    
    color: @ui-option-type;
-   &:hover, &:focus {
-       text-decoration: none;
+   &:hover {
        color:@ui-option-type-hover;
    }
 }

src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less

@@ -61,9 +61,6 @@
 
 .show-validation .umb-sub-views-nav-item > a.-has-error {
   color: @red;
-  &::after {
-      background-color: @red;
-  }
 }
 
 .umb-sub-views-nav-item .icon {

src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less

@@ -1,136 +0,0 @@
-@checkboxWidth: 16px;
-@checkboxHeight: 16px;
-
-.umb-form-check {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    position: relative;
-    padding: 0;
-    margin: 0;
-    min-height: 22px;
-    line-height: 22px;
-    cursor: pointer !important;
-
-    &__text {
-        margin: 0 0 0 26px;
-        position: relative;
-        top: 0;
-    }
-
-    &__input {
-        position: absolute;
-        top: 0;
-        left: 0;
-        opacity: 0;
-
-        &:checked ~ .umb-form-check__state .umb-form-check__check {
-            border-color: @ui-option-type;
-        }
-
-        &:focus:checked ~ .umb-form-check .umb-form-check__check,
-        &:focus ~ .umb-form-check__state .umb-form-check__check {
-            border-color: @inputBorderFocus;
-        }
-
-        &:checked ~ .umb-form-check__state {
-            .umb-form-check__check {
-                // This only happens if the state has a radiobutton modifier
-                .umb-form-check--radiobutton & {
-                    &:before {
-                        opacity: 1;
-                        transform: scale(1);
-                    }
-                }
-                // This only happens if state has the checkbox modifier
-                .umb-form-check--checkbox & {
-                    &:before {
-                        width: @checkboxWidth;
-                        height: @checkboxHeight;
-                    }
-                }
-            }
-            // This only happens if state has the checkbox modifier
-            .umb-form-check--checkbox & {
-                .umb-form-check__icon {
-                    opacity: 1;
-                }
-            }
-        }
-    }
-
-    &__state {
-        display: flex;
-        height: 18px;
-        margin-top: 2px;
-        position: absolute;
-        top: 0;
-        left: 0;
-    }
-
-    &__check {
-        display: flex;
-        position: relative;
-        background: @white;
-        border: 1px solid @inputBorder;
-        width: @checkboxWidth;
-        height: @checkboxHeight;
-
-        &:before {
-            content: "";
-            background: @ui-option-type;
-            position: absolute;
-            left: 0;
-            right: 0;
-            top: 0;
-            bottom: 0;
-            margin: auto;
-        }
-        // This only happens if state has the radiobutton modifier
-        .umb-form-check--radiobutton & {
-            border-radius: 100%;
-
-            &:before {
-                width: 10px;
-                height: 10px;
-                border-radius: 100%;
-                opacity: 0;
-                transform: scale(0);
-                transition: .15s ease-out;
-            }
-        }
-        // This only happens if state has the checkbox modifier
-        .umb-form-check--checkbox & {
-            &:before {
-                width: 0;
-                height: 0;
-                transition: .05s ease-out;
-            }
-        }
-    }
-
-    &__icon {
-        color: @white;
-        text-align: center;
-        font-size: 12px;
-        opacity: 0;
-        transition: .2s ease-out;
-
-        &:before {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            position: absolute;
-            top: 0;
-            right: 0;
-            left: 0;
-            bottom: 0;
-            margin: auto;
-        }
-    }
-
-    &.umb-form-check--disabled {
-        cursor: not-allowed !important;
-        opacity: 0.5;
-    }
-}

src/Umbraco.Web.UI.Client/src/less/components/umb-list.less

@@ -22,10 +22,6 @@ a.umb-list-item:focus {
     opacity: 0.6;
 }
 
-.umb-list-item--error {
-    color: @red;
-}
-
 .umb-list-item:hover .umb-list-checkbox,
 .umb-list-item--selected .umb-list-checkbox {
     opacity: 1;
@@ -38,4 +34,4 @@ a.umb-list-item:focus {
 
 .umb-list-checkbox--visible {
     opacity: 1;
-}
+}

src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less

@@ -261,7 +261,6 @@
 
 .umb-package-details {
     display: flex;
-    flex-flow: row wrap;
 }
 
 a.umb-package-details__back-link {
@@ -281,7 +280,6 @@ a.umb-package-details__back-link {
     flex: 1 1 auto;
     margin-right: 20px;
     width: calc(~'100%' - ~'@{sidebarwidth}' - ~'20px'); // Make sure that the main content area doesn't gets affected by inline styling
-    min-width: 500px;
 }
 
 .umb-package-details__sidebar {

src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less

@@ -17,10 +17,6 @@
     outline: none;
     text-decoration: none !important;
 }
-
-.umb-user-card.-selectable {
-    cursor: pointer;
-}
 .umb-user-card.-selected {
     &::before {
         content: "";
@@ -35,6 +31,7 @@
         box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
         pointer-events: none;
     }
+    
 }
 
 .umb-user-card__content {
@@ -47,18 +44,14 @@
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
+    cursor: pointer;
     max-width: 100%;
 }
 
 .umb-user-card__goToUser {
-    &:hover, &:focus {
-        text-decoration: none;
+    &:hover {
         .umb-user-card__name {
-            text-decoration: underline;
-            color: @ui-option-type-hover;
-        }
-        .umb-avatar {
-            border: 1px solid @ui-option-type-hover;
+        text-decoration: underline;
         }
     }
 }

src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less

@@ -1,81 +0,0 @@
-.umb-user-table {
-
-    .umb-user-table-col-avatar {
-        flex: 0 0 32px;
-        padding: 15px 0;
-    }
-    
-    .umb-table-cell a {
-        &:hover, &:focus {
-            .umb-avatar {
-                border: 1px solid @ui-option-type-hover;
-            }
-        }
-    }
-    
-    .umb-table-body .umb-table-cell.umb-table__name {
-        margin: 0;
-        padding: 0;
-        a {
-            display: flex;
-            padding: 6px 2px;
-            height: 42px;
-            span {
-                margin: auto 14px;
-            }
-        }
-    }
-    .umb-table-cell.umb-table__name a {
-        &:hover, &:focus {
-            text-decoration: underline;
-        }
-    }
-    
-    .umb-user-table-row {
-        cursor: default;
-        .umb-checkmark {
-            visibility: hidden;
-        }
-    }
-
-    .umb-user-table-row.-selectable {
-        cursor: pointer;
-        
-        
-    }
-    
-    &.-has-selection {
-        .umb-user-table-row.-selectable {
-            .umb-checkmark {
-                visibility: visible;
-            }
-        }
-    }
-    
-    .umb-user-table-row.-selectable:hover {
-        .umb-checkmark {
-            visibility: visible;
-        }
-    }
-    
-    .umb-user-table-row.-selected {
-        
-        .umb-checkmark {
-            visibility: visible;
-        }
-        
-        &::before {
-            content: "";
-            position: absolute;
-            z-index:1;
-            top: 1px;
-            left: 1px;
-            right: 1px;
-            bottom: 1px;
-            border: 2px solid @ui-selected-border;
-            box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
-            pointer-events: none;
-        }
-    }
-    
-}

src/Umbraco.Web.UI.Client/src/less/listview.less

@@ -30,7 +30,7 @@
             position: absolute;
             padding: 5px 8px;
             pointer-events: none;
-            top: 2px;
+            top: 0;
         }
 
         input[type="text"] {

src/Umbraco.Web.UI.Client/src/less/pages/login.less

@@ -13,25 +13,23 @@
     border: none;
     border-radius: 0;
     overflow-y: auto;
-    background-color: @blueNight;
+    background-color: @purple-d2;
 }
 
 .login-overlay__background-image {
     background-position: center center;
     background-repeat: no-repeat;
     background-size: cover;
-    background-image: url('../img/login.jpg');
     width: 100%;
     height: 100%;
     position: absolute;
+    opacity: 0.05;
 }
 
 .login-overlay__logo {
     position: absolute;
     top: 22px;
     left: 25px;
-    width: 30px;
-    height: 30px;
     z-index: 1;
 }
 

src/Umbraco.Web.UI.Client/src/less/property-editors.less

@@ -18,16 +18,7 @@
 
 	&-push {
 		float:right;
-    }
-
-    &--list{
-        float: left;
-    }
-
-    &__item{
-        line-height: 1;
-        margin: 0 0 5px;
-    }
+	}
 }
 
 .umb-property-editor-tiny {
@@ -78,11 +69,6 @@
 	}
 }
 
-.umb-property .alert {
-	border-radius: 3px;
-}
-
-
 
 //
 // Content picker
@@ -227,7 +213,7 @@
         margin: 24px 0 0;
         display: flex;
     }
-
+    
     &__input {
         width: 100%;
         &-wrap{

src/Umbraco.Web.UI.Client/src/less/sections.less

@@ -37,8 +37,7 @@ ul.sections>li>a::after {
 	height: 4px;
 	width: 100%;
 	background-color: @pinkLight;
-    position: absolute;
-    left: 0;
+	position: absolute;
 	bottom: -4px;
 	border-radius: 3px 3px 0 0;
 	opacity: 0;

src/Umbraco.Web.UI.Client/src/less/variables.less

@@ -41,8 +41,8 @@
 @purple-washed:		    #F6F3FD;
 
 // UI Colors
-@red-d1:                #F02E28;
-@red:                   #D42054;// updated 2019
+@red-d1:                #F02E28;// currently used for validation, and is hard coded inline in various html places :/
+@red:                   #D42054;// updated 2019 - should be used as validation! and is already in some cases like the .umb-validation-label
 @red-l1:			    #e22c60;// updated 2019
 @red-l2:			    #FE8B88;
 @red-l3:			    #FFB2B0;
@@ -508,7 +508,7 @@
 @warningBorder:           transparent;
 
 @errorText:               @white;
-@errorBackground:         @red;
+@errorBackground:         @red-d1;
 @errorBorder:             transparent;
 
 @successText:             @white;

src/Umbraco.Web.UI.Client/src/preview/preview.controller.js

@@ -113,12 +113,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.exitPreview = function () {
 
             var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" +  $scope.pageId;
-            
-            if(culture){
-                relativeUrl +='?culture='+ culture;
-            }
-            
+            var relativeUrl = "/" +  $scope.pageId +'?culture='+ culture;
             window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
         };
 

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js

@@ -10,7 +10,7 @@
 (function() {
     "use strict";
 
-    function DataTypePicker($scope, $filter, dataTypeResource, dataTypeHelper, contentTypeResource, localizationService, editorService) {
+    function DataTypePicker($scope, dataTypeResource, dataTypeHelper, contentTypeResource, localizationService, editorService) {
 
         var vm = this;
 
@@ -119,28 +119,13 @@
             $scope.model.itemDetails = null;
 
             if (vm.searchTerm) {
+                vm.showFilterResult = true;
                 vm.showTabs = false;
-
-                var regex = new RegExp(vm.searchTerm, "i");
-                vm.filterResult = {
-                    userConfigured: filterCollection(vm.userConfigured, regex),
-                    typesAndEditors: filterCollection(vm.typesAndEditors, regex)
-                };
             } else {
-                vm.filterResult = null;
+                vm.showFilterResult = false;
                 vm.showTabs = true;
             }
-        }
 
-        function filterCollection(collection, regex) {
-            return _.map(_.keys(collection), function (key) {
-                return {
-                    group: key,
-                    dataTypes: $filter('filter')(collection[key], function (dataType) {
-                        return regex.test(dataType.name) || regex.test(dataType.alias);
-                    })
-                }
-            });
         }
 
         function showDetailsOverlay(property) {
@@ -216,4 +201,4 @@
 
     angular.module("umbraco").controller("Umbraco.Editors.DataTypePickerController", DataTypePicker);
 
-})();
+})();

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html

@@ -79,13 +79,13 @@
                         </umb-tab-content>
                     </div>
                     <!-- FILTER RESULTS -->
-                    <div ng-if="vm.filterResult">
+                    <div ng-if="vm.showFilterResult">
                         <h5 class="-border-bottom -black"><localize key="contentTypeEditor_reuse"></localize></h5>
-                        <div ng-repeat="result in vm.filterResult.userConfigured">
-                            <div ng-if="result.dataTypes.length > 0">
-                                <h5>{{result.group}}</h5>
+                        <div ng-repeat="(key,value) in vm.userConfigured">
+                            <div ng-if="(value | filter:vm.searchTerm).length > 0">
+                                <h5>{{key}}</h5>
                                 <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-                                    <li ng-repeat="dataType in result.dataTypes | orderBy:'name'"
+                                    <li ng-repeat="dataType in value | orderBy:'name' | filter: vm.searchTerm"
                                         ng-mouseover="vm.showDetailsOverlay(dataType)"
                                         ng-click="vm.pickDataType(dataType)"
                                         class="-four-in-row">
@@ -101,11 +101,11 @@
                             </div>
                         </div>
                         <h5 class="-border-bottom -black"><localize key="contentTypeEditor_availableEditors"></localize></h5>
-                        <div ng-repeat="result in vm.filterResult.typesAndEditors">
-                            <div ng-if="result.dataTypes.length > 0">
-                                <h5>{{result.group}}</h5>
+                        <div ng-repeat="(key,value) in vm.typesAndEditors">
+                            <div ng-if="(value | filter:vm.searchTerm).length > 0">
+                                <h5>{{key}}</h5>
                                 <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-                                    <li ng-repeat="systemDataType in result.dataTypes | orderBy:'name'"
+                                    <li ng-repeat="systemDataType in value | orderBy:'name' | filter: vm.searchTerm"
                                         ng-mouseover="vm.showDetailsOverlay(systemDataType)"
                                         ng-click="vm.pickEditor(systemDataType)"
                                         class="-four-in-row">

src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html

@@ -2,10 +2,10 @@
 
     <div id="login" class="umb-modalcolumn umb-dialog" ng-class="{'show-validation': vm.loginForm.$invalid}" ng-cloak>
 
-        <div class="login-overlay__background-image" ng-style="{'background-image': 'url('+vm.backgroundImage+')'}"></div>
+        <div class="login-overlay__background-image" ng-if="vm.backgroundImage" ng-style="{'background-image':'url(' + vm.backgroundImage + ')'}"></div>
 
         <div class="login-overlay__logo">
-            <img src="assets/img/application/umbraco_logo_white.svg">
+            <img ng-src="assets/img/application/logo.png" ng-srcset="assets/img/application/logo@2x.png 2x, assets/img/application/logo@3x.png 3x">
         </div>
 
         <div ng-show="vm.invitedUser != null" class="umb-login-container">
@@ -37,11 +37,11 @@
                             <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
                             <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
                         </span>
-
+                        
                     </div>
 
                     <div class="flex justify-between items-center">
-                        <umb-button
+                        <umb-button 
                             type="submit"
                             button-style="success"
                             state="vm.invitedUserPasswordModel.buttonState"
@@ -58,7 +58,7 @@
 
                     <ng-form name="vm.avatarForm">
 
-                        <umb-progress-bar
+                        <umb-progress-bar 
                             style="max-width: 100px; margin-bottom: 5px;"
                             ng-show="vm.avatarFile.uploadStatus === 'uploading'"
                             progress="{{ vm.avatarFile.uploadProgress }}"
@@ -77,7 +77,7 @@
                             ngf-pattern="{{vm.avatarFile.acceptedFileTypes}}"
                             ngf-max-size="{{ vm.avatarFile.maxFileSize }}">
 
-                            <umb-avatar
+                            <umb-avatar 
                                 color="gray"
                                 size="xl"
                                 unknown-char="+"
@@ -94,7 +94,7 @@
                     <localize key="user_userinviteAvatarMessage"></localize>
                 </p>
                 <div class="flex justify-center items-center">
-                    <umb-button
+                    <umb-button 
                         type="button"
                         button-style="success"
                         label="Done"
@@ -102,7 +102,7 @@
                     </umb-button>
                 </div>
             </div>
-
+            
         </div>
         <div ng-show="vm.invitedUser == null && vm.inviteStep === 3" ng-if="vm.inviteStep === 3" class="umb-login-container">
             <div class="form">
@@ -169,7 +169,7 @@
                         </div>
 
                         <div class="flex justify-between items-center">
-                            <umb-button
+                            <umb-button 
                                 button-style="success"
                                 size="m"
                                 label-key="general_login"
@@ -261,4 +261,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>    

src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html

@@ -1,19 +0,0 @@
-<label class="checkbox umb-form-check umb-form-check--checkbox" ng-class="{ 'umb-form-check--disabled': disabled }">
-    <input type="checkbox"
-           id="{{vm.inputId}}"
-           name="{{vm.name}}"
-           value="{{vm.value}}"
-           class="umb-form-check__input"
-           val-server-field="{{vm.serverValidationField}}"
-           ng-model="vm.model"
-           ng-disabled="vm.disabled"
-           ng-required="vm.required"
-           ng-change="vm.callOnChange()"/>
-
-    <span class="umb-form-check__state" aria-hidden="true">
-        <span class="umb-form-check__check">
-            <i class="umb-form-check__icon icon-check"></i>
-        </span>
-    </span>
-    <span class="umb-form-check__text">{{vm.text}}</span>
-</label>

src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html

@@ -1,13 +0,0 @@
-<label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': disabled }">
-    <input type="radio" name="{{name}}"
-        value="{{value}}"
-        class="umb-form-check__input"
-        ng-model="model"
-        ng-disabled="disabled"
-        ng-required="required" />
-
-    <span class="umb-form-check__state" aria-hidden="true">
-        <span class="umb-form-check__check"></span>
-    </span>
-    <span class="umb-form-check__text">{{text}}</span>
-</label>

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

@@ -10,13 +10,10 @@
 
       <div class="umb-content-grid__content">
 
-        <a class="umb-content-grid__item-name"
-           ng-href="{{'#' + item.editPath}}"
-           ng-click="clickItemName(item, $event, $index)"
-           ng-class="{'-light': !item.published && item.updater != null}">
+        <div class="umb-content-grid__item-name" ng-click="clickItemName(item, $event, $index)" ng-class="{'-light': !item.published && item.updater != null}">
             <i class="umb-content-grid__icon {{ item.icon }}"></i>
             <span>{{ item.name }}</span>
-        </a>
+        </div>
 
         <ul class="umb-content-grid__details-list" ng-class="{'-light': !item.published && item.updater != null}">
             <li class="umb-content-grid__details-item" ng-if="item.state">

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

@@ -40,8 +40,7 @@
                     <i class="umb-table-body__icon umb-table-body__checkicon icon-check"></i>
                 </div>
                 <div class="umb-table-cell umb-table__name">
-                    <a title="{{ item.name }}" class="umb-table-body__link"
-                       ng-href="{{'#' + item.editPath}}"
+                    <a title="{{ item.name }}" class="umb-table-body__link" href=""
                        ng-click="vm.clickItem(item, $event)"
                        ng-bind="item.name">
                     </a>

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

@@ -46,7 +46,8 @@
 
                     if (data.language !== "undefined") {
                         var lang = vm.languages.filter(function (l) {
-                            return matchLanguageById(l, data.language);
+                            return matchLanguageById(l, data.language.Id);
+
                         });
                         if (lang.length > 0) {
                             vm.language = lang[0];
@@ -115,7 +116,6 @@
                     if(response.valid) {
 
                         vm.submitButtonState = "success";
-                        closeDialog();
 
                     // show validation messages for each domain
                     } else {

src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js

@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function PublishController($scope, localizationService, contentEditingHelper) {
+    function PublishController($scope, localizationService) {
 
         var vm = this;
         vm.loading = true;
@@ -14,51 +14,34 @@
 
         /** Returns true if publishing is possible based on if there are un-published mandatory languages */
         function canPublish() {
-            
-            var possible = false;
+            var selected = [];
             for (var i = 0; i < vm.variants.length; i++) {
                 var variant = vm.variants[i];
-                var state = canVariantPublish(variant);
-                if (state === true) {
-                    possible = true;
-                }
-                if (state === false) {
+
+                //if this variant will show up in the publish-able list
+                var publishable = dirtyVariantFilter(variant);
+                var published = !(variant.state === "NotCreated" || variant.state === "Draft");
+
+                if ((variant.language.isMandatory && !published) && (!publishable || !variant.publish)) {
+                    //if a mandatory variant isn't published
+                    //and it's not publishable or not selected to be published
+                    //then we cannot continue
+
+                    // TODO: Show a message when this occurs
                     return false;
                 }
+
+                if (variant.publish) {
+                    selected.push(variant.publish);
+                }
             }
-            return possible;
-        }
-        
-        /** Returns true if publishing is possible based on if the variant is a un-published mandatory language */
-        function canVariantPublish(variant) {
-            
-            //if this variant will show up in the publish-able list
-            var publishable = dirtyVariantFilter(variant);
-            var published = !(variant.state === "NotCreated" || variant.state === "Draft");
-            
-            // is this variant mandatory:
-            if (variant.language.isMandatory && !published && !variant.publish) {
-                //if a mandatory variant isn't published or set to be published
-                //then we cannot continue
-                
-                return false;
-            }
-            
-            // is this variant selected for publish:
-            if (variant.publish === true) {
-                return publishable;
-            }
-            
-            return null;
+            return selected.length > 0;
         }
 
         function changeSelection(variant) {
-            
             $scope.model.disableSubmitButton = !canPublish();
             //need to set the Save state to true if publish is true
             variant.save = variant.publish;
-            
-            variant.willPublish = canVariantPublish(variant);
         }
 
         function dirtyVariantFilter(variant) {
@@ -116,49 +99,32 @@
 
             _.each(vm.variants,
                 function (variant) {
-                    if(variant.state === "NotCreated") {
-                        vm.isNew = true;
+                    if(variant.state !== "NotCreated"){
+                        vm.isNew = false;
                     }
-                }
-            );
+                });
 
             _.each(vm.variants,
                 function (variant) {
-                    variant.compositeId = contentEditingHelper.buildCompositeVariantId(variant);
+                    variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
                     variant.htmlId = "_content_variant_" + variant.compositeId;
-                    
-                    // reset to not be published
-                    variant.publish = false;
-                    variant.save = false;
 
                     //check for pristine variants
                     if (!vm.hasPristineVariants) {
                         vm.hasPristineVariants = pristineVariantFilter(variant);
                     }
-                    
-                    // If the variant havent been created jet.
-                    if(variant.state === "NotCreated") {
-                        // If the variant is mandatory, then set the variant to be published.
-                        if (variant.language.isMandatory === true) {
-                            variant.publish = true;
-                            variant.save = true;
-                        }
-                    }
-                    
-                    variant.canPublish = dirtyVariantFilter(variant);
-                    
-                    // if we have data on this variant.
-                    if(variant.canPublish && hasAnyData(variant)) {
-                        // and if some varaints havent been saved before, or they dont have a publishing date set, then we set it for publishing.
+
+                    if(hasAnyData(variant)){
                         if(vm.isNew || variant.publishDate == null){
                             variant.publish = true;
                             variant.save = true;
                         }
+                    }else{
+                        variant.publish = false;
+                        variant.save = false;
+                        variant.canSave = false;
                     }
-                    
-                    variant.willPublish = canVariantPublish(variant);
-                }
-            );
+                });
 
             if (vm.variants.length !== 0) {
                 //now sort it so that the current one is at the top
@@ -187,6 +153,7 @@
 
             localizationService.localize(labelKey).then(function (value) {
                 vm.headline = value;
+
                 vm.loading = false;
             });
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html

@@ -10,7 +10,7 @@
 
     <div class="umb-list umb-list--condensed" ng-if="!vm.loading">
 
-        <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter track by variant.compositeId" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid || (variant.notifications | filter:{type:1}).length > 0}">
+        <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter track by variant.compositeId">
             <ng-form name="publishVariantSelectorForm">
                 <div class="flex">
                     <input id="{{variant.htmlId}}"
@@ -18,26 +18,24 @@
                            type="checkbox"
                            ng-model="variant.publish"
                            ng-change="vm.changeSelection(variant)"
-                           ng-disabled="(variant.canPublish === false)"
+                           ng-disabled="(vm.isNew && variant.language.isMandatory) || (variant.canSave === false)"
                            style="margin-right: 8px;"
                            val-server-field="{{variant.htmlId}}" />
                     <div>
                         <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                             <span>{{ variant.language.name }}</span>
-                            <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
 
                             <span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-if="variant.language.isMandatory"> - </span>
-                                <span ng-if="variant.language.isMandatory" ng-class="{'text-error': (variant.language.isMandatory && variant.willPublish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
+                                <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                             </span>
 
                             <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                                <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
 
                             <span class="db" ng-repeat="notification in variant.notifications">
-                                <span class="db umb-permission__description" ng-class="{'text-success': notification.type === 3, 'text-error': notification.type !== 3}">{{notification.message}}</span>
+                                <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
                             </span>
                         </label>
                     </div>
@@ -65,7 +63,7 @@
                 </div>
 
                 <div ng-repeat="notification in variant.notifications">
-                    <div class="umb-permission__description text-success">{{notification.message}}</div>
+                    <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
                 </div>
 
             </div>

src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html

@@ -22,13 +22,11 @@
             <p><localize key="content_publishDescendantsWithVariantsHelp"></localize></p>
         </div>
 
-        <div style="margin-bottom: 15px;" class="flex">
-
-            <umb-checkbox
-                input-id="includeUnpublishedSelector"
-                model="model.includeUnpublished" />
-
-            <label for="includeUnpublishedSelector">
+        <div style="margin-bottom: 15px;">
+            <label>
+                <input type="checkbox"
+                       ng-model="model.includeUnpublished"
+                       style="margin-right: 8px;" />
                 <localize key="content_includeUnpublished"></localize>
             </label>
         </div>
@@ -42,14 +40,13 @@
             <div class="umb-list-item umb-list--condensed" ng-repeat="variant in vm.variants">
                 <ng-form name="publishVariantSelectorForm">
                     <div class="flex">
-
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="publishVariantSelector"
-                            model="variant.publish"
-                            on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"/>
-
+                        <input id="{{variant.htmlId}}"
+                               name="publishVariantSelector"
+                               type="checkbox"
+                               ng-model="variant.publish"
+                               ng-change="vm.changeSelection(variant)"
+                               style="margin-right: 8px;"
+                               val-server-field="{{variant.htmlId}}" />
                         <div>
                             <label for="{{variant.htmlId}}" style="margin-bottom: 0;">
                                 <span>{{ variant.language.name }}</span>
@@ -60,11 +57,11 @@
                                 </span>
 
                                 <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                    <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                                    <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                                 </span>
 
                                 <span class="db" ng-repeat="notification in variant.notifications">
-                                    <span class="db umb-permission__description text-success">{{notification.message}}</span>
+                                    <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
                                 </span>
                             </label>
                         </div>

src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js

@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function SaveContentController($scope, localizationService, contentEditingHelper) {
+    function SaveContentController($scope, localizationService) {
 
         var vm = this;
         vm.loading = true;
@@ -75,7 +75,7 @@
 
             _.each(vm.variants,
                 function (variant) {
-                    variant.compositeId = contentEditingHelper.buildCompositeVariantId(variant);
+                    variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
                     variant.htmlId = "_content_variant_" + variant.compositeId;
 
                     //check for pristine variants

src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html

@@ -6,27 +6,24 @@
         <umb-load-indicator></umb-load-indicator>
     </div>
 
-    <div ng-if="!vm.loading">
+
+    <div ng-if="vm.isNew && !vm.loading">
         <div style="margin-bottom: 15px;">
-            <p>
-                <localize ng-if="!vm.isNew" key="content_languagesToSave"></localize>
-                <localize ng-if="vm.isNew" key="content_languagesToSaveForFirstTime"></localize>
-            </p>
+            <p><localize key="content_languagesToSaveForFirstTime"></localize></p>
         </div>
 
         <div class="umb-list umb-list--condensed">
 
-            <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter track by variant.compositeId">
+            <div class="umb-list-item" ng-repeat="variant in vm.variants">
                 <ng-form name="saveVariantSelectorForm">
                     <div class="flex">
-
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="saveVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"/>
-
+                        <input id="{{variant.htmlId}}"
+                               name="saveVariantSelector"
+                               type="checkbox"
+                               ng-model="variant.save"
+                               ng-disabled="vm.isNew"
+                               style="margin-right: 8px;"
+                               val-server-field="{{variant.htmlId}}" />
                         <div>
                             <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
@@ -37,11 +34,54 @@
                                 </span>
 
                                 <span class="db" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
-                                    <span class="db umb-permission__description text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
+                                    <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
                                 </span>
 
                                 <span class="db" ng-repeat="notification in variant.notifications">
-                                    <span class="db umb-permission__description text-success">{{notification.message}}</span>
+                                    <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
+                                </span>
+                            </label>
+                        </div>
+                    </div>
+
+                </ng-form>
+            </div>
+            <br/>
+        </div>
+    </div>
+
+    <div ng-if="!vm.isNew && !vm.loading">
+        <div style="margin-bottom: 15px;">
+            <p><localize key="content_languagesToSave"></localize></p>
+        </div>
+
+        <div class="umb-list umb-list--condensed">
+
+            <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter track by variant.compositeId">
+                <ng-form name="saveVariantSelectorForm">
+                    <div class="flex">
+                        <input id="{{variant.htmlId}}"
+                               name="saveVariantSelector"
+                               type="checkbox"
+                               ng-model="variant.save"
+                               ng-change="vm.changeSelection(variant)"
+                               style="margin-right: 8px;"
+                               val-server-field="{{variant.htmlId}}" />
+                        <div>
+                            <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
+                                <span>{{ variant.language.name }}</span>
+                                <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
+
+                                <span class="db" ng-if="!saveVariantSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                    <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                                </span>
+
+                                <span class="db" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
+                                    <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
+                                </span>
+
+                                <span class="db" ng-repeat="notification in variant.notifications">
+                                    <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
                                 </span>
                             </label>
                         </div>
@@ -54,10 +94,7 @@
 
         <div class="umb-list umb-list--condensed" ng-if="vm.hasPristineVariants">
             <div style="margin-bottom: 15px; font-weight: bold;">
-                <p>
-                    <localize ng-if="!vm.isNew" key="content_unmodifiedLanguages"></localize>
-                    <localize ng-if="vm.isNew" key="content_untouchedLanguagesForFirstTime"></localize>
-                </p>
+                <p><localize key="content_unmodifiedLanguages"></localize></p>
             </div>
 
             <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.pristineVariantFilter">
@@ -72,7 +109,7 @@
                     </div>
 
                     <div ng-repeat="notification in variant.notifications">
-                        <div class="umb-permission__description text-success">{{notification.message}}</div>
+                        <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
                     </div>
                 </div>
             </div>

src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js

@@ -1,7 +1,7 @@
 (function () {
     "use strict";
     
-    function ScheduleContentController($scope, $timeout, localizationService, dateHelper, userService, contentEditingHelper) {
+    function ScheduleContentController($scope, $timeout, localizationService, dateHelper, userService) {
 
         var vm = this;
 
@@ -45,7 +45,7 @@
 
                 _.each(vm.variants,
                     function (variant) {
-                        variant.compositeId = contentEditingHelper.buildCompositeVariantId(variant);
+                        variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
                         variant.htmlId = "_content_variant_" + variant.compositeId;
     
                         //check for pristine variants

src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html

@@ -87,13 +87,12 @@
             <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter">
                 <ng-form name="scheduleSelectorForm">
                     <div class="flex">
-
-                        <umb-checkbox
-                            input-id="{{'saveVariantSelector_' + variant.language.culture}}"
-                            name="saveVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"/>
-
+                        <input id="{{'saveVariantSelector_' + variant.language.culture}}"
+                               name="saveVariantSelector"
+                               type="checkbox"
+                               ng-model="variant.save"
+                               ng-change="vm.changeSelection(variant)"
+                               style="margin-right: 8px;" />
                         <div>
 
                             <label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px;">
@@ -167,11 +166,11 @@
                                    val-server-field="{{variant.htmlId}}" />
 
                             <div ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
-                                <div class="umb-permission__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
+                                <div class="umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
                             </div>
 
                             <div ng-repeat="notification in variant.notifications">
-                                <div class="umb-permission__description text-success">{{notification.message}}</div>
+                                <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
                             </div>
 
                         </div>

src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js

@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function SendToPublishController($scope, localizationService, contentEditingHelper) {
+    function SendToPublishController($scope, localizationService) {
 
         var vm = this;
         vm.loading = true;
@@ -25,7 +25,7 @@
             if (vm.variants.length !== 0) {
                 _.each(vm.variants,
                     function (variant) {
-                        variant.compositeId = contentEditingHelper.buildCompositeVariantId(variant);
+                        variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
                         variant.htmlId = "_content_variant_" + variant.compositeId;
                     });
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html

@@ -13,14 +13,13 @@
         <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.modifiedVariantFilter">
             <ng-form name="publishVariantSelectorForm">
                 <div class="flex">
-
-                    <umb-checkbox
-                        input-id="{{variant.htmlId}}"
-                        name="publishVariantSelector"
-                        model="variant.save"
-                        on-change="vm.changeSelection(variant)"
-                        server-validation-field="{{variant.htmlId}}"/>
-
+                    <input id="{{variant.htmlId}}"
+                           name="publishVariantSelector"
+                           type="checkbox"
+                           ng-model="variant.save"
+                           ng-change="vm.changeSelection(variant)"
+                           style="margin-right: 8px;"
+                           val-server-field="{{variant.htmlId}}" />
                     <div>
                         <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                             <span>{{ variant.language.name }}</span>
@@ -31,11 +30,11 @@
                             </span>
 
                             <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                                <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
 
                             <span class="db" ng-repeat="notification in variant.notifications">
-                                <span class="db umb-permission__description text-success">{{notification.message}}</span>
+                                <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
                             </span>
                         </label>
                     </div>

src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js

@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UnpublishController($scope, localizationService, contentEditingHelper) {
+    function UnpublishController($scope, localizationService) {
 
         var vm = this;
         var autoSelectedVariants = [];
@@ -23,7 +23,7 @@
 
             _.each(vm.variants,
                 function (variant) {
-                    variant.compositeId = contentEditingHelper.buildCompositeVariantId(variant);
+                    variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
                     variant.htmlId = "_content_variant_" + variant.compositeId;
                 });
 
@@ -57,7 +57,7 @@
             });
             $scope.model.disableSubmitButton = !firstSelected; //disable submit button if there is none selected
 
-            // if a mandatory variant is selected we want to select all other variants 
+            // if a mandatory variant is selected we want to selet all other variants 
             // and disable selection for the others
             if(selectedVariant.save && selectedVariant.language.isMandatory) {
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html

@@ -16,15 +16,14 @@
             <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.publishedVariantFilter">
                 <ng-form name="unpublishVariantSelectorForm">
                     <div class="flex">
-
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="unpublishVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            disabled="variant.disabled"
-                            server-validation-field="{{variant.htmlId}}"/>
-
+                        <input id="{{variant.htmlId}}"
+                                name="unpublishVariantSelector"
+                                type="checkbox"
+                                ng-model="variant.save"
+                                ng-change="vm.changeSelection(variant)"
+                                ng-disabled="variant.disabled"
+                                style="margin-right: 8px;"
+                                val-server-field="{{variant.htmlId}}" />
                         <div>
                             <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>

src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js

@@ -22,7 +22,7 @@ function startUpVideosDashboardController($scope, dashboardResource) {
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupVideosController", startUpVideosDashboardController);
 
 
-function startUpDynamicContentController($q, $timeout, $scope, dashboardResource, assetsService, tourService, eventsService) {
+function startUpDynamicContentController($timeout, $scope, dashboardResource, assetsService, tourService, eventsService) {
     var vm = this;
     var evts = [];
 

src/Umbraco.Web.UI.Client/src/views/languages/overview.html

@@ -16,7 +16,7 @@
             <umb-editor-sub-header>
 
                 <umb-editor-sub-header-content-left>
-                    <umb-button button-style="action"
+                    <umb-button button-style="success"
                                 type="button"
                                 action="vm.addLanguage()"
                                 label-key="languages_addLanguage">

src/Umbraco.Web.UI.Client/src/views/logviewer/search.html

@@ -129,8 +129,8 @@
                                     <!-- Log Details (Exception & Properties) -->
                                     <tr ng-repeat-end ng-if="log.open">
                                         <td colspan="4">
-                                            <div ng-if="log.Exception" style="border-left:4px solid #D42054; padding:0 10px 10px 10px; box-shadow:rgba(0,0,0,0.07) 2px 2px 10px">
-                                                <h3 class="text-error">Exception</h3>
+                                            <div ng-if="log.Exception" style="border-left:4px solid #fe6561; padding:0 10px 10px 10px; box-shadow:rgba(0,0,0,0.07) 2px 2px 10px">
+                                                <h3 style="color:#fe6561;">Exception</h3>
                                                 <p style="white-space: pre-wrap;">{{ log.Exception }}</p>
                                             </div>
 

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

@@ -37,22 +37,18 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
             //check if it's already in sync
 
             //get the checked vals from the view model
-            var selectedVals = _.map(
-                _.filter($scope.selectedItems,
+            var selectedVals = _.map(_.filter($scope.selectedItems,
                     function(f) {
                         return f.checked;
-                    }
-                ),
+                    }),
                 function(m) {
                     return m.value;
-                }
-            );
+                });
             //get all of the same values between the arrays
             var same = _.intersection($scope.model.value, selectedVals);
             //if the lengths are the same as the value, then we are in sync, just exit
-
-            if (same.length === $scope.model.value.length === selectedVals.length) {
-                return;
+            if (same.length == $scope.model.value.length === selectedVals.length) {
+                return; 
             }
 
             $scope.selectedItems = [];
@@ -67,16 +63,19 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
             }
         }
 
-        function changed(model, value) {
+        function changed(item) {
+            var index = _.findIndex($scope.model.value,
+                function (v) {
+                    return v === item.val;
+                });
             
-            var index = $scope.model.value.indexOf(value);
-            
-            if (model) {
+            if (item.checked) {
                 //if it doesn't exist in the model, then add it
                 if (index < 0) {
-                    $scope.model.value.push(value);
+                    $scope.model.value.push(item.val);
                 }
-            } else {
+            }
+            else {
                 //if it exists in the model, then remove it
                 if (index >= 0) {
                     $scope.model.value.splice(index, 1);

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

@@ -1,7 +1,16 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController">
+
     <ul class="unstyled">
         <li ng-repeat="item in selectedItems track by item.key">
-            <umb-checkbox name="{{model.alias}}" value="{{item.val}}" model="item.checked" text="{{item.val}}" on-change="changed(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
+            <label class="checkbox">
+                <input type="checkbox" name="checkboxlist"
+                       value="{{item.value}}"
+                       ng-model="item.checked"
+                       ng-change="changed(item)"
+                       ng-required="model.validation.mandatory && !model.value.length" />
+                {{item.val}}
+            </label>
         </li>
     </ul>
+
 </div>

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

@@ -122,25 +122,24 @@ angular.module("umbraco")
             },
 
             over: function (event, ui) {
-                
-                var area = event.target.getScope_HackForSortable().area;
+                var area = $(event.target).scope().area;
                 var allowedEditors = area.allowed;
-                
-                if (($.inArray(ui.item[0].getScope_HackForSortable().control.editor.alias, allowedEditors) < 0 && allowedEditors) ||
+
+                if (($.inArray(ui.item.scope().control.editor.alias, allowedEditors) < 0 && allowedEditors) ||
                         (startingArea != area && area.maxItems != '' && area.maxItems > 0 && area.maxItems < area.controls.length + 1)) {
 
                     $scope.$apply(function () {
-                        event.target.getScope_HackForSortable().area.dropNotAllowed = true;
+                        $(event.target).scope().area.dropNotAllowed = true;
                     });
 
                     ui.placeholder.hide();
                     cancelMove = true;
                 }
                 else {
-                    if (event.target.getScope_HackForSortable().area.controls.length == 0){
+                    if ($(event.target).scope().area.controls.length == 0){
 
                         $scope.$apply(function () {
-                            event.target.getScope_HackForSortable().area.dropOnEmpty = true;
+                            $(event.target).scope().area.dropOnEmpty = true;
                         });
                         ui.placeholder.hide();
                     } else {
@@ -152,9 +151,8 @@ angular.module("umbraco")
 
             out: function(event, ui) {
                 $scope.$apply(function () {
-                    var dropArea = event.target.getScope_HackForSortable().area;
-                    dropArea.dropNotAllowed = false;
-                    dropArea.dropOnEmpty = false;
+                    $(event.target).scope().area.dropNotAllowed = false;
+                    $(event.target).scope().area.dropOnEmpty = false;
                 });
             },
 
@@ -180,9 +178,10 @@ angular.module("umbraco")
                 currentForm.$setDirty();
             },
 
-            start: function (event, ui) {
+            start: function (e, ui) {
+
                 //Get the starting area for reference
-                var area = event.target.getScope_HackForSortable().area;
+                var area = $(e.target).scope().area;
                 startingArea = area;
 
                 // fade out control when sorting
@@ -208,7 +207,7 @@ angular.module("umbraco")
                 });
             },
 
-            stop: function (event, ui) {
+            stop: function (e, ui) {
 
                 // Fade in control when sorting stops
                 ui.item[0].style.opacity = "1";
@@ -237,7 +236,7 @@ angular.module("umbraco")
 
                 $scope.$apply(function () {
 
-                    var cell = event.target.getScope_HackForSortable().area;
+                    var cell = $(e.target).scope().area;
                     cell.hasActiveChild = hasActiveChild(cell, cell.controls);
                     cell.active = false;
                 });

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

@@ -1,25 +0,0 @@
-(function () {
-    "use strict";
-
-    function umbGridHackScope() {
-        
-        function link($scope, $element) {
-            
-            // Since the grid used the el.scope() method, which should only be used by debugging, and only are avilable in debug-mode. I had to make a replica method doig the same:
-            $element[0].getScope_HackForSortable = function() {
-                return $scope;
-            }
-        }
-        
-        var directive = {
-            restrict: "A",
-            link: link
-        };
-
-        return directive;
-
-    }
-    
-    angular.module("umbraco").directive("umbGridHackScope", umbGridHackScope);
-
-})();