Merge branch 'staging-v1.2.2-sso-info' into 'staging'

Staging v1.2.2 sso info

See merge request !190

sites/sso-info/index.html

@@ -193,14 +193,14 @@
                                 make sure to check your junk email folder.</li>
                             <li>If you accidently tried logging in using your old Mattermost credentials more than
                                 five times, your account is likely locked out. Contact a team admin or email us at
-                                <a href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a>
+                                <a href="mailto: help@dsop.io">help@dsop.io</a>
                                 to have your account unlocked.</li>
                             <li>If you created your Mattermost
                                 account after 19 May, your P1 SSO account may not have been automatically created.
                                 Ask a
                                 team or system admin for an invite link to create a P1 SSO account. Alternatively
                                 you can send a request to <a
-                                    href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a>.
+                                    href="mailto: help@dsop.io">help@dsop.io</a>.
                             </li>
                             <br>
                             <h4>How do I update my profile?</h4>
@@ -221,14 +221,14 @@
                                 whichever
                                 account you will no longer be using. Let your team admin know which account (email
                                 address) you will no longer be using or email us directly at <a
-                                    href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a>.
+                                    href="mailto: help@dsop.io">help@dsop.io</a>.
                             </li>
                             <br>
                             <h4>Why am I getting a "X509 certificate's authentication failed." when trying to log in
                                 with a CAC?</h4>
                             <li>Your account is likely locked or may be experiencing issues from the migration to P1
                                 SSO. Please email us at <a
-                                    href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a> and
+                                    href="mailto: help@dsop.io">help@dsop.io</a> and
                                 we should be able to quickly resolve the issue.
                             </li>
                             <br>
@@ -241,7 +241,7 @@
                             <h4>I have another question or need additional help. Who do I contact?</h4>
                             <li>Contact your team admin for additional assistance. If you're not sure who your team
                                 admin is or can't get a hold of them, email us at <a
-                                    href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a>.
+                                    href="mailto: help@dsop.io">help@dsop.io</a>.
                             </li>
                         </div>
                     </div>

sites/sso-info/new_account.html

@@ -26,27 +26,15 @@
                         address. <span style="color: #ff3800;">This process must be done from a web browser on a
                             computer.
                             Do not use Internet Explorer.</span></p>
-                    <p style="font-style: italic;">Note: If you're registering from a computer with a CAC, you will recieve a prompt to select your CAC
-                        certificate. You should then see the New DoD CAC Detected message (pictured below) where you can
-                        select "click to
-                        register". In this case, setting up a password and MFA on the account is optional if you only want to access your account using a CAC.</p>
-
-                    <div class="badges" style="height: auto; border-bottom:"><img class="img-fluid"
-                            src="img/cac_register.jpg" width="auto"
-                            style="height: auto;width: 550px; border-radius: 25px;">
-                    </div>
-                    <br>
-
-
                 </div>
             </div>
             <br>
             <div class="row border-bottom: 3px solid #ffffff;">
                 <div class="col-md-8 mx-auto">
                     <h3 class="section-heading" style="color: #52a1fd;">Step 1</h3>
-                    <p>Fill out the registration form using an approved email address (e.g. work email) and click
+                    <p><a href="https://login.dsop.io/register" target="blank">Click here</a> to access the registration page. Fill out the registration form using an approved email address (e.g. work email) and click
                         "Register". If you're registering with a CAC, setting up a password is optional if you only want to access your account using a CAC.</p>
-                    <div class="badges" style="height: auto; border-bottom:"><img class="img-fluid"
+                    <div class="badges" style="height: auto; border-bottom:0"><img class="img-fluid"
                             src="img/registration_form.jpg" width="auto"
                             style="height: auto;width: 550px; border-radius: 25px;">
                     </div>
@@ -68,7 +56,7 @@
                         <a class="js-scroll-trigger" href="#commonissues">common issues section below</a> for
                         additional
                         troubleshooting steps.</p>
-                    <div class="badges" style="height: auto; border-bottom:"><img class="img-fluid"
+                    <div class="badges" style="height: auto; border-bottom:0"><img class="img-fluid"
                             src="img/setup_mfa.jpg" width="auto"
                             style="height: auto;width: 550px; border-radius: 25px;"></div>
                 </div>
@@ -80,8 +68,8 @@
                     <p>You will receive an email with a link to verify your email address. Click “Link to e-mail
                         address
                         verification” or copy the URL into a web browser (do not use Internet Explorer).<br>
-                    <div class="badges" style="height: auto; border-bottom:">
-                        <div class="badges" style="height: auto; border-bottom:"><img class="img-fluid"
+                    <div class="badges" style="height: auto; border-bottom:0">
+                        <div class="badges" style="height: auto; border-bottom:0"><img class="img-fluid"
                                 src="img/verify_email_new.jpg" width="auto"
                                 style="height: auto;width: 550px; border-radius: 25px;"></div>
                     </div>
@@ -94,10 +82,10 @@
                     <p>Validate your email address by selecting "Click here to proceed". On the next screen, click
                         "Back
                         to Application".<br></p>
-                    <div class="badges" style="height: auto; border-bottom:"><img class="img-fluid"
+                    <div class="badges" style="height: auto; border-bottom:0"><img class="img-fluid"
                             src="img/confirm_email_validity.jpg" width="auto"
                             style="height: auto;width: 550px;border-radius: 25px;"></div>
-                    <div class="badges" style="height: auto; border-bottom:"><img class="img-fluid"
+                    <div class="badges" style="height: auto; border-bottom:0"><img class="img-fluid"
                             src="img/email_verified.jpg" width="auto"
                             style="height: auto;width: 550px;border-radius: 25px;"></div>
                 </div>
@@ -116,7 +104,7 @@
                             target="_blank">http://chat.il2.dsop.io</a>.</p>
                     <p style="font-style: italic;">Note: For the mobile app, select the purple "GitLab" button
                         to log into P1 SSO. This is a known issue.</p>
-                    <div class="badges" style="height: auto; border-bottom:"><img class="img-fluid"
+                    <div class="badges" style="height: auto; border-bottom:0"><img class="img-fluid"
                             src="img/setup_profile.jpg" width="auto"
                             style="height: auto;width: 550px;border-radius: 25px;"></div>
                 </div>