Merge remote-tracking branch 'origin/v9/dev' into v9/feature/language-keys-cleanup

# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml

Author: bergmania

src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs

@@ -1558,7 +1558,15 @@ public IReadOnlyList<ITemplate> ImportTemplates(IReadOnlyCollection<XElement> te
                 var masterElement = templateElement.Element("Master");
 
                 var existingTemplate = _fileService.GetTemplate(alias) as Template;
+
                 var template = existingTemplate ?? new Template(_shortStringHelper, templateName, alias);
+
+                // For new templates, use the serialized key if avaialble.
+                if (existingTemplate == null && Guid.TryParse(templateElement.Element("Key")?.Value, out var key))
+                {
+                    template.Key = key;
+                }
+
                 template.Content = design;
 
                 if (masterElement != null && string.IsNullOrEmpty((string)masterElement) == false)

src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Xml.Linq;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Serialization;
@@ -319,6 +317,7 @@ public XElement Serialize(ITemplate template)
         {
             var xml = new XElement("Template");
             xml.Add(new XElement("Name", template.Name));
+            xml.Add(new XElement("Key", template.Key));
             xml.Add(new XElement("Alias", template.Alias));
             xml.Add(new XElement("Design", new XCData(template.Content)));
 

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.js

@@ -19,7 +19,7 @@ context('User Groups', () => {
 
     // Assign sections
     cy.get('.umb-box:nth-child(1) .umb-property:nth-child(1) localize').click();
-    cy.get('.umb-tree-item span').click({multiple:true});
+    cy.get('.umb-tree-item__inner').click({multiple:true, timeout: 10000});
     cy.get('.btn-success').last().click();
 
     // Save

src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs

@@ -327,7 +327,7 @@ public void Export_Xml()
                 Assert.Multiple(() =>
                 {
                     Assert.AreEqual("umbPackage", xml.Root.Name.ToString());
-                    Assert.AreEqual($"<Templates><Template><Name>Text page</Name><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
+                    Assert.AreEqual($"<Templates><Template><Name>Text page</Name><Key>{template.Key}</Key><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
                     Assert.IsNull(xml.DocumentType);
                     Assert.IsNull(xml.Parent);
                     Assert.IsNull(xml.NextNode);

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs

@@ -233,6 +233,34 @@ public void Can_Import_Single_Template()
             Assert.That(templates, Is.Not.Null);
             Assert.That(templates.Any(), Is.True);
             Assert.That(templates.Count(), Is.EqualTo(1));
+
+            var template = templates.First();
+            Assert.AreEqual(template.Name, "Articles");
+        }
+
+        [Test]
+        public void Can_Import_Single_Template_With_Key()
+        {
+            // Arrange
+            string strXml = ImportResources.StandardMvc_Package;
+            var xml = XElement.Parse(strXml);
+            XElement element = xml.Descendants("Templates").First();
+
+            var firstTemplateElement = element.Elements("Template").First();
+            var key = Guid.NewGuid();
+            firstTemplateElement.Add(new XElement("Key", key));
+
+            // Act
+            IEnumerable<ITemplate> templates = PackageDataInstallation.ImportTemplate(firstTemplateElement, 0);
+
+            // Assert
+            Assert.That(templates, Is.Not.Null);
+            Assert.That(templates.Any(), Is.True);
+            Assert.That(templates.Count(), Is.EqualTo(1));
+
+            var template = templates.First();
+            Assert.AreEqual(template.Name, "Articles");
+            Assert.AreEqual(template.Key, key);
         }
 
         [Test]

src/Umbraco.Web.Common/Umbraco.Web.Common.csproj

@@ -35,8 +35,8 @@
       <PackageReference Include="NETStandard.Library" Version="2.0.3" />
       <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
       <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.3" />
-      <PackageReference Include="Smidge.Nuglify" Version="4.0.0-beta.376" />
-      <PackageReference Include="Smidge.InMemory" Version="4.0.0-beta.376" />
+      <PackageReference Include="Smidge.Nuglify" Version="4.0.0" />
+      <PackageReference Include="Smidge.InMemory" Version="4.0.0" />
       <PackageReference Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
       <PackageReference Include="Umbraco.Code" Version="1.2.0">
         <PrivateAssets>all</PrivateAssets>

src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less

@@ -45,15 +45,15 @@
 
     &.ui-sortable-handle,
     .ui-sortable-handle,
-    .handle
-    {
+    .handle {
         cursor: move;
     }
 
-    i {
+    .umb-icon,
+    i.icon {
         display: flex;
-        align-items: center;
-        margin-right: 5px
+        align-self: center;
+        margin-right: 5px;
     }
 
     a {

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

@@ -97,7 +97,8 @@
 
     .icon,
     .umb-icon {
-        font-size: 1.2rem;
+        font-size: 0.9rem;
+        line-height: 1;
     }
 
     &__state {
@@ -110,6 +111,8 @@
 
     &__check {
         display: flex;
+        align-items: center;
+        justify-content: center;
         position: relative;
         background: @white;
         border: 1px solid @inputBorder;

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

@@ -565,12 +565,11 @@
 // ICONS
 // -------------------------
 .umb-grid .iconBox {
-    padding: 4px 6px;
-    display: inline-block;
-    cursor: pointer;
+    padding: 6px;
+    display: flex;
     border-radius: 200px;
     border: 1px solid @ui-action-discreet-border;
-    margin: 2px;
+    margin: 0 auto;
 
     &:hover, &:hover * {
         background: @ui-action-discreet-type-hover !important;
@@ -599,8 +598,6 @@
     -webkit-appearance: none;
     background-image: linear-gradient(to bottom,@gray-9,@gray-7);
     background-repeat: repeat-x;
-    zoom: 1;
-    border-color: @gray-7 @gray-7 @gray-6;
     border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
     box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
     border-radius: 3px;

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

@@ -29,7 +29,8 @@
             data-app-anchor="{{group.id}}"
             data-element="group-{{group.alias}}"
             ng-repeat="group in content.tabs track by group.key"
-            ng-show="(group.parentAlias === activeTabAlias && group.type === 'Group') || tabs.length === 0">
+            ng-if="group.type === 'Group'"
+            ng-show="group.parentAlias === activeTabAlias || tabs.length === 0">
 
             <div class="umb-group-panel__header">
                 <div id="group-{{group.id}}">{{ group.label }}</div>