From db385bbf17b042d49812ca4e75a4312954d9a0f4 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 27 Aug 2018 15:53:56 +0200
Subject: [PATCH] make umb-variant-state directive reusable + reuse in
 umb-editor-header

---
 .../views/components/content/umb-variant-state.html  | 12 ++++++------
 .../views/components/editor/umb-editor-header.html   |  9 +--------
 .../src/views/content/overlays/publish.html          |  2 +-
 .../src/views/content/overlays/save.html             |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html
index 3a41f0623d..6b1d5af89e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html
@@ -1,6 +1,6 @@
-<div ng-switch="vm.variant.state">
-    <div class="umb-permission__description" ng-switch-when="NotCreated"><localize key="content_notCreated"></localize></div>
-    <div class="umb-permission__description" ng-switch-when="Draft"><localize key="content_unpublished"></localize></div>
-    <div class="umb-permission__description" ng-switch-when="PublishedPendingChanges"><localize key="content_publishedPendingChanges"></localize></div>
-    <div class="umb-permission__description" ng-switch-when="Published"><localize key="content_published"></localize></div>
-</div>
+<span ng-switch="vm.variant.state">
+    <span ng-switch-when="NotCreated"><localize key="content_notCreated"></localize></span>
+    <span ng-switch-when="Draft"><localize key="content_unpublished"></localize></span>
+    <span ng-switch-when="PublishedPendingChanges"><localize key="content_publishedPendingChanges"></localize></span>
+    <span ng-switch-when="Published"><localize key="content_published"></localize></span>
+</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index 0914346189..d4a540892e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -60,16 +60,9 @@
                         <umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active}" ng-repeat="variant in variants">
                             <a href="" class="umb-variant-switcher__name-wrapper" ng-click="selectVariant($event, variant)" prevent-default>
                                 <span class="umb-variant-switcher__name">{{variant.language.name}}</span>
-                                <span ng-switch="variant.state">
-                                    <span class="umb-variant-switcher__state" ng-switch-when="NotCreated"><localize key="content_notCreated"></localize></span>
-                                    <span class="umb-variant-switcher__state" ng-switch-when="Draft"><localize key="content_unpublished"></localize></span>
-                                    <span class="umb-variant-switcher__state" ng-switch-when="PublishedPendingChanges"><localize key="content_publishedPendingChanges"></localize></span>
-                                    <span class="umb-variant-switcher__state" ng-switch-when="Published"><localize key="content_published"></localize></span>
-                                </span>
+                                <umb-variant-state variant="variant" class="umb-variant-switcher__state"></umb-variant-state>
                             </a>
-
                             <div ng-if="splitViewOpen !== true" class="umb-variant-switcher__split-view" ng-click="openInSplitView($event, variant)">Open in split view</div>
-
                         </umb-dropdown-item>
                     </umb-dropdown>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 46ad4e7299..b49046feac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -28,7 +28,7 @@
                         </label>
 
                         <div ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid">
-                            <umb-variant-state variant="variant"></umb-variant-state>
+                            <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
                         </div>
 
                         <div ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
index 0515bd878e..dbe4c8fe24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -28,7 +28,7 @@
                         </label>
 
                         <div ng-if="!saveVariantSelectorForm.saveVariantSelector.$invalid">
-                            <umb-variant-state variant="variant"></umb-variant-state>
+                            <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
                         </div>
 
                         <div ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>