From 5049b8262d8ce7bff7ff168e6ead700e861b5c2b Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 6 Aug 2019 10:31:12 -0400
Subject: [PATCH] Add alert to log in page with csp disclaimer

---
 templates/components/alert.html | 4 ++--
 templates/login.html            | 2 ++
 translations.yaml               | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/components/alert.html b/templates/components/alert.html
index dc5c4330..5691d1a8 100644
--- a/templates/components/alert.html
+++ b/templates/components/alert.html
@@ -1,6 +1,6 @@
 {% from "components/icon.html" import Icon %}
 
-{% macro Alert(title, message=None, actions=None, level='info', fragment=None, vue_template=False) -%}
+{% macro Alert(title=None, message=None, actions=None, level='info', fragment=None, vue_template=False) -%}
   {% set role = 'alertdialog' if actions else 'alert' %}
   {% set levels = {
     'warning': {
@@ -26,7 +26,7 @@
     <div class='usa-alert-body'>
       {% if vue_template %}
         <h3 class='usa-alert-heading' v-html='title'></h3>
-      {% else %}
+      {% elif title %}
         <h3 class='usa-alert-heading'>{{title}}</h3>
       {% endif %}
 
diff --git a/templates/login.html b/templates/login.html
index bdfd63f9..7e8fe9eb 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -24,6 +24,8 @@
           {% include "fragments/dod_login.html" %}
         </div>
 
+        {{ Alert(message=("login.csp_disclaimer" | translate), level="warning") }}
+
         {% with %}
           {% set category_filter=["success", "info", "warning"] %}
           {% include "fragments/flash.html" %}
diff --git a/translations.yaml b/translations.yaml
index 09557f5e..fd5563c1 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -228,6 +228,7 @@ login:
     learn_more: Learn more
     message: 'When you are prompted to select a certificate, please select Email Certificate from the provided choices.'
     title: Certificate Selection
+  csp_disclaimer: This is one of two sites being used for both Azure and AWS integration. The URLs and hosting environments are being managed without knowledge of or input to the JEDI source selection and should not be considered an endorsement of any cloud vendor.
   h1_title: Access the JEDI cloud
   login_button: Sign in with CAC
   title_tag: Sign in | JEDI cloud