From a45ed3559bf1d02e179f3953a5f05e015c8dd388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 10 May 2019 14:26:36 +0200
Subject: [PATCH] new localization key + umb-property__stickers

---
 src/Umbraco.Web.UI.Client/src/less/forms.less | 13 +++++++++
 src/Umbraco.Web.UI.Client/src/less/main.less  |  2 +-
 .../src/less/property-editors.less            | 27 +++++++++----------
 .../components/property/umb-property.html     |  9 ++++---
 .../views/components/umb-groups-builder.html  |  3 +--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  3 ++-
 .../Umbraco/config/lang/en_us.xml             |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/es.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml |  1 +
 .../Umbraco/config/lang/zh_tw.xml             |  1 +
 16 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 966fc1fb11..4594af8fcd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -744,6 +744,10 @@ legend + .control-group {
   -webkit-margin-top-collapse: separate;
 }
 
+.umb-property__stickers {
+  margin-bottom:10px;
+}
+
 // Horizontal-specific styles
 // --------------------------
 
@@ -767,6 +771,11 @@ legend + .control-group {
       *padding-left: @horizontalComponentOffset;
     }
   }
+  
+  .umb-property__stickers {
+    margin-left: @horizontalComponentOffset;
+    margin-bottom:2px;
+  }
 
  
   // Remove bottom margin on block level help text since that's accounted for on .control-group
@@ -814,6 +823,10 @@ legend + .control-group {
   .form-horizontal .controls {
     margin-left: 0;
   }
+  .form-horizontal .umb-property__stickers {
+    margin-left: 0;
+    margin-bottom:10px;
+  }
 
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 4af01eb47f..2208e9a5d5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -222,7 +222,7 @@ label:not([for]) {
    padding-top: 0;
 }
 
-.hidelabel > div > .controls-row, .hidelabel > .controls-row, .hidelabel > div > .controls {
+.hidelabel > div > .controls-row, .hidelabel > .controls-row, .hidelabel > div > .controls, .hidelabel > div > .umb-property__stickers {
   padding: 0;
   border: none;
   margin: 0 !important;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 8d7dbb74ac..1fd99ad563 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -60,18 +60,15 @@
 	}
     
     .umb-property__inheriting-from-default {
-        display: none;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        background-color: @gray;
-        color: white;
-        padding: 10px 20px;
+        background-color: @inputBorder;
+        padding: 4px 8px;
         border-radius: 3px;
-        z-index: 10;
-        margin-left: 85px;
-        margin-bottom: 20px;
+        transition: background-color 120ms;
+        
+        @media (min-width: 768px) {
+            border-bottom-left-radius: 0;
+            border-bottom-right-radius: 0;
+        }
     }
     &.--disabled {
         
@@ -89,11 +86,11 @@
         }
         
         &:hover {
-            .controls {
-                opacity: 0.1;
-            }
+            /*.controls {
+                opacity: 0.3;
+            }*/
             .umb-property__inheriting-from-default {
-                display: block;
+                background-color: @inputBorderFocus;
             }
         }
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
index 6c8829460e..135ea0f63e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
@@ -17,12 +17,15 @@
 
                 </label>
 
+                <div class="umb-property__stickers">
+                    <small ng-if="showInherit" class="umb-property__inheriting-from-default" on-click="openDefaultVariant();">
+                        <localize key="contentTypeEditor_inheritedFrom" tokens="[inheritsFrom.language.name]" watchTokens="true"></localize>
+                    </small>
+                </div>
+
                 <div class="controls" ng-transclude>
                 </div>
 
-                <small ng-if="showInherit" class="umb-property__inheriting-from-default" on-click="openDefaultVariant(inheritsFrom);">
-                    <localize key="contentTypeEditor_inheritedFrom" tokens="[inheritsFrom.language.name]" watchTokens="true"></localize>
-                </small>
             </div>
         </div>
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 026b0637c7..b19312196a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -223,8 +223,7 @@
 
                                     <div class="umb-group-builder__property-tag" ng-if="property.inherited">
                                         <i class="icon icon-merge"></i>
-                                        <span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom"></localize></span>
-                                        {{property.contentTypeName}}
+                                        <span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom" tokens="[property.contentTypeName]"></localize></span>
                                     </div>
 
                                     <div class="umb-group-builder__property-tag" ng-if="property.locked">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 03f214f77e..ccb5235f9a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1281,6 +1281,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="noGroups">Du har ikke tilføjet nogle grupper</key>
     <key alias="addGroup">Tilføj gruppe</key>
     <key alias="inheritedFrom">Nedarvet fra %0%</key>
+    <key alias="invariantValueInheritedFrom">Arver indholdet fra %0%</key>
     <key alias="addProperty">Tilføj egenskab</key>
     <key alias="requiredLabel">Påkrævet label</key>
     <key alias="enableListViewHeading">Aktiver listevisning</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 23f36c0be5..e5609b0fa6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1545,7 +1545,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="group">Group</key>
     <key alias="noGroups">You have not added any groups</key>
     <key alias="addGroup">Add group</key>
-    <key alias="inheritedFrom">Inherited from %0%</key>
+    <key alias="inheritedFrom">Inherited from %0%</key>
+    <key alias="invariantValueInheritedFrom">Invariant value is obtained from %0%</key>
     <key alias="addProperty">Add property</key>
     <key alias="requiredLabel">Required label</key>
     <key alias="enableListViewHeading">Enable list view</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index cb42eaacce..b1be28a59a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1559,6 +1559,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="noGroups">You have not added any groups</key>
     <key alias="addGroup">Add group</key>
     <key alias="inheritedFrom">Inherited from %0%</key>
+    <key alias="invariantValueInheritedFrom">Invariant value is obtained from %0%</key>
     <key alias="addProperty">Add property</key>
     <key alias="requiredLabel">Required label</key>
     <key alias="enableListViewHeading">Enable list view</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index 699524a870..a75ec2fd65 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -1193,6 +1193,7 @@
     <key alias="compositions">Composiciones</key>
         <key alias="noGroups">No has añadido ninguna pestaña</key>
     <key alias="inheritedFrom">Heredado de %0%</key>
+    <key alias="invariantValueInheritedFrom">Heredado de %0%</key>
     <key alias="addProperty">Añadir propiedad</key>
     <key alias="requiredLabel">Etiqueta requerida</key>
     <key alias="enableListViewHeading">Activar vista de lista</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 54d87e191d..3a281199d3 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -1366,6 +1366,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="compositions">Compositions</key>
     <key alias="noGroups">Vous n'avez pas ajouté d'onglet</key>
     <key alias="inheritedFrom">Hérité de %0%</key>
+    <key alias="invariantValueInheritedFrom">Hérité de %0%</key>
     <key alias="addProperty">Ajouter une propriété</key>
     <key alias="requiredLabel">Label requis</key>
     <key alias="enableListViewHeading">Activer la vue en liste</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
index c8196ded67..15e2e2ddc0 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -926,6 +926,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="compositions">構成</key>
     <key alias="noGroups">タブが追加されていません</key>
     <key alias="inheritedFrom">次から継承: %0%</key>
+    <key alias="invariantValueInheritedFrom">次から継承: %0%</key>
     <key alias="addProperty">プロパティの追加</key>
     <key alias="requiredLabel">必要なラベル</key>
     <key alias="enableListViewHeading">リスト ビューの有効化</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index ac0c267304..4022fcd23a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -961,6 +961,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="noGroups">Er zijn nog geen groepen toegevoegd</key>
     <key alias="addGroup">Voeg groep toe</key>
     <key alias="inheritedFrom">Inherited van %0%</key>
+    <key alias="invariantValueInheritedFrom">Inherited van %0%</key>
     <key alias="addProperty">Voeg property toe</key>
     <key alias="requiredLabel">Verplicht label</key>
     <key alias="enableListViewHeading">Zet list view aan</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index 7e4e27236d..91589e4fc2 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -1172,6 +1172,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="compositions">Kompozycje</key>
     <key alias="noGroups">Nie dodałeś żadnych zakładek</key>
     <key alias="inheritedFrom">Odziedziczone z %0%</key>
+    <key alias="invariantValueInheritedFrom">Odziedziczone z %0%</key>
     <key alias="addProperty">Dodaj właściwość</key>
     <key alias="requiredLabel">Wymagana etykieta</key>
     <key alias="enableListViewHeading">Włącz widok listy</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index 3fb5fd071b..fd7469d286 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -268,6 +268,7 @@
     <key alias="compositions">Композиции</key>
     <key alias="noGroups">Вы не добавили ни одной вкладки</key>
     <key alias="inheritedFrom">Унаследовано от %0%</key>
+    <key alias="invariantValueInheritedFrom">Унаследовано от %0%</key>
     <key alias="addProperty">Добавить свойство</key>
     <key alias="requiredLabel">Обязательная метка</key>
     <key alias="enableListViewHeading">Представление в формате списка</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
index 5dfe2595cd..cabbcfaf3c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -972,6 +972,7 @@
     <key alias="compositions">组合</key>
     <key alias="noGroups">您没有添加任何选项卡</key>
     <key alias="inheritedFrom">继承自 %0%</key>
+    <key alias="invariantValueInheritedFrom">继承自 %0%</key>
     <key alias="addProperty">添加属性</key>
     <key alias="requiredLabel">必需的标签</key>
     <key alias="enableListViewHeading">启用列表视图</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index efee11fe74..5340bf16b2 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -959,6 +959,7 @@
     <key alias="compositions">組合</key>
     <key alias="noGroups">您沒有增加任何選項卡</key>
     <key alias="inheritedFrom">繼承的表格 %0%</key>
+    <key alias="invariantValueInheritedFrom">繼承的表格 %0%</key>
     <key alias="addProperty">增加屬性</key>
     <key alias="requiredLabel">必要標籤</key>
     <key alias="enableListViewHeading">允許清單檢視</key>