Merge pull request #115 from chriskyfung/fixes/correct-consent-purposes

chriskyfung · Feb 1, 2025 · 61b45d5 · 61b45d5
2 parents aa767ed + 582dd6a
commit 61b45d5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/_includes/blocks/ad-before-content.html b/_includes/blocks/ad-before-content.html
@@ -13,7 +13,7 @@
         data-block-on-consent-purposes="advertising"
         data-npa-on-unknown-consent="true"
       {% when "iubenda" -%}
-        data-block-on-consent-purposes="1,3,4"
+        data-block-on-consent-purposes="1,4,5"
     {% endcase -%}
     type="adsense"
     data-ad-client="{{ site.adsense.client_id }}"

diff --git a/_includes/blocks/disqus.html b/_includes/blocks/disqus.html
@@ -10,9 +10,9 @@
   <amp-iframe width=600 height={{ site.amp_disqus.height | default: 140 }} layout="responsive"
   {%- case consent_type %}
     {% when "built-in" -%}
-      data-block-on-consent-purposes="functional"
+      data-block-on-consent-purposes="functional,analytics,advertising"
     {% when "iubenda" -%}
-      data-block-on-consent-purposes="1,3"
+      data-block-on-consent-purposes="1,3,4,5"
   {% endcase -%}  
     sandbox="allow-scripts allow-same-origin allow-modals allow-popups allow-forms" resizable
     src="{{ site.amp_disqus.url }}?url={{ page.url | absolute_url }}&title='{{ page.title | url_encode }}'">

diff --git a/_includes/sidebar/custom/ad-sidebar.html b/_includes/sidebar/custom/ad-sidebar.html
@@ -15,7 +15,7 @@ <h3><span>Ads</span></h3>
         data-block-on-consent-purposes="advertising"
         data-npa-on-unknown-consent="true"
       {% when "iubenda" -%}
-        data-block-on-consent-purposes="1,3,4"
+        data-block-on-consent-purposes="1,4,5"
     {% endcase -%}
     type="adsense"
     data-ad-client="{{ site.adsense.client_id }}"

diff --git a/_includes/youtube.html b/_includes/youtube.html
@@ -43,8 +43,23 @@
 
 {%- assign data_vars = ' data-vars-video-title="' | append: video_label | append: '"' -%}
 {%- assign data_vars = data_vars | append: ' data-vars-video-url="' | append: video_url | append: '"' -%}
-
-{{ include.indent }}<amp-youtube id="yt-{{- include.id -}}" width="480" height="270" layout="responsive" credentials="omit" data-videoid="{{- include.id -}}"{{ attrs_for_playlist }}{{ attr_title }}{{ data_vars }} data-param-rel="0">
+
+{%- if site.consent == true -%}
+  {%- if site.iubenda.remote_consent_url -%}
+    {%- assign consent_type = "iubenda" -%}
+  {%- else -%}
+    {%- assign consent_type = "built-in" -%}
+  {%- endif -%}
+{%- endif -%}
+
+{{ include.indent }}<amp-youtube id="yt-{{- include.id -}}" width="480" height="270" layout="responsive"
+  {% case consent_type -%}
+    {% when "built-in" -%}
+      data-block-on-consent-purposes="functional"
+    {% when "iubenda" -%}
+      data-block-on-consent-purposes="1,3"
+  {% endcase -%}  
+  credentials="omit" data-videoid="{{- include.id -}}"{{ attrs_for_playlist }}{{ attr_title }}{{ data_vars }} data-param-rel="0">
   <div fallback>
     <p>This browser does not support the YouTube video player. <a href="{{- video_url -}}" rel="noopener" target="_blank">Watch on YouTube</a></p>
   </div>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -142,7 +142,7 @@
           data-block-on-consent-purposes="advertising"
           data-npa-on-unknown-consent="true"
         {% when "iubenda" -%}
-          data-block-on-consent-purposes="1,3,4"
+          data-block-on-consent-purposes="1,4,5"
       {% endcase -%}
       {%- if jekyll.environment != 'production' -%}
         data-adtest="on"