Merge pull request #1258 from colinrotherham/old-macro-params-etc

Removed macro params unused since v0.0.29-alpha
alphagov · Apr 5, 2019 · 86533e9 · 86533e9
2 parents 5dc0c1c + 24d80f8
commit 86533e9
Show file tree

Hide file tree

Showing 11 changed files with 225 additions and 186 deletions.
diff --git a/app/views/examples/error-messages/index.njk b/app/views/examples/error-messages/index.njk
@@ -54,14 +54,16 @@
 
     {{ govukInput({
       label: {
-        text: "National Insurance Number",
-        hintText: "It’s on your National Insurance card, benefit letter,
-        payslip or P60. For example, ‘QQ 12 34 56 C’."
+        text: "National Insurance Number"
+      },
+      hint: {
+        text: 'It’s on your National Insurance card, benefit letter,
+        payslip or P60. For example, ‘QQ 12 34 56 C’.'
       },
       id: "input-1",
       name: "test-name",
       errorMessage: {
-        text: "National Insurance Number"
+        text: "Enter your National Insurance Number"
       }
     }) }}
 
@@ -103,7 +105,9 @@
 
     {{ govukRadios({
       fieldset: {
-        legendHtml: "<h3 class=\"govuk-heading-m\">How do you want to be contacted?</h3>"
+        legend: {
+          text: "How do you want to be contacted?"
+        }
       },
       errorMessage: {
         text: "Please select an option"
@@ -130,7 +134,9 @@
 
     {{ govukCheckboxes({
       fieldset: {
-        legendHtml: "<h3 class=\"govuk-heading-m\">What type of waste do you want to dispose of?</h3>"
+        legend: {
+          text: "What type of waste do you want to dispose of?"
+        }
       },
       errorMessage: {
         text: "Please select an option"
@@ -157,23 +163,30 @@
 
     {{- govukDateInput({
       fieldset: {
-        legendText: 'What is your date of birth?',
-        legendHintText: 'For example, 31 3 1980'
+        legend: {
+          text: "What is your date of birth?"
+        }
+      },
+      hint: {
+        text: 'For example, 31 3 1980'
       },
       errorMessage: {
-        text: 'Error message goes here'
+        text: 'Date of birth must be in the past'
       },
       id: 'dob',
       name: 'dob',
       items:[
         {
-          name: 'day'
+          name: 'day',
+          classes: 'govuk-input--width-2 govuk-input--error'
         },
         {
-          name: 'month'
+          name: 'month',
+          classes: 'govuk-input--width-2 govuk-input--error'
         },
         {
-          name: 'year'
+          name: 'year',
+          classes: 'govuk-input--width-4 govuk-input--error'
         }
       ]
       })
@@ -183,24 +196,32 @@
 
     {{- govukDateInput({
       fieldset: {
-        legendText: 'What is your date of birth?',
-        legendHintText: 'For example, 31 3 1980'
+        legend: {
+          text: "What is your date of birth?"
+        }
+      },
+      hint: {
+        text: 'For example, 31 3 1980'
       },
       errorMessage: {
-        text: 'Day not valid'
+        text: 'Date of birth must include a day'
       },
       id: 'dob',
       name: 'dob',
       items:[
         {
           name: 'day',
-          classes: 'govuk-input--error'
+          classes: 'govuk-input--width-2 govuk-input--error'
         },
         {
-          name: 'month'
+          name: 'month',
+          value: '10',
+          classes: 'govuk-input--width-2'
         },
         {
-          name: 'year'
+          name: 'year',
+          value: '1985',
+          classes: 'govuk-input--width-4'
         }
       ]
       })
@@ -240,8 +261,10 @@
       id: "more-detail",
       name: "more-detail",
       label: {
-        text: "Can you provide more detail?",
-        hintText: "Don't include personal or financial information, eg your National Insurance number or credit card details."
+        text: "Can you provide more detail?"
+      },
+      hint: {
+        text: 'Don’t include personal or financial information, for example your National Insurance number or credit card details.'
       },
       "errorMessage": {
         text: "Error message goes here"

diff --git a/app/views/examples/error-summary-with-messages/index.njk b/app/views/examples/error-summary-with-messages/index.njk
@@ -35,8 +35,11 @@
 
   {{ govukInput({
     label: {
-      "html": '<h3 class="govuk-heading-m govuk-!-margin-bottom-1">Passport number</h3>',
-      "hintText": "For example, 502135326"
+      text: "Passport number",
+      classes: "govuk-label--m"
+    },
+    hint: {
+      text: "For example, 502135326"
     },
     id: "passport-number",
     name: "passport-number",
@@ -47,8 +50,13 @@
 
   {{ govukDateInput({
     fieldset: {
-      legendHtml: '<h3 class="govuk-heading-m">Expiry date</h3>',
-      legendHintText: 'For example, 08 2014'
+      legend: {
+        text: 'Expiry date',
+        classes: 'govuk-fieldset__legend--m'
+      }
+    },
+    hint: {
+      text: 'For example, 08 2014'
     },
     id: 'expiry',
     name: 'expiry',
@@ -63,7 +71,7 @@
       }
     ],
     errorMessage: {
-      "text": "You must provide your expiry date"
+      "text": "Enter your expiry date"
     }
     })
   }}

diff --git a/app/views/examples/form-elements/index.njk b/app/views/examples/form-elements/index.njk
@@ -60,7 +60,10 @@
     <span id="radio-stacked"></span>
     {{ govukRadios({
       "fieldset": {
-        "legendHtml": "<h2 class=\"govuk-heading-l\">How do you want to be contacted?</h2>"
+        "legend": {
+          text: "How do you want to be contacted?",
+          classes: "govuk-fieldset__legend--m"
+        }
       },
       "idPrefix": "radio-stacked",
       "name": "radio-stacked",
@@ -83,7 +86,7 @@
     <span id="radio-inline"></span>
     {{ govukRadios({
       "fieldset": {},
-      "classes": "govuk-radio--inline",
+      "classes": "govuk-radios--inline",
       "idPrefix": "radio-inline",
       "name": "radio-inline",
       "items": [
@@ -121,12 +124,17 @@
 
     <span id="date"></span>
     {{- govukDateInput({
-      fieldset: {
-        legendText: 'What is your date of birth?',
-        legendHintText: 'For example, 31 3 1980'
+      "fieldset": {
+        "legend": {
+          "text": "What is your date of birth?",
+          "classes": "govuk-fieldset__legend--m"
+        }
+      },
+      "hint": {
+        "text": "For example, 31 3 1980"
       },
-      id: 'dob',
-      name: 'dob'
+      "id": "dob",
+      "name": "dob"
     }) -}}
 
     {% call govukFieldset() %}

diff --git a/app/views/full-page-examples/bank-holidays/index.njk b/app/views/full-page-examples/bank-holidays/index.njk
@@ -122,7 +122,7 @@
                 text: "Monday"
               },
               {
-                text: "	Summer bank holiday"
+                text: "Summer bank holiday"
               }
             ],
             [
@@ -1209,7 +1209,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -1327,7 +1327,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -1448,7 +1448,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -1569,7 +1569,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -1690,7 +1690,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -1811,7 +1811,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -1932,7 +1932,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -2053,7 +2053,7 @@
                 text: "Monday"
               },
               {
-                text: "	St Andrew’s Day"
+                text: "St Andrew’s Day"
               }
             ],
             [
@@ -2206,7 +2206,7 @@
                 text: "Monday"
               },
               {
-                text: "	Early May bank holiday"
+                text: "Early May bank holiday"
               }
             ],
             [