Merge branch 'master' into referrer

hmrc · Jan 3, 2017 · c275230 · c275230
2 parents 5fefe38 + 4c5753d
commit c275230
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 29 deletions.
diff --git a/app/views/widgets/onlineTestProgress.scala.html b/app/views/widgets/onlineTestProgress.scala.html
@@ -52,21 +52,21 @@
 
     case ONLINE_TEST_STARTED => {
 
-            <p>Your tests are now ready.</p>
-            <p>You have <b>@{
-                onlineTest.map(v => v.getDuration).getOrElse("")
-            }</b> to complete the tests.
-                <br>The tests will expire at @{
-                onlineTest.map(v => v.getExpireDateTime).getOrElse("")
-            }.</p>
-                <div class="hide-tablet panel-indent">
-        <p><i class="fa fa-exclamation-triangle"></i>The online tests
+        <p>Your tests are now ready.</p>
+        <p>You have <b>@{
+            onlineTest.map(v => v.getDuration).getOrElse("")
+        }</b> to complete the tests.
+            <br>The tests will expire at @{
+            onlineTest.map(v => v.getExpireDateTime).getOrElse("")
+        }.</p>
+        <div class="hide-tablet panel-indent">
+            <p><i class="fa fa-exclamation-triangle"></i>The online tests
             will be extremely difficult to use on a small device.</p>
             <p>Use a laptop or desktop browser, or alternatively seek
                 <a
                 href="https://www.gov.uk/guidance/civil-service-fast-track-apprenticeship-how-to-apply#help-with-getting-online"
                 target="_blank" rel="external">help with getting online</a>. </p>
-
+        </div>
         @helper.form(action = routes.OnlineTestController.startTests(), 'novalidate -> "novalidate") {
             @helper.CSRF.formField
 

diff --git a/test/config/FasttrackFrontendConfigSpec.scala b/test/config/FasttrackFrontendConfigSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/connectors/ConnectorSpec.scala b/test/connectors/ConnectorSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/connectors/UserManagementClientSpec.scala b/test/connectors/UserManagementClientSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/ApplicationSpec.scala b/test/controllers/ApplicationSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/BaseSpec.scala b/test/controllers/BaseSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/FasttrackConfigSpec.scala b/test/controllers/FasttrackConfigSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/LandingPageControllerSpec.scala b/test/controllers/LandingPageControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/AssistanceFormSpec.scala b/test/controllers/forms/AssistanceFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/GeneralDetailsFormSpec.scala b/test/controllers/forms/GeneralDetailsFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/PreferenceFormSpec.scala b/test/controllers/forms/PreferenceFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/QuestionnaireDiversityFormSpec.scala b/test/controllers/forms/QuestionnaireDiversityFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/QuestionnaireEducationFormSpec.scala b/test/controllers/forms/QuestionnaireEducationFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/QuestionnaireOccupationFormSpec.scala b/test/controllers/forms/QuestionnaireOccupationFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/SignUpFormSpec.scala b/test/controllers/forms/SignUpFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/controllers/forms/resetPasswordFormSpec.scala b/test/controllers/forms/resetPasswordFormSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/models/page/DashboardPageSpec.scala b/test/models/page/DashboardPageSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/security/RolesSpec.scala b/test/security/RolesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/util/PostCodeFormatterSpec.scala b/test/util/PostCodeFormatterSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/util/RegionToJsonSpec.scala b/test/util/RegionToJsonSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.