Add ids to add another and check your answers

hmcts · Feb 1, 2018 · 45cb2ad · 45cb2ad
1 parent 3248b8e
commit 45cb2ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/nunjucks.js b/src/nunjucks.js
@@ -23,6 +23,15 @@ const nunjucksDefaults = {
     },
     isBoolean(value) {
       return typeof value === 'boolean';
+    },
+    safeId(id) {
+      return id.toString()
+        .toLowerCase()
+        // replace foo[1] to foo-1
+        .replace(/\[(\d{1,})\]/, '-$1')
+        .replace(/[^A-Za-z0-9\s_-]/g, '')
+        // replace 'foo bar' to 'foo-bar'
+        .replace(/\s/g, '-');
     }
   }
 };

diff --git a/templates/look-and-feel/components/check-your-answers.njk b/templates/look-and-feel/components/check-your-answers.njk
@@ -1,5 +1,5 @@
 {% macro answer(question, answer, url) %}
-<div>
+<div id="cya-{{ safeId(question) }}">
   <dt class="cya-question">
     {{ question }}
   </dt>

diff --git a/templates/look-and-feel/layouts/add_another.html b/templates/look-and-feel/layouts/add_another.html
@@ -63,7 +63,7 @@
 
 {# Macro specific to this layout #}
 {% macro addAnotherItem(field, deleteUrl, editUrl) %}
-<div>
+<div {% if field %} id="add-another-list-{{ safeId(field.id) }}" {% endif %}>
   <dd class="add-another-list-item {{ errorClass(field) }}">
       {{ errorsFor(field) }}
       {{ caller() }}