Significant Copy Update

Major changes to the en.json file and questions-1 page to reflect changes in the copy from the working group - changes to agreement page tbc

package.json

@@ -43,10 +43,9 @@
     "request": "^2.88.2"
   },
   "devDependencies": {
-    "commander": "^3.0.2",
+    "commander": "^5.0.0",
     "acorn": "^7.1.1",
     "cheerio": "^1.0.0-rc.3",
-    "commander": "^5.0.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-config-standard": "^14.1.1",

public/js/toggle-area.js

@@ -21,6 +21,7 @@ function toggleArea(event) {
 	}
 	if ((toggleState.indexOf('on') >= 0) & (checked == true)) {
 		target.style.display = 'block'
+		target.style.marginTop = '0px'
 	} else {
 		target.style.display = 'none'
 	}

views/macros/checkboxes.njk

@@ -3,6 +3,11 @@
         <fieldset class="fieldset">
             <legend class="fieldset__legend">{{ __(question) }}</legend>
             <div class="multiple-choice multiple-choice--checkboxes" id="{{ key }}">
+
+                {% if attributes.hint %}
+                <span class="form-message">{{ __(attributes.hint) }}</span>
+                {% endif %}
+
                 {% if errors and errors[key] %}
                     {{ validationMessage(errors[key].msg, key) }}
                 {% endif %}

views/macros/double-input-text.njk

@@ -0,0 +1,30 @@
+{#
+  - `name`: field name
+  - `label`: text for the label
+  - `attributes`: object of optional attributes: class, hint, divClasses, autocomplete
+#}
+{% if errors %}
+    {% set firstError = errors[errors.keys()[0]] %}
+{% endif %}
+
+{% macro textInput(name, label, attributes, interpolation={}) %}
+        <div style="margin-bottom:0px" class="{{ 'has-error' if errors and errors[name] }} {{ attributes.divClasses }}">
+
+        <label for="{{ name }}" id="{{ name }}__label">{{ __(label, interpolation) }}</label>
+
+        {% if attributes.hint %}
+            <span class="form-message">{{ __(attributes.hint) }}</span>
+        {% endif %}
+
+        {% if attributes.hint2 %}
+            <span style="margin-bottom: 0px" class="form-message">{{ __(attributes.hint2) }}</span>
+        {% endif %}
+
+        {% if errors and errors[name] %}
+            {{ validationMessage(errors[name].msg, name) }}
+        {% endif %}
+
+        <input style="margin-bottom:0px" class="{{ attributes.class if attributes.class else "w-3-4" }}" {% if attributes.autocomplete %}autocomplete="{{ attributes.autocomplete }}" {% endif %} type="text" id="{{ attributes.id if attributes.id else name }}" {% if errors and errors[name] %} aria-describedby="{{ name + '-error' }}" aria-invalid="true" {% endif %} {% if errors and firstError.param === name %} autofocus="true" {% endif %} name="{{ name }}" value="{{ data[name] }}"/>
+
+    </div>
+{% endmacro %}

views/macros/input-text.njk

@@ -8,14 +8,19 @@
 {% endif %}
 
 {% macro textInput(name, label, attributes, interpolation={}) %}
-    <div class="{{ 'has-error' if errors and errors[name] }} {{ attributes.divClasses }}">
+        <div class="{{ 'has-error' if errors and errors[name] }} {{ attributes.divClasses }}">
         <label for="{{ name }}" id="{{ name }}__label">{{ __(label, interpolation) }}</label>
+
         {% if attributes.hint %}
             <span class="form-message">{{ __(attributes.hint) }}</span>
         {% endif %}
+
         {% if errors and errors[name] %}
             {{ validationMessage(errors[name].msg, name) }}
         {% endif %}
-        <input class="{{ attributes.class if attributes.class else "w-3-4" }}" {% if attributes.autocomplete %}autocomplete="{{ attributes.autocomplete }}" {% endif %} type="text" id="{{ attributes.id if attributes.id else name }}" {% if errors and errors[name] %} aria-describedby="{{ name + '-error' }}" aria-invalid="true" {% endif %} {% if errors and firstError.param === name %} autofocus="true" {% endif %} name="{{ name }}" value="{{ data[name] }}"/>
+
+        <input class="{{ attributes.class if attributes.class else "w-3-4" }}" {% if attributes.autocomplete %}autocomplete="{{ attributes.autocomplete }}" {% endif %} type="text" id="{{ attributes.id if attributes.id else name }}" {% if errors and errors[name] %} aria-describedby="{{ name + '-error' }}" aria-invalid="true" {% endif %} {% if errors and firstError.param === name %} autofocus="true" {% endif %} name="{{ name }}" value="{{ data[name] }}" placeholder="{{ attributes.hint2 }}"/>    
+
     </div>
 {% endmacro %}
+