From 485c1fbf6c5c608c5a8722701f13cf86106a8078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 12 Mar 2019 10:14:25 +0100
Subject: [PATCH] use existing notifications for warnings

---
 .../src/views/content/overlays/publish.html          | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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 828f1081d7..e92c16f0ef 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
@@ -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.warnings && variant.warnings.length > 0)}">
+        <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}">
             <ng-form name="publishVariantSelectorForm">
                 <div class="flex">
                     <input id="{{variant.htmlId}}"
@@ -26,14 +26,10 @@
                             <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) && !(variant.warnings && variant.warnings.length > 0)">
+                            <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-style="{'color': (variant.language.isMandatory && variant.willPublish === false) ? '#F02E28' : 'inherit' }"><localize key="languages_mandatoryLanguage"></localize></span>
-                            </span>
-
-                            <span class="db" ng-repeat="warning in variant.warnings">
-                                <span class="db umb-permission__description" style="color: #F02E28;">{{warning.message}}</span>
+                                <span ng-if="variant.language.isMandatory" ng-class="{'text-error': (variant.language.isMandatory && variant.willPublish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
                             </span>
 
                             <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
@@ -41,7 +37,7 @@
                             </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" ng-class="{'text-success': notification.type === 3, 'text-error': notification.type !== 3}">{{notification.message}}</span>
                             </span>
                         </label>
                     </div>