@ons/design-system 55.1.0 → 55.2.0

package/components/document-list/_macro.njk

@@ -1,20 +1,20 @@
 {% macro onsDocumentList(params) %}
-    <ul{% if params.id is defined and params.id %} id="{{ params.id }}"{% endif %} class="ons-document-list{{ ' ' + params.classes if params.classes is defined and params.classes else '' }}"{% if params.attributes is defined and params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %} {{attribute}}="{{value}}"{% endfor %}{% endif %}>
+    <ul{% if params.id %} id="{{ params.id }}"{% endif %} class="ons-document-list{{ ' ' + params.classes if params.classes else '' }}"{% if params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %} {{attribute}}="{{value}}"{% endfor %}{% endif %}>
         {% for document in (params.documents if params.documents is iterable else params.documents.items()) %}
 
-        <li class="ons-document-list__item{{ ' ons-document-list__item--featured' if document.featured is defined and document.featured }}{{ ' ons-document-list__item--full-width' if document.fullWidth is defined and document.fullWidth == true }}{{ ' ' + document.classes if document.classes is defined and document.classes else '' }}"{% if document.attributes is defined and document.attributes %}{% for attribute, value in (document.attributes.items() if document.attributes is mapping and document.attributes.items else document.attributes) %} {{attribute}}="{{value}}"{% endfor %}{% endif %}>
+        <li class="ons-document-list__item{{ ' ons-document-list__item--featured' if document.featured }}{{ ' ons-document-list__item--full-width' if document.fullWidth == true }}{{ ' ' + document.classes if document.classes else '' }}"{% if document.attributes %}{% for attribute, value in (document.attributes.items() if document.attributes is mapping and document.attributes.items else document.attributes) %} {{attribute}}="{{value}}"{% endfor %}{% endif %}>
 
-            {% if document.fullWidth is defined and document.fullWidth == true %}
+            {% if document.fullWidth == true %}
 
-                <div class="ons-container{{ ' ons-container--wide' if document.wide is defined and document.wide == true }}">
+                <div class="ons-container{{ ' ons-container--wide' if document.wide == true }}">
 
             {% endif %}
 
-                    {% if document.thumbnail is defined or document.thumbnail == true %}
+                    {% if document.thumbnail %}
 
-                        <div class="ons-document-list__item-image{%- if document.metadata.file is defined and document.metadata.file %} ons-document-list__item-image--file{% endif %}" aria-hidden="true">
+                        <div class="ons-document-list__item-image{%- if document.metadata.file %} ons-document-list__item-image--file{% endif %}" aria-hidden="true">
                             <a class="ons-document-list__image-link{{ ' ons-document-list__image-link--placeholder' if not document.thumbnail.smallSrc }}" href="{{ document.url }}" tabindex="-1">
-                                {% if document.thumbnail.smallSrc is defined and document.thumbnail.smallSrc and document.thumbnail.largeSrc is defined and document.thumbnail.largeSrc %}
+                                {% if document.thumbnail.smallSrc and document.thumbnail.largeSrc %}
                                     <img srcset="{{ document.thumbnail.smallSrc }} 1x, {{ document.thumbnail.largeSrc }} 2x" src="{{ document.thumbnail.smallSrc }}" alt="" loading="lazy">
                                 {% endif %}
                             </a>
@@ -24,18 +24,18 @@
 
                     <div class="ons-document-list__item-content">
 
-                        <div class="ons-document-list__item-header{{ ' ons-document-list__item-header--reverse' if document.showMetadataFirst is defined and document.showMetadataFirst == true }}">
+                        <div class="ons-document-list__item-header{{ ' ons-document-list__item-header--reverse' if document.showMetadataFirst == true }}">
 
                             {% set titleTag = params.titleTag | default("h2") %}
 
                             <{{ titleTag }} class="ons-document-list__item-title ons-u-fs-m ons-u-mt-no ons-u-mb-xs">
                                 <a href="{{ document.url }}">{{ document.title }}
-                                {%- if document.metadata is defined and document.metadata and document.metadata.file is defined and document.metadata.file %}
+                                {%- if document.metadata and document.metadata.file %}
                                 <span class="ons-u-vh">
                                     {% set fileMetadataItems = [] %}
-                                    {% if document.metadata.file.fileType is defined and document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType + ' document download'), fileMetadataItems) %}{% endif %}
-                                    {% if document.metadata.file.fileSize is defined and document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
-                                    {% if document.metadata.file.filePages is defined and document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}
+                                    {% if document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType + ' document download'), fileMetadataItems) %}{% endif %}
+                                    {% if document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
+                                    {% if document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}
 
                                     , {{ fileMetadataItems | join(', ') }}
 
@@ -44,45 +44,45 @@
                                 </span></a>
                             </{{ titleTag }}>
 
-                            {%- if document.metadata is defined and document.metadata %}
+                            {%- if document.metadata %}
 
-                                <ul class="ons-document-list__item-metadata{% if document.description is defined and document.description %} ons-u-mb-xs{% else %} ons-u-mb-no{% endif %}">
+                                <ul class="ons-document-list__item-metadata{% if document.description %} ons-u-mb-xs{% else %} ons-u-mb-no{% endif %}">
 
-                                    {%- if document.metadata.date is defined and document.metadata.date %}
+                                    {%- if document.metadata.date %}
                                         <li class="ons-document-list__item-attribute">
                                             {% if document.metadata.date -%}
-                                                {% set prefixClasses = "ons-u-fw-b" if document.metadata.date.showPrefix is defined and document.metadata.date.showPrefix == true else "ons-u-vh" %}
+                                                {% set prefixClasses = "ons-u-fw-b" if document.metadata.date.showPrefix == true else "ons-u-vh" %}
                                                 <span class="{{ prefixClasses }}">{{ document.metadata.date.prefix | default("Published") }}: </span>
                                             {%- endif -%}
-                                            {% if document.metadata.date.iso is defined and document.metadata.date.iso -%}
+                                            {% if document.metadata.date.iso -%}
                                                 <time datetime="{{ document.metadata.date.iso }}">{{ document.metadata.date.short }}</time>
                                             {%- endif %}
                                         </li>
                                     {% endif %}
 
-                                    {%- if document.metadata.type is defined and document.metadata.type and document.metadata.type.text is defined and document.metadata.type.text %}
-                                        <li class="ons-document-list__item-attribute{%- if document.metadata.file is defined and document.metadata.file %} ons-u-mr-no{% endif %}">
-                                            {%- if document.metadata.type.url is defined and document.metadata.type.url %}
+                                    {%- if document.metadata.type and document.metadata.type.text %}
+                                        <li class="ons-document-list__item-attribute{%- if document.metadata.file %} ons-u-mr-no{% endif %}">
+                                            {%- if document.metadata.type.url %}
                                                 <a class="ons-document-list__attribute-link" href="{{ document.metadata.type.url }}">
                                             {% endif %}
-                                                    <span {% if not document.metadata.file and not document.metadata.type.url %}class="ons-u-fw-b"{% endif %}>{{ document.metadata.type.text }}{%- if document.metadata.type.ref is defined and document.metadata.type.ref %}: {% elif document.metadata.file is defined and document.metadata.file %},{% endif %}</span>
-                                            {%- if document.metadata.type.url is defined and document.metadata.type.url %}
+                                                    <span {% if not document.metadata.file and not document.metadata.type.url %}class="ons-u-fw-b"{% endif %}>{{ document.metadata.type.text }}{%- if document.metadata.type.ref %}: {% elif document.metadata.file %},{% endif %}</span>
+                                            {%- if document.metadata.type.url %}
                                                 </a>
                                             {% endif %}
-                                            {%- if document.metadata.type.ref is defined and document.metadata.type.ref %}
+                                            {%- if document.metadata.type.ref %}
                                                 <span>{{ document.metadata.type.ref }}</span>
                                             {% endif %}
                                         </li>
                                     {% endif %}
 
-                                    {%- if document.metadata.file is defined and document.metadata.file and document.metadata.file.fileType is defined and document.metadata.file.fileType %}
+                                    {%- if document.metadata.file and document.metadata.file.fileType %}
 
                                         <li class="ons-document-list__item-attribute" aria-hidden="true">
                                             {% set fileMetadataItems = [] %}
 
-                                            {% if document.metadata.file.fileType is defined and document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType), fileMetadataItems) %}{% endif %}
-                                            {% if document.metadata.file.fileSize is defined and document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
-                                            {% if document.metadata.file.filePages is defined and document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}
+                                            {% if document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType), fileMetadataItems) %}{% endif %}
+                                            {% if document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
+                                            {% if document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}
 
                                             {{ fileMetadataItems | join(', ') }}
                                         </li>
@@ -93,13 +93,13 @@
                             {% endif %}
                         </div>
 
-                        {% if document.description is defined and document.description %}
+                        {% if document.description %}
                             <div class="ons-document-list__item-description">{{ document.description | safe }}</div>
                         {% endif %}
 
                     </div>
 
-            {% if document.fullWidth is defined and document.fullWidth == true %}
+            {% if document.fullWidth == true %}
 
                 </div>
 

package/components/duration/_macro.njk

@@ -7,26 +7,26 @@
 {% macro onsDuration(params) %}
     {% set numberOfFields = 0 %}
 
-    {% if params.field1 is defined and params.field1 %}
+    {% if params.field1 %}
         {% set numberOfFields = numberOfFields + 1 %}
     {% endif %}
 
-    {% if params.field2 is defined and params.field2 %}
+    {% if params.field2 %}
         {% set numberOfFields = numberOfFields + 1 %}
     {% endif %}
 
     {% set fields %}
-        {% if params.field1 is defined and params.field1 %}
+        {% if params.field1 %}
             {{ onsInput({
                 "id": params.field1.id,
-                "classes": (" ons-input--error" if (params.error is defined and params.error and params.field1.error is defined and params.field1.error) or (numberOfFields > 1 and params.error is defined and params.error and not params.field1.error and not params.field2.error) else "") + (" ons-js-exclusive-group-item" if params.mutuallyExclusive else ""),
+                "classes": (" ons-input--error" if (params.error and params.field1.error) or (numberOfFields > 1 and params.error and not params.field1.error and not params.field2.error) else "") + (" ons-js-exclusive-group-item" if params.mutuallyExclusive else ""),
                 "width": "2",
                 "type": "number",
                 "name": params.field1.name,
                 "value": params.field1.value,
                 "suffix": {
                     "text": params.field1.suffix.text,
-                    "title": params.field1.suffix.title | default(params.field1.suffix.text),
+                    "title": params.field1.suffix.title,
                     "id": params.field1.suffix.id
                 },
                 "label": {
@@ -39,17 +39,17 @@
             }) }}
         {% endif %}
 
-        {% if params.field2 is defined and params.field2 %}
+        {% if params.field2 %}
             {{ onsInput({
                 "id": params.field2.id,
-                "classes": (" ons-input--error" if (params.error is defined and params.error and params.field2.error is defined and params.field2.error) or (numberOfFields > 1 and params.error is defined and params.error and not params.field1.error and not params.field2.error) else "") + (" ons-js-exclusive-group-item" if params.mutuallyExclusive else ""),
+                "classes": (" ons-input--error" if (params.error and params.field2.error) or (numberOfFields > 1 and params.error and not params.field1.error and not params.field2.error) else "") + (" ons-js-exclusive-group-item" if params.mutuallyExclusive else ""),
                 "width": "2",
                 "type": "number",
                 "name": params.field2.name,
                 "value": params.field2.value,
                 "suffix": {
                     "text": params.field2.suffix.text,
-                    "title": params.field2.suffix.title | default(params.field2.suffix.text),
+                    "title": params.field2.suffix.title,
                     "id": params.field2.suffix.id
                 },
                 "label": {
@@ -63,7 +63,7 @@
         {% endif %}
     {% endset %}
 
-    {% if params.mutuallyExclusive is defined and params.mutuallyExclusive %}
+    {% if params.mutuallyExclusive %}
         {% set mutuallyExclusive = params.mutuallyExclusive | setAttributes({
             "id": params.id,
             "legend": params.legendOrLabel,

package/components/duration/_macro.spec.js

@@ -78,7 +78,6 @@ describe('macro: duration', () => {
         suffix: {
           id: 'address-duration-years-suffix',
           text: 'Years',
-          title: 'Years',
         },
       });
 
@@ -100,7 +99,6 @@ describe('macro: duration', () => {
         suffix: {
           id: 'address-duration-months-suffix',
           text: 'Months',
-          title: 'Months',
         },
       });
     });
@@ -228,7 +226,6 @@ describe('macro: duration', () => {
         suffix: {
           id: 'address-duration-years-suffix',
           text: 'Years',
-          title: 'Years',
         },
       });
     });

package/components/error/_macro.njk

@@ -4,7 +4,7 @@
     {% set content %}
         <p
             class="ons-panel__error"
-            {% if params.attributes is defined and params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value is defined and value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
+            {% if params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
         >
             <strong>{{ params.text }}</strong>
         </p>

package/components/external-link/_macro.njk

@@ -1,6 +1,6 @@
 {# Icon needed to be directly put here instead of calling macro to solve an issue with extra space on the end of links being underlined #}
 {% macro onsExternalLink(params) %}
-    <a href="{{ params.url }}" class="ons-external-link{% if params.classes is defined and params.classes %} {{ params.classes }}{% endif %}" target="_blank" rel="noopener">
+    <a href="{{ params.url }}" class="ons-external-link{% if params.classes %} {{ params.classes }}{% endif %}" target="_blank" rel="noopener">
         <span class="ons-external-link__text">
         {{- params.linkText | safe -}}
         </span><span class="ons-external-link__icon">&nbsp;<svg class="ons-svg-icon" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg" focusable="false" aria-hidden="true">

package/components/feedback/_macro.njk

@@ -1,7 +1,7 @@
 {% macro onsFeedback(params) %}
     {% set headingLevel = params.headingLevel | default("2") %}
-    <div {% if params.id is defined and params.id %} id="{{ params.id }}"{% endif %} class="ons-feedback{% if params.classes is defined and params.classes %} {{ params.classes }}{% endif %}">
-        <h{{ headingLevel }} class="ons-feedback__heading{{ ' ' + params.headingClasses if params.headingClasses is defined and params.headingClasses }}">
+    <div {% if params.id %} id="{{ params.id }}"{% endif %} class="ons-feedback{% if params.classes %} {{ params.classes }}{% endif %}">
+        <h{{ headingLevel }} class="ons-feedback__heading{{ ' ' + params.headingClasses if params.headingClasses }}">
             {{ params.heading }}
         </h{{ headingLevel }}>
         <p class="ons-feedback__content">{{- params.content | safe -}}</p>

package/components/field/_macro.njk

@@ -6,20 +6,20 @@
     {% endif %}
 
     {% set field %}
-        {% if params.dontWrap is defined and params.dontWrap %}
+        {% if params.dontWrap %}
             {{- caller() if caller -}}
         {% else %}
             <div
-                {% if params.id is defined and params.id %}id="{{ params.id }}"{% endif %}
-                class="ons-field{% if params.inline is defined and params.inline %} ons-field--inline{% endif %}{% if params.classes is defined and params.classes %} {{ params.classes }}{% endif %}"
-                {% if params.attributes is defined and params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value is defined and value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
+                {% if params.id %}id="{{ params.id }}"{% endif %}
+                class="ons-field{% if params.inline %} ons-field--inline{% endif %}{% if params.classes %} {{ params.classes }}{% endif %}"
+                {% if params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
             >
                 {{- caller() if caller -}}
             </div>
         {% endif %}
     {% endset %}
 
-    {% if params.error is defined and params.error %}
+    {% if params.error %}
         {% call onsError(params.error) %}
             {{ field | safe }}
         {% endcall %}

package/components/fieldset/_macro.njk

@@ -3,19 +3,19 @@
 {% macro onsFieldset(params) %}
     {% set descriptionID = (params.id ~ "-" if params.id else "") ~ "legend-description" %}
     {% set fieldset -%}
-        {% if params.dontWrap is defined and params.dontWrap -%}
+        {% if params.dontWrap -%}
             <div class="ons-input-items">
                 {{- caller() if caller -}}
             </div>
-        {%- elif (params.legend is defined and params.legend) or (params.legendIsQuestionTitle is defined and params.legendIsQuestionTitle) -%}
+        {%- elif params.legend or params.legendIsQuestionTitle -%}
             <fieldset
-                {% if params.id is defined and params.id %}id="{{ params.id }}"{% endif %}
-                class="ons-fieldset{% if params.classes is defined and params.classes %} {{ params.classes }}{% endif %}"
-                {% if params.attributes is defined and params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value is defined and value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
+                {% if params.id %}id="{{ params.id }}"{% endif %}
+                class="ons-fieldset{% if params.classes %} {{ params.classes }}{% endif %}"
+                {% if params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
             >
-                <legend{% if params.description %} aria-describedBy="{{ descriptionID }}"{% endif %} class="ons-fieldset__legend{% if params.legendIsQuestionTitle %} ons-u-mb-no{% endif %}{% if params.legendClasses is defined and params.legendClasses %} {{ params.legendClasses }}{% endif %}{% if params.description %} ons-fieldset__legend--with-description{% endif %}">
+                <legend{% if params.description %} aria-describedBy="{{ descriptionID }}"{% endif %} class="ons-fieldset__legend{% if params.legendIsQuestionTitle %} ons-u-mb-no{% endif %}{% if params.legendClasses %} {{ params.legendClasses }}{% endif %}{% if params.description %} ons-fieldset__legend--with-description{% endif %}">
                     {%- if params.legendIsQuestionTitle -%}
-                        <h1 id="fieldset-legend-title" class="ons-fieldset__legend-title{% if params.legendTitleClasses is defined and params.legendTitleClasses %} {{ params.legendTitleClasses }}{% endif %}">
+                        <h1 id="fieldset-legend-title" class="ons-fieldset__legend-title{% if params.legendTitleClasses %} {{ params.legendTitleClasses }}{% endif %}">
                             {{- params.legend | safe -}}
                         </h1>
                     {%- else -%}
@@ -32,7 +32,7 @@
         {%- endif %}
     {%- endset %}
 
-    {% if params.error is defined and params.error -%}
+    {% if params.error -%}
         {% call onsError(params.error) %}
             {{- fieldset | safe -}}
         {% endcall %}

package/components/footer/_macro.njk

@@ -3,7 +3,7 @@
     {% from "components/lists/_macro.njk" import onsList %}
     {% from "components/icons/_macro.njk" import onsIcon %}
 
-    {% if params.lang is defined and params.lang %}
+    {% if params.lang %}
         {% set lang = params.lang %}
     {% else %}
         {% set lang = 'en' %}
@@ -30,7 +30,7 @@
     {% endset %}
 
     {% set poweredByLogo %}
-        {% if params.poweredBy is defined and params.poweredBy and params.poweredBy.logo is defined and params.poweredBy.logo %}
+        {% if params.poweredBy and params.poweredBy.logo %}
             {{
                 onsIcon({
                     "iconType": params.poweredBy.logo,
@@ -43,7 +43,7 @@
 
     <footer class="ons-footer">
 
-        {% if params.footerWarning is defined and params.footerWarning %}
+        {% if params.footerWarning %}
             {% from "components/panel/_macro.njk" import onsPanel %}
             <div class="ons-footer__warning">
                 <div class="ons-container">
@@ -58,7 +58,7 @@
             </div>
         {% endif %}
 
-        {% if params.button is defined and params.button %}
+        {% if params.button %}
             {% from "components/button/_macro.njk" import onsButton %}
             <div class="ons-footer__button-container ons-u-d-no@m">
                 {{
@@ -81,16 +81,16 @@
             </div>
         {% endif %}
 
-        <div class="ons-footer__body{{ ' ' + params.classes if params.classes else '' }}" data-analytics="footer" {% if params.attributes is defined and params.attributes %}{% for attribute, value in (params.attributes) %}{{attribute}}="{{value}}" {% endfor %}{% endif %}>
+        <div class="ons-footer__body{{ ' ' + params.classes if params.classes else '' }}" data-analytics="footer" {% if params.attributes %}{% for attribute, value in (params.attributes) %}{{attribute}}="{{value}}" {% endfor %}{% endif %}>
             <div class="ons-container{{ ' ons-container--full-width' if params.fullWidth }}{{ ' ons-container--wide' if params.wide }}">
                 <div class="ons-grid">
-                    {% if params.newTabWarning is defined and params.newTabWarning %}
+                    {% if params.newTabWarning %}
                         <div class="ons-grid__col">
                             <p class="ons-u-fs-s ons-u-mb-m ons-footer__new-tab-warning">{{ params.newTabWarning | safe }}</p>
                         </div>
                     {% endif %}
 
-                    {% if params.cols is defined and params.cols %}
+                    {% if params.cols %}
                         {% for col in params.cols %}
                             <!-- Full footer columns -->
                             <div class="ons-grid__col ons-col-4@m{{ ' ons-u-mt-m@xxs@m' if loop.index > 1 }}">
@@ -106,7 +106,7 @@
                                 }}
                             </div>
                         {% endfor %}
-                    {% elif params.rows is defined and params.rows %}
+                    {% elif params.rows %}
                         {% for row in params.rows %}
                             <!-- Transactional footer row -->
                             <div class="ons-grid__col">
@@ -121,7 +121,7 @@
                         {% endfor %}
                     {% endif %}
 
-                    {% if (params.cols is defined and params.cols) or (params.rows is defined and params.rows) %}
+                    {% if (params.cols) or (params.rows) %}
                         <div class="ons-grid__col ons-u-mb-m">
                             <hr class="ons-footer__hr">
                         </div>
@@ -131,7 +131,7 @@
 
                     <div class="ons-grid ons-grid--flex ons-grid--vertical-top ons-grid--between">
                         <div class="ons-grid__col">
-                            {% if params.legal is defined and params.legal %}
+                            {% if params.legal %}
                                 <!-- Legal -->
                                 {% for legal in params.legal %}
                                     {{
@@ -144,7 +144,7 @@
                                 {% endfor %}
                             {% endif %}
 
-                            {% if params.OGLLink == true or params.OGLLink is defined %}
+                            {% if params.OGLLink %}
                                 <!-- OGL -->
                                 <div class="ons-footer__license ons-u-mb-m">
                                     {{
@@ -152,9 +152,9 @@
                                             "iconType": 'ogl'
                                         })
                                     }}
-                                    {% if params.OGLLink.HTML is defined and params.OGLLink.HTML %}
+                                    {% if params.OGLLink.HTML %}
                                         {{ params.OGLLink.HTML | safe }}
-                                    {% elif params.OGLLink == true or params.OGLLink is defined %}
+                                    {% elif params.OGLLink %}
                                         {% from "components/external-link/_macro.njk" import onsExternalLink %}
                                         {% if params.lang == 'cy' %}
                                             {{ params.OGLLink.pre | default('Mae’r holl gynnwys ar gael o dan y') }} {{
@@ -175,7 +175,7 @@
                                 </div>
                             {% endif %}
 
-                            {% if params.poweredBy is defined and params.poweredBy %}
+                            {% if params.poweredBy %}
                                 {% if not params.poweredBy.partnership %}
                                     <div class="ons-footer__poweredby ons-u-mb-m">
                                         {{ poweredByLogo | safe }}
@@ -188,7 +188,7 @@
                             {% endif %}
                         </div>
 
-                        {% if params.crest is defined and params.crest %}
+                        {% if params.crest %}
                             <!-- Crest -->
                             <div class="ons-grid__col ons-footer__crest ons-u-mb-m@xxs@l">
                                 {{
@@ -200,7 +200,7 @@
                         {% endif %}
                     </div>
 
-                {% if (params.poweredBy is defined and params.poweredBy) and (params.poweredBy.partnership is defined and params.poweredBy.partnership) %}
+                {% if (params.poweredBy) and (params.poweredBy.partnership) %}
                     <div class="ons-grid ons-grid--flex ons-grid--vertical-bottom ons-grid--between ons-u-mt-l">
                         <div class="ons-grid__col ons-footer__poweredby ons-u-mb-m">
                             {{ poweredByLogo | safe }}
@@ -229,7 +229,7 @@
                     </div>
                 {% endif %}
 
-                {% if params.copyrightDeclaration is defined and params.copyrightDeclaration %}
+                {% if params.copyrightDeclaration %}
                 <!-- Copyright -->
                 <div class="ons-grid">
                     <div class="ons-grid__col">