From 29666bf3b6b4eb0c5bb565d57782d1f5938de299 Mon Sep 17 00:00:00 2001
From: Philip Douglass <philip.douglass@amadeus.com>
Date: Thu, 9 Jul 2020 18:24:16 +0200
Subject: [PATCH 1/3] Remove white-space: pre-wrap from loginModalNotice

Signed-off-by: Philip Douglass <philip.douglass@amadeus.com>
---
 awx/ui/client/src/login/loginModal/loginModalNotice.block.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx/ui/client/src/login/loginModal/loginModalNotice.block.less b/awx/ui/client/src/login/loginModal/loginModalNotice.block.less
index 57cb035e8c..d5e6d4b517 100644
--- a/awx/ui/client/src/login/loginModal/loginModalNotice.block.less
+++ b/awx/ui/client/src/login/loginModal/loginModalNotice.block.less
@@ -12,7 +12,6 @@
     color: @login-notice-text;
     overflow-y: scroll;
     overflow-x: visible;
-    white-space: pre-wrap;
 }
 
 .LoginModalNotice-title {

From 202a68aca03e72cdb476d64b7a66a16abbbe83c7 Mon Sep 17 00:00:00 2001
From: Philip Douglass <philip.douglass@amadeus.com>
Date: Thu, 9 Jul 2020 18:39:43 +0200
Subject: [PATCH 2/3] Add customLoginInfoIsHTML test

Signed-off-by: Philip Douglass <philip.douglass@amadeus.com>
---
 awx/ui/client/src/login/loginModal/loginModal.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index 6ce18559f6..657cb55553 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -88,6 +88,7 @@ export default ['$log', '$cookies', '$rootScope', 'ProcessErrors',
         }
         scope.customLoginInfo = $AnsibleConfig.custom_login_info;
         scope.customLoginInfoPresent = (scope.customLoginInfo) ? true : false;
+        scope.customLoginInfoIsHTML = /<\/?[a-z][\s\S]*>/i.test(scope.customLoginInfo);
     });
 
     if (scope.removeAuthorizationGetLicense) {

From 4c98a1cb20fed411dc3a9ea9774000cc979310fe Mon Sep 17 00:00:00 2001
From: Philip Douglass <philip.douglass@amadeus.com>
Date: Thu, 9 Jul 2020 18:49:16 +0200
Subject: [PATCH 3/3] Set white-space style based on customLoginInfoIsHTML

Signed-off-by: Philip Douglass <philip.douglass@amadeus.com>
---
 awx/ui/client/src/login/loginModal/loginModal.partial.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index e3133f84c9..d9fa2c0219 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -98,7 +98,12 @@
                         </div>
                     </div>
                 </form>
-                <div id="login_modal_notice" class="LoginModalNotice" ng-if="customLoginInfoPresent"><div class="LoginModalNotice-title" translate>NOTICE</div>{{ customLoginInfo | sanitize }}</div>
+                <div id="login_modal_notice" class="LoginModalNotice" ng-if="customLoginInfoPresent">
+                    <div class="LoginModalNotice-title" translate>NOTICE</div>
+                    <ng-bind-html ng-bind-html="customLoginInfo"
+                        ng-style="{'white-space' : customLoginInfoIsHTML ? 'initial' : 'pre-wrap'}">
+                    </ng-bind-html>
+                </div>
             </div>
             <div class="LoginModal-footer">
                 <div class="LoginModal-footerBlock">