Skip to content

Commit 3f8a5bb

Browse files
nicki-nhsnicki-nhs
committed
CCM-11438 Fix layout on create template pages
1 parent c335e2f commit 3f8a5bb

File tree

6 files changed

+415
-345
lines changed

6 files changed

+415
-345
lines changed

‎frontend/src/__tests__/components/forms/EmailTemplateForm/__snapshots__/EmailTemplateForm.test.tsx.snap‎

Lines changed: 124 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ exports[`Client-side validation triggers 1`] = `
77
id="maincontent"
88
role="main"
99
>
10+
<div
11+
class="nhsuk-grid-row nhsuk-grid-column-two-thirds"
12+
>
13+
<h1
14+
class="nhsuk-heading-xl"
15+
data-testid="page-heading"
16+
>
17+
Edit email template
18+
</h1>
19+
</div>
1020
<div
1121
class="nhsuk-grid-row"
1222
>
@@ -28,12 +38,6 @@ exports[`Client-side validation triggers 1`] = `
2838
type="hidden"
2939
value="no_token"
3040
/>
31-
<h1
32-
class="nhsuk-heading-xl"
33-
data-testid="page-heading"
34-
>
35-
Edit email template
36-
</h1>
3741
<div>
3842
<label
3943
class="nhsuk-label nhsuk-label--s"
@@ -753,47 +757,57 @@ exports[`renders page one error 1`] = `
753757
id="maincontent"
754758
role="main"
755759
>
760+
<div
761+
class="nhsuk-grid-row nhsuk-grid-column-two-thirds"
762+
>
763+
<div
764+
aria-labelledby="error-summary-title"
765+
class="nhsuk-error-summary"
766+
role="alert"
767+
tabindex="-1"
768+
>
769+
<h2
770+
class="nhsuk-error-summary__title"
771+
data-testid="error-summary"
772+
id="error-summary-title"
773+
>
774+
There is a problem
775+
</h2>
776+
<ul
777+
class="nhsuk-list nhsuk-error-summary__list"
778+
>
779+
<li>
780+
<a
781+
href="#emailTemplateName"
782+
>
783+
Template name error
784+
</a>
785+
</li>
786+
<li>
787+
<a
788+
href="#emailTemplateSubjectLine"
789+
/>
790+
</li>
791+
<li>
792+
<a
793+
href="#emailTemplateMessage"
794+
/>
795+
</li>
796+
</ul>
797+
</div>
798+
<h1
799+
class="nhsuk-heading-xl"
800+
data-testid="page-heading"
801+
>
802+
Create email template
803+
</h1>
804+
</div>
756805
<div
757806
class="nhsuk-grid-row"
758807
>
759808
<div
760809
class="nhsuk-grid-column-two-thirds"
761810
>
762-
<div
763-
aria-labelledby="error-summary-title"
764-
class="nhsuk-error-summary"
765-
role="alert"
766-
tabindex="-1"
767-
>
768-
<h2
769-
class="nhsuk-error-summary__title"
770-
data-testid="error-summary"
771-
id="error-summary-title"
772-
>
773-
There is a problem
774-
</h2>
775-
<ul
776-
class="nhsuk-list nhsuk-error-summary__list"
777-
>
778-
<li>
779-
<a
780-
href="#emailTemplateName"
781-
>
782-
Template name error
783-
</a>
784-
</li>
785-
<li>
786-
<a
787-
href="#emailTemplateSubjectLine"
788-
/>
789-
</li>
790-
<li>
791-
<a
792-
href="#emailTemplateMessage"
793-
/>
794-
</li>
795-
</ul>
796-
</div>
797811
<form
798812
action="/action"
799813
>
@@ -809,12 +823,6 @@ exports[`renders page one error 1`] = `
809823
type="hidden"
810824
value="no_token"
811825
/>
812-
<h1
813-
class="nhsuk-heading-xl"
814-
data-testid="page-heading"
815-
>
816-
Create email template
817-
</h1>
818826
<div
819827
class="nhsuk-form-group--error"
820828
>
@@ -1546,51 +1554,61 @@ exports[`renders page with multiple errors 1`] = `
15461554
id="maincontent"
15471555
role="main"
15481556
>
1557+
<div
1558+
class="nhsuk-grid-row nhsuk-grid-column-two-thirds"
1559+
>
1560+
<div
1561+
aria-labelledby="error-summary-title"
1562+
class="nhsuk-error-summary"
1563+
role="alert"
1564+
tabindex="-1"
1565+
>
1566+
<h2
1567+
class="nhsuk-error-summary__title"
1568+
data-testid="error-summary"
1569+
id="error-summary-title"
1570+
>
1571+
There is a problem
1572+
</h2>
1573+
<ul
1574+
class="nhsuk-list nhsuk-error-summary__list"
1575+
>
1576+
<li>
1577+
<a
1578+
href="#emailTemplateName"
1579+
>
1580+
Template name error
1581+
</a>
1582+
</li>
1583+
<li>
1584+
<a
1585+
href="#emailTemplateSubjectLine"
1586+
>
1587+
Template subject line error
1588+
</a>
1589+
</li>
1590+
<li>
1591+
<a
1592+
href="#emailTemplateMessage"
1593+
>
1594+
Template message error
1595+
</a>
1596+
</li>
1597+
</ul>
1598+
</div>
1599+
<h1
1600+
class="nhsuk-heading-xl"
1601+
data-testid="page-heading"
1602+
>
1603+
Create email template
1604+
</h1>
1605+
</div>
15491606
<div
15501607
class="nhsuk-grid-row"
15511608
>
15521609
<div
15531610
class="nhsuk-grid-column-two-thirds"
15541611
>
1555-
<div
1556-
aria-labelledby="error-summary-title"
1557-
class="nhsuk-error-summary"
1558-
role="alert"
1559-
tabindex="-1"
1560-
>
1561-
<h2
1562-
class="nhsuk-error-summary__title"
1563-
data-testid="error-summary"
1564-
id="error-summary-title"
1565-
>
1566-
There is a problem
1567-
</h2>
1568-
<ul
1569-
class="nhsuk-list nhsuk-error-summary__list"
1570-
>
1571-
<li>
1572-
<a
1573-
href="#emailTemplateName"
1574-
>
1575-
Template name error
1576-
</a>
1577-
</li>
1578-
<li>
1579-
<a
1580-
href="#emailTemplateSubjectLine"
1581-
>
1582-
Template subject line error
1583-
</a>
1584-
</li>
1585-
<li>
1586-
<a
1587-
href="#emailTemplateMessage"
1588-
>
1589-
Template message error
1590-
</a>
1591-
</li>
1592-
</ul>
1593-
</div>
15941612
<form
15951613
action="/action"
15961614
>
@@ -1606,12 +1624,6 @@ exports[`renders page with multiple errors 1`] = `
16061624
type="hidden"
16071625
value="no_token"
16081626
/>
1609-
<h1
1610-
class="nhsuk-heading-xl"
1611-
data-testid="page-heading"
1612-
>
1613-
Create email template
1614-
</h1>
16151627
<div
16161628
class="nhsuk-form-group--error"
16171629
>
@@ -2369,6 +2381,16 @@ exports[`renders page with preloaded field values 1`] = `
23692381
id="maincontent"
23702382
role="main"
23712383
>
2384+
<div
2385+
class="nhsuk-grid-row nhsuk-grid-column-two-thirds"
2386+
>
2387+
<h1
2388+
class="nhsuk-heading-xl"
2389+
data-testid="page-heading"
2390+
>
2391+
Create email template
2392+
</h1>
2393+
</div>
23722394
<div
23732395
class="nhsuk-grid-row"
23742396
>
@@ -2390,12 +2412,6 @@ exports[`renders page with preloaded field values 1`] = `
23902412
type="hidden"
23912413
value="no_token"
23922414
/>
2393-
<h1
2394-
class="nhsuk-heading-xl"
2395-
data-testid="page-heading"
2396-
>
2397-
Create email template
2398-
</h1>
23992415
<div>
24002416
<label
24012417
class="nhsuk-label nhsuk-label--s"
@@ -3092,6 +3108,16 @@ exports[`renders page without back link for initial state with id - edit mode 1`
30923108
id="maincontent"
30933109
role="main"
30943110
>
3111+
<div
3112+
class="nhsuk-grid-row nhsuk-grid-column-two-thirds"
3113+
>
3114+
<h1
3115+
class="nhsuk-heading-xl"
3116+
data-testid="page-heading"
3117+
>
3118+
Edit email template
3119+
</h1>
3120+
</div>
30953121
<div
30963122
class="nhsuk-grid-row"
30973123
>
@@ -3113,12 +3139,6 @@ exports[`renders page without back link for initial state with id - edit mode 1`
31133139
type="hidden"
31143140
value="no_token"
31153141
/>
3116-
<h1
3117-
class="nhsuk-heading-xl"
3118-
data-testid="page-heading"
3119-
>
3120-
Edit email template
3121-
</h1>
31223142
<div>
31233143
<label
31243144
class="nhsuk-label nhsuk-label--s"

0 commit comments

Comments
 (0)