Merge branch 'eq-individual-response-v5' of https://github.com/ONSdig…

…ital/eq-prototypes into eq-individual-response-v5
ONSdigital · Mar 13, 2020 · 7fdaaf3 · 7fdaaf3
2 parents 29ef2cd + 5ed7e7e
commit 7fdaaf3
Show file tree

Hide file tree

Showing 163 changed files with 290 additions and 344 deletions.
diff --git a/_prototypes/individual-response--your-household-v15/complete--confirmation-resend.html b/_prototypes/individual-response--your-household-v15/complete--confirmation-resend.html
@@ -68,8 +68,8 @@
                         </ul>
                     </div>
                 </div>
-                <h1>Send confirmation to an email address</h1>
-                <p>If you would like confirmation of your completed census please provide a valid email address.</p>
+                <h2>Send another confirmation email</h2>
+
                 <form action="../complete--confirmation-sent/">
                     <div id="email-field" class="field">
                         <label class="label" for="email-address">
@@ -83,6 +83,7 @@ <h1>Send confirmation to an email address</h1>
                         <span class="btn__inner">Send confirmation</span>
                     </button>
                 </form>
+                <!--
                 <hr class="u-mb-m u-mt-m">
                 <h2 class="u-fs-m u-mb-xs">Share</h2>
                 <p class="u-mb-xs">Let others know you've completed the census</p>
@@ -93,6 +94,7 @@ <h2 class="u-fs-m u-mb-xs">Share</h2>
                         <a href="https://twitter.com/share?ref_src=twsrc%5Etfw" class="twitter-share-button" data-text="I&#39;ve just completed my Census 2021 questionnaire! Start yours at:" data-url="https://census.gov.uk/" data-hashtags="census2021" data-dnt="true" data-show-count="false">Tweet</a><script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
                     </div>
                 </div>
+                -->
             </main>
         </div>
     </div>

diff --git a/_prototypes/individual-response--your-household-v15/complete--confirmation-sent.html b/_prototypes/individual-response--your-household-v15/complete--confirmation-sent.html
@@ -56,38 +56,14 @@
             <main role="main" id="main" class="page__main">
                 <div class="panel panel--simple panel--success u-mb-m">    
                     <div class="panel__body">
-                        <h1 class="u-mb-xs u-fs-l ">
-                            Confirmation email sent
+                        <h1 class="u-mb-xs u-fs-l js-piping">
+                            A confirmation email has been sent to {x}
                         </h1>
-                        <p class="js-piping">An email confirming you have completed your census has been sent to&nbsp;<strong>{x}</strong></p>
                     </div>
                 </div>
-                <h2 class="u-fs-r--b u-mb-xs">Didn't receive the email?</h2>
-                <p class="u-mb-m"><a href="../complete--confirmation-resend">Re-submit the confirmation email</a></p>
-                <hr class="u-mb-m u-mt-m">
-                <h2 class="u-fs-m u-mb-xs">Share</h2>
-                <p class="u-mb-xs">Let others know you've done your census.</p>
-                <!-- Load Facebook SDK for JavaScript -->
-                <div id="fb-root"></div>
-                <script>(function(d, s, id) {
-                    var js, fjs = d.getElementsByTagName(s)[0];
-                    if (d.getElementById(id)) return;
-                    js = d.createElement(s); js.id = id;
-                    js.src = "https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v3.0";
-                    fjs.parentNode.insertBefore(js, fjs);
-                }(document, 'script', 'facebook-jssdk'));</script>
-
-                <!-- Your share button code -->
-                <div class="share-buttons">
-                    <div class="fb-share-button u-mt-no u-pt-no u-mr-s u-fl" 
-                        data-href="https://census.gov.uk/about-the-census/" 
-                        data-text="I&#39;ve just completed my Census 2021 questionnaire! Start yours at:"
-                        data-layout="button">
-                    </div>
-                    <div style="display:inline-block; margin-top:.4rem; margin-right:1rem;">
-                        <a href="https://twitter.com/share?ref_src=twsrc%5Etfw" class="twitter-share-button" data-text="I&#39;ve just completed my Census 2021 questionnaire! Start yours at:" data-url="https://census.gov.uk/" data-hashtags="census2021" data-dnt="true" data-show-count="false">Tweet</a><script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-                    </div>                    
-                </div>
+                <h2 class="u-fs-r--b u-mb-xs">Didn't receive an email?</h2>
+                <p class="u-mb-m">It can take a few minutes for the email to arrive. If it doesn't arrive, you can <a href="../complete--confirmation-resend">send another confirmation email</a>.</p>
+
             </main>
         </div>
     </div>

diff --git a/_prototypes/individual-response--your-household-v15/complete.html b/_prototypes/individual-response--your-household-v15/complete.html
@@ -79,9 +79,9 @@ <h2 class="u-fs-r--b u-mb-no">Your confirmation number</h2>
                         <code class="u-fs-xl">1098 5379 24</code>
                     </div>
                 </div>
-                <p class="lock u-mb-l">Your personal information is protected by law and will be kept confidential.</p>
-                <h2>Send this confirmation to an email address</h2>
-                <p>If you would like confirmation of your completed census please provide a valid email address.</p>
+                <p class="lock u-mb-l">Your personal information is protected by law and will be kept confidential</p>
+                <h2>Get confirmation email</h2>
+                <p>If you would like to be sent confirmation that you have completed your census, enter your email address.</p>
                 <form action="../complete--confirmation-sent/">
 
                     <div id="email-field" class="field">
@@ -97,6 +97,7 @@ <h2>Send this confirmation to an email address</h2>
                         <span class="btn__inner">Send confirmation</span>
                     </button>
                 </form>
+                <!--
                 <hr class="u-mb-m u-mt-m">
                 <h2 class="u-fs-m u-mb-xs">Share</h2>
                 <p class="u-mb-xs">Let others know you've completed the census</p>
@@ -107,6 +108,7 @@ <h2 class="u-fs-m u-mb-xs">Share</h2>
                         <a href="https://twitter.com/share?ref_src=twsrc%5Etfw" class="twitter-share-button" data-text="I&#39;ve just completed my Census 2021 questionnaire! Start yours at:" data-url="https://census.gov.uk/" data-hashtags="census2021" data-dnt="true" data-show-count="false">Tweet</a><script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
                     </div>
                 </div>
+                -->
             </main>
         </div>
     </div>

diff --git a/_prototypes/individual-response--your-household-v15/individual-decision-answer-behalf.html b/_prototypes/individual-response--your-household-v15/individual-decision-answer-behalf.html
@@ -63,9 +63,8 @@ <h1 id="question-title" class="question__title u-fs-xl">Is there anyone in your
                             type="submit" name="">Save and continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-decision-behalf-continue.html b/_prototypes/individual-response--your-household-v15/individual-decision-behalf-continue.html
@@ -104,9 +104,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/...pes/individual-response--your-household-v15/individual-decision-confirm-address-sent.html b/...pes/individual-response--your-household-v15/individual-decision-confirm-address-sent.html
@@ -42,9 +42,8 @@ <h1 id="question-title" class="question__title u-mb-xs u-fs-l js-piping">
                             type="submit" name="">Continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-decision-confirm-address.html b/_prototypes/individual-response--your-household-v15/individual-decision-confirm-address.html
@@ -70,9 +70,8 @@
                             type="submit" name="">Continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/...ypes/individual-response--your-household-v15/individual-decision-enter-email-correct.html b/...ypes/individual-response--your-household-v15/individual-decision-enter-email-correct.html
@@ -65,9 +65,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/...totypes/individual-response--your-household-v15/individual-decision-enter-email-sent.html b/...totypes/individual-response--your-household-v15/individual-decision-enter-email-sent.html
@@ -41,9 +41,8 @@ <h1 id="question-title" class="question__title u-mb-xs u-fs-l js-piping">
                             type="submit" name="">Continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/...pes/individual-response--your-household-v15/individual-decision-enter-mobile-correct.html b/...pes/individual-response--your-household-v15/individual-decision-enter-mobile-correct.html
@@ -65,9 +65,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/...otypes/individual-response--your-household-v15/individual-decision-enter-mobile-sent.html b/...otypes/individual-response--your-household-v15/individual-decision-enter-mobile-sent.html
@@ -42,9 +42,8 @@ <h1 id="question-title" class="question__title u-mb-xs u-fs-l js-piping">
                             type="submit" name="">Continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-decision-enter-mobile.html b/_prototypes/individual-response--your-household-v15/individual-decision-enter-mobile.html
@@ -51,9 +51,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <!--<p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>-->
+                    <!--
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>-->
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-decision.html b/_prototypes/individual-response--your-household-v15/individual-decision.html
@@ -77,8 +77,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub">Choose another section and return to this later</a></p>
+
+                <p><a href="../hub">Choose another section and return to this question later</a></p>
                 </form>
             </main>
         </div>

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-address-in-uk.html b/_prototypes/individual-response--your-household-v15/individual-details-address-in-uk.html
@@ -92,9 +92,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-address.html b/_prototypes/individual-response--your-household-v15/individual-details-address.html
@@ -87,8 +87,7 @@
                     </button>
 
                     <p class="mars">Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="mars u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-age-confirm.html b/_prototypes/individual-response--your-household-v15/individual-details-age-confirm.html
@@ -78,9 +78,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-apprenticeship.html b/_prototypes/individual-response--your-household-v15/individual-details-apprenticeship.html
@@ -90,9 +90,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-country-other.html b/_prototypes/individual-response--your-household-v15/individual-details-country-other.html
@@ -67,9 +67,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-country.html b/_prototypes/individual-response--your-household-v15/individual-details-country.html
@@ -125,9 +125,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-dob.html b/_prototypes/individual-response--your-household-v15/individual-details-dob.html
@@ -79,8 +79,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub"
+
+                        <p><a href="../hub"
                            class="js-choose-another-section">Choose another
                             section and
                             return

diff --git a/...totypes/individual-response--your-household-v15/individual-details-employment-status.html b/...totypes/individual-response--your-household-v15/individual-details-employment-status.html
@@ -108,9 +108,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/.../individual-response--your-household-v15/individual-details-ethnic-group-description.html b/.../individual-response--your-household-v15/individual-details-ethnic-group-description.html
@@ -55,9 +55,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/...otypes/individual-response--your-household-v15/individual-details-ethnic-group-other.html b/...otypes/individual-response--your-household-v15/individual-details-ethnic-group-other.html
@@ -72,9 +72,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"

diff --git a/_prototypes/individual-response--your-household-v15/individual-details-ethnic-group.html b/_prototypes/individual-response--your-household-v15/individual-details-ethnic-group.html
@@ -148,9 +148,8 @@
                             type="submit" name="">Save and continue
                     </button>
 
-                    <p>Can't complete this question?<br />
-                        <a href="../hub" class="js-choose-another-section">Choose another section and
-                            return to this later</a></p>
+
+                        <p><a href="../hub" class="js-choose-another-section">Choose another section and return to this question later</a></p>
 
                     <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
                         <a class="js-link-secure"