Merge pull request #66 from UKHomeOffice/feature/YEL-10812-fixing-theme

Fixes the templating and syntax issues

govuk-internal-dq/login/login-verify-email.ftl

@@ -0,0 +1,16 @@
+<#import "template.ftl" as layout>
+<@layout.registrationLayout displayInfo=true; section>
+    <#if section = "title">
+        ${msg("emailVerifyTitle")}
+    <#elseif section = "header">
+        ${msg("emailVerifyTitle")}    
+    <#elseif section = "form">
+        <p class="instruction">${msg("emailVerifyInstruction1")}</p>
+        <p class="instruction">
+            ${msg("emailVerifyInstruction2")}            
+            ${msg("emailVerifyInstruction3")} <a href="${url.loginAction}">${msg("emailResentClickMessage")}</a> 
+        </p>
+    <#elseif section = "info">
+
+    </#if>
+</@layout.registrationLayout>

govuk-internal-dq/login/messages/messages_en.properties

@@ -1,17 +1,10 @@
 termsTitle=Terms and conditions
 termsTitleHtml=Terms and conditions
 termsIntro=You must agree that you have read and understood the terms and conditions of using the service before you can use it.
-termsText=<h2>It is an offence to continue without proper authority.</h2>\
-<p>This is a private service provided by the UK Home Office. Access to, and of, this system is restricted to genuine users and is limited to the purpose of the organisation<span>&#39;</span>s business.</p>\
-<p>Users must read and conform to the Security Work instructions for this service.</p>\
-<p>Activity and use of these services are monitored to secure their effective operation and for all the other lawful business purposes.</p>\
-<p>Communications using this service will also be monitored and may be recorded to secure the effective operation and for other lawful business purposes.</p>\
-<p>Communications using these services will also be monitored and may be recorded to secure the effective operation and for other lawful business purposes.</p>\
-<p>Unauthorised access or attempts to alter, destroy or damage data, programs or equipment could result in criminal prosecution under the Computer Misuse Act (1990)</p>
+termsText=<h2>It is an offence to continue without proper authority.</h2><p>This is a private service provided by the UK Home Office. Access to, and of, this system is restricted to genuine users and is limited to the purpose of the organisation<span>&#39;</span>s business.</p><p>Users must read and conform to the Security Work instructions for this service.</p><p>Activity and use of these services are monitored to secure their effective operation and for all the other lawful business purposes.</p><p>Communications using this service will also be monitored and may be recorded to secure the effective operation and for other lawful business purposes.</p><p>Communications using these services will also be monitored and may be recorded to secure the effective operation and for other lawful business purposes.</p><p>Unauthorised access or attempts to alter, destroy or damage data, programs or equipment could result in criminal prosecution under the Computer Misuse Act (1990)</p>
 loginTotpStep1=Install the FreeOTP  Authenticator  app  on your  mobile.
 loginTotpStep2=Open  the app and, using  the camera  on your  phone, scan the QR code below.
-loginTotpStep3=Enter the one-time code provided by the application and click Submit to finish the setup. 
-<p>rovide a Device Name to help you manage your OTP devices.</p>
+loginTotpStep3=Enter the one-time code provided by the application and click Submit to finish the setup.<p>rovide a Device Name to help you manage your OTP devices.</p>
 loginTotpOneTime=Code from FreeOTP Authenticator
 emailVerifyTitle=Verify your email
 emailVerifyInstruction1=An email with instructions to verify your email address has been sent to you.