Alert should only display when login with CAC button is clicked

js/components/fullpagenotice.js

@@ -1,33 +1,15 @@
-import checkboxinput from './checkbox_input'
-import FormMixin from '../mixins/form'
-
 export default {
   name: 'fullpagenotice',
 
-  mixins: [FormMixin],
-
-  components: {
-    checkboxinput,
-  },
-
   data: function() {
     return {
-      agree: false,
+      visible: false,
-      visible: true,
     }
   },
 
-  mounted: function() {
-    this.$root.$on('field-change', this.handleValidChange)
-  },
-
   methods: {
-    handleValidChange: function(event) {
+    displayNotice: function() {
-      this.agree = event.value
+      this.visible = true
-    },
-
-    agreeToTermsClick: function() {
-      this.visible = false
     },
   },
 }

styles/components/_full_page_notice.scss

@@ -6,6 +6,7 @@
   padding: $gap*4 0;
   position: fixed;
   right: 0;
+  text-align: left;
   top: 0;
   z-index: 999;
 

styles/sections/_login.scss

@@ -19,6 +19,10 @@
         max-width: 25rem;
         margin: ($gap * 2) auto;
       }
+
+      .login-banner__button {
+        margin-right: 0;
+      }
     }
   }
 }

templates/fragments/dod_notice.html

@@ -1,41 +1,31 @@
 <fullpagenotice inline-template key="notice">
-  <div class="full-page-notice" v-show="visible">
+  <div>
-    <div class='usa-alert usa-alert-info'>
+    <div class="usa-button usa-button-primary usa-button-big login-banner__button" v-on:click="displayNotice()">
-      <div class='usa-alert-body'>
+      {{ "login.login_button" | translate }}
-        <h3>You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only.</h3>
+    </div>
 
-        <h4>By using this IS (which includes any device attached to this IS), you consent to the following conditions:</h4>
+    <div class="full-page-notice" v-if="visible" v-cloak>
+      <div class='usa-alert usa-alert-info'>
+        <div class='usa-alert-body'>
+          <h3>You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only.</h3>
 
-        <ul>
+          <h4>By using this IS (which includes any device attached to this IS), you consent to the following conditions:</h4>
-          <li> The USG routinely intercepts and monitors communications on this IS for purposes including, but not limited to, penetration testing, COMSEC monitoring, network operations and defense, personnel misconduct (PM), law enforcement (LE), and counterintelligence (CI) investigations.</li>
 
-          <li>At any time, the USG may inspect and seize data stored on this IS.</li>
+          <ul>
+            <li> The USG routinely intercepts and monitors communications on this IS for purposes including, but not limited to, penetration testing, COMSEC monitoring, network operations and defense, personnel misconduct (PM), law enforcement (LE), and counterintelligence (CI) investigations.</li>
 
-          <li>Communications using, or data stored on, this IS are not private, are subject to routine monitoring, interception, and search, and may be disclosed or used for any USG-authorized purpose.</li>
+            <li>At any time, the USG may inspect and seize data stored on this IS.</li>
 
-          <li>This IS includes security measures (e.g., authentication and access controls) to protect USG interests--not for your personal benefit or privacy.</li>
+            <li>Communications using, or data stored on, this IS are not private, are subject to routine monitoring, interception, and search, and may be disclosed or used for any USG-authorized purpose.</li>
 
-          <li>Notwithstanding the above, using this IS does not constitute consent to PM, LE or CI investigative searching or monitoring of the content of privileged communications, or work product, related to personal representation or services by attorneys, psychotherapists, or clergy, and their assistants. Such communications and work product are private and confidential. See User Agreement for details.</li>
+            <li>This IS includes security measures (e.g., authentication and access controls) to protect USG interests--not for your personal benefit or privacy.</li>
-        </ul>
 
-        <checkboxinput inline-template key="agree">
+            <li>Notwithstanding the above, using this IS does not constitute consent to PM, LE or CI investigative searching or monitoring of the content of privileged communications, or work product, related to personal representation or services by attorneys, psychotherapists, or clergy, and their assistants. Such communications and work product are private and confidential. See User Agreement for details.</li>
-          <div class="usa-input">
+          </ul>
-            <fieldset data-ally-disabled="true" v-on:change="onInput">
-              <legend>
-                <input id="abc" type="checkbox" name="abc" value="y" />
-                <label for="abc">
-                  I've read and consent to the terms in the IS user agreement
-                </label>
-              </legend>
-            </fieldset>
-          </div>
-        </checkboxinput>
 
-        <div
+          <a href='{{ redirect_url }}' class="usa-button usa-button-primary float-right">
-          class="usa-button usa-button-primary float-right"
+            {{ "common.continue" | translate }}
-          v-on:click="agreeToTermsClick"
+          </a>
-          v-bind:class="{ 'usa-button-disabled': !agree }">
-          {{ "common.continue" | translate }}
         </div>
       </div>
     </div>

templates/login.html

@@ -6,8 +6,6 @@
 
 {% block content %}
 
-  {% include "fragments/dod_notice.html" %}
-
   <div class='global-layout login-layout'>
     <div class='global-panel-container login-container'>
       <div class='col'>
@@ -23,11 +21,7 @@
 
           <img class="login-banner__logo" src="{{url_for('static', filename='img/ccpo-logo.svg')}}" alt="{{ "login.ccpo_logo_alt_text" | translate }}">
 
-          <a class="usa-button usa-button-big login-banner__button" href='{{ redirect_url }}'>
+          {% include "fragments/dod_notice.html" %}
-            <span>
-              {{ "login.login_button" | translate }}
-            </span>
-          </a>
         </div>
 
         {% with %}