Merge remote-tracking branch 'origin/v8/8.17' into v9/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
#	src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
#	src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
#	src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
#	src/Umbraco.Web/PropertyEditors/NestedContentController.cs

Author: bergmania

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>

src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html

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

src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html

@@ -1,5 +1,5 @@
 <div class="form-horizontal" ng-controller="Umbraco.Editors.Media.Apps.ContentController as vm">
-    
+
     <umb-editor-tab-bar ng-if="vm.tabs.length > 0">
         <umb-tabs-nav tabs="vm.tabs" on-tab-change="vm.setActiveTab(tab)"></umb-tabs-nav>
     </umb-editor-tab-bar>
@@ -16,12 +16,13 @@
             </umb-property>
         </umb-box-content>
     </umb-box>
-    
-    <div 
+
+    <div
         class="umb-group-panel"
         data-element="group-{{group.alias}}"
         ng-repeat="group in content.tabs | filter: { hide : '!' + true } track by group.id"
-        ng-show="(group.parentAlias === vm.activeTabAlias && group.type === 'Group') || vm.tabs.length === 0">
+        ng-if="group.type === 'Group'"
+        ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
 
         <div class="umb-group-panel__header">
             <div>{{ group.label }}</div>

src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html

@@ -17,20 +17,21 @@
         </umb-box-content>
     </umb-box>
 
-    <div 
+    <div
     class="umb-group-panel"
     data-element="group-{{group.alias}}"
     ng-repeat="group in content.tabs"
-    ng-show="(group.parentAlias === vm.activeTabAlias && group.type === 'Group') || vm.tabs.length === 0">
+    ng-if="group.type === 'Group'"
+    ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
 
         <div class="umb-group-panel__header">
             <div>{{ group.label }}</div>
         </div>
 
         <div class="umb-group-panel__content" data-element="tab-content-{{group.type === 'Group' ? group.parentAlias : group.alias}}">
-            <umb-property 
-                data-element="property-{{group.alias}}" 
-                ng-repeat="property in group.properties | filter:vm.hideSystemProperties track by property.alias" 
+            <umb-property
+                data-element="property-{{group.alias}}"
+                ng-repeat="property in group.properties | filter:vm.hideSystemProperties track by property.alias"
                 property="property">
 
                 <umb-property-editor model="property"></umb-property-editor>

src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html

@@ -1 +1 @@
-<input name="hidden" type="hidden" ng-model="model.value" name="{{model.alias}}" /> 
+<input name="hidden" type="hidden" ng-model="model.value" id="{{model.alias}}" />

src/Umbraco.Web.UI/umbraco/config/lang/nl.xml

@@ -2337,6 +2337,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
       <key alias="confirmCancelBlockCreationMessage"><![CDATA[Ben je zeker dat je deze wijzigingen wil verwerpen?]]></key>
       <key alias="elementTypeDoesNotExistHeadline">Fout!</key>
       <key alias="elementTypeDoesNotExistDescription">Het Elementtype van dit blok bestaat niet meer</key>
+      <key alias="addBlock">Inhoud toevoegen</key>
       <key alias="propertyEditorNotSupported">Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in blokken.</key>
     </area>
   <area alias="contentTemplatesDashboard">