From afcabddb0d5ea19e0768e5f9e67d5ba3010084a1 Mon Sep 17 00:00:00 2001 From: Raphael Gauthier Date: Thu, 4 Jun 2020 17:51:30 +0200 Subject: [PATCH] Fixes #17436: Empty footer in sidebar --- .../plugins/branding/snippet/CommonBranding.scala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/branding/src/main/scala/com/normation/plugins/branding/snippet/CommonBranding.scala b/branding/src/main/scala/com/normation/plugins/branding/snippet/CommonBranding.scala index 2a0ec41b7..9697e6bdf 100644 --- a/branding/src/main/scala/com/normation/plugins/branding/snippet/CommonBranding.scala +++ b/branding/src/main/scala/com/normation/plugins/branding/snippet/CommonBranding.scala @@ -80,10 +80,14 @@ class CommonBranding(val status: PluginStatus)(implicit val ttag: ClassTag[Commo case Full(d) => ( d.wideLogo.commonWideLogo , d.smallLogo.commonSmallLogo - , - {if(d.wideLogo.enable && d.wideLogo.data.isDefined ) Rudder else NodeSeq.Empty} - {if(d.smallLogo.enable && d.smallLogo.data.isDefined) Rudder else NodeSeq.Empty} - + , {if((d.wideLogo.enable && d.wideLogo.data.isDefined) || (d.smallLogo.enable && d.smallLogo.data.isDefined)) { + + {if (d.wideLogo.enable && d.wideLogo.data.isDefined) Rudder else NodeSeq.Empty} + {if (d.smallLogo.enable && d.smallLogo.data.isDefined) Rudder else NodeSeq.Empty} + + }else{ + NodeSeq.Empty + }} ) case _ => ( Rudder