Merge (ads) newor

components/AdPlaceholder.vue

@@ -5,6 +5,7 @@
             <p class="text-center h5">{{phkey}}</p>
             <Debug :v="adConfig"/>
         </template>
+        <div v-else-if="adConfig.waldo" class="adsbynewor" :id="'waldo-tag-' + adConfig.slotId"></div>
         <ins v-else-if="adConfig.adsense" class="adsbygoogle"
              style="display:block;margin-block: 1em;"
              data-ad-client="ca-pub-8518361481036191"
@@ -50,7 +51,7 @@ export default {
         return {
             active: true,
             adConfig: {
-                adsense: true,
+                waldo: true,
                 slotId,
                 adFormat,
                 adLayout,
@@ -78,7 +79,7 @@ export default {
     padding: 1em;
 }
 
-.adsbygoogle:not(:empty), .adsinternal:not(:empty) {
+.adsbygoogle:not(:empty), .adsinternal:not(:empty), .adsbynewor:not(:empty) {
     text-decoration: none;
     &:before {
         content: attr(data-label);

layouts/default.vue

@@ -138,7 +138,7 @@
             async loadAds() {
                 if (!this.adsEnabled) { return; }
 
-                await this.$loadScript('adsense', `https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-8518361481036191`);
+                await this.$loadScript('newor', `https://cdn.thisiswaldo.com/static/js/15234.js`);
             },
             async loadGTM() {
                 if (!this.adsEnabled) { return; }

locale/_base/translations.suml

@@ -998,10 +998,6 @@ privacy:
             We use <strong>hCaptcha</strong> to filter out bots and prevent attacks.
             You can read their privacy policy
             {https://www.hcaptcha.com/privacy=<strong>here</strong>}.
-        ezoic: >
-            In order to fund the project we show ads using a third party technology called <strong>Ezoic</strong>.
-            You can opt-in to allow them to personalise your experience.
-            Their privacy policy is available {https://g.ezoic.net/privacy/pronouns.page=<strong>here</strong>}.
         logsBackups: >
             Logs and backups are stored for no longer than 18 months.
         gdpr: >

locale/en/translations.suml

@@ -1149,12 +1149,22 @@ privacy:
             We use <strong>hCaptcha</strong> to filter out bots and prevent attacks.
             You can read their privacy policy
             {https://www.hcaptcha.com/privacy=<strong>here</strong>}.
+        ezoic: >
+            In order to fund the project we show ads using a third party technology called <strong>Ezoic</strong>.
+            You can opt-in to allow them to personalise your experience.
+            Their privacy policy is available {https://g.ezoic.net/privacy/pronouns.page=<strong>here</strong>}.
         adsense: >
             In order to fund the project we show ads using third party vendors, including <strong>Google</strong>,
             whose ads policy is available {https://support.google.com/adwordspolicy/answer/1316548=here}.
             Google uses cookies that enable it to serve ads to our users based on previous visits to our site and other sites.
             You may opt out of personalised advertising by not giving your consent when prompted,
             by revoking your consent using a button below, or by visiting {https://adssettings.google.com/=Ads Settings}.
+        newor: >
+            In order to fund the project we show ads using third party vendors, including <strong>Newor Media</strong>,
+            whose privacy policy is available {https://newormedia.com/privacy-policy=here}.
+            It uses cookies that enable it to serve ads to our users based on previous visits to our site and other sites.
+            You may opt out of personalised advertising by not giving your consent when prompted
+            or by clicking on the “Privacy” button in the right bottom corner of the page.
         logsBackups: >
             Logs and backups are stored for no longer than 18 months.
         gdpr: >

locale/et/translations.suml

@@ -970,10 +970,6 @@ privacy:
             We use <strong>hCaptcha</strong> to filter out bots and prevent attacks.
             You can read their privacy policy
             {https://www.hcaptcha.com/privacy=<strong>here</strong>}.
-        ezoic: >
-            In order to fund the project we show ads using a third party technology called <strong>Ezoic</strong>.
-            You can opt-in to allow them to personalise your experience.
-            Their privacy policy is available {https://g.ezoic.net/privacy/pronouns.page=<strong>here</strong>}.
         logsBackups: >
             Logs and backups are stored for no longer than 18 months.
         gdpr: >

locale/it/translations.suml

@@ -819,11 +819,6 @@ privacy:
             Utilizziamo hCaptcha per filtrare i bot e prevenire gli attacchi DDoS.
             Puoi leggere la loro politica sulla privacy
             {https://www.hcaptcha.com/privacy=qui}.
-        # TODO (not necessary, it will only show up the English version anyway)
-        ezoic: >
-            In order to fund the project we show ads using a third party technology called <strong>Ezoic</strong>.
-            You can opt-in to allow them to personalise your experience.
-            Their privacy policy is available {https://g.ezoic.net/privacy/pronouns.page=<strong>here</strong>}.
         logsBackups: >
             I registri e i backup sono conservati non più di 18 mesi.
         gdpr: >

locale/ro/translations.suml

@@ -1020,12 +1020,6 @@ privacy:
             Folosim <strong>hCaptcha</strong> pentru a filtra roboții și pentru a preveni atacurile DDoS.
             Le poți citi politica lor de confidențialitate
             {https://www.hcaptcha.com/privacy=<strong>aici</strong>}.
-        adsense: >
-            Pentru a fonda proiectul acesta, arătăm reclame folosind furnizori third-party, precum <strong>Google</strong>,
-            a cărui politică de reclame o poți vedea {https://support.google.com/adwordspolicy/answer/1316548=aici}.
-            Google folosește cookies pentru a-ți arăta reclame pe baza altor site-uri vizitate.
-            Poți opta să nu mai primești reclame personalizate prin a nu accepta când ti se cere,
-            prin a-ți revoca acceptul folosind un buton de mai jos sau vizitând {https://adssettings.google.com/=Setările pentru Reclame}.
         logsBackups: >
             Înregistrările și back-up-urile sunt stocate pentru maximum 18 luni.
         gdpr: >

locale/tok/translations.suml

@@ -762,10 +762,6 @@ privacy:
             mi wile weka e ilo ni.
             mi kepeken ilo <strong>hCaptcha</strong> tawa ni.
             {https://www.hcaptcha.com/privacy=lipu lawa jo ona ni} li lawa e ilo ni.
-        ezoic: >
-            In order to fund the project we show ads using a third party technology called <strong>Ezoic</strong>.
-            You can opt-in to allow them to personalise your experience.
-            Their privacy policy is available {https://g.ezoic.net/privacy/pronouns.page=<strong>here</strong>}.
         logsBackups: >
             Logs and backups are stored for no longer than 18 months.
         gdpr: >

locale/vi/translations.suml

@@ -951,10 +951,6 @@ privacy:
             We use <strong>hCaptcha</strong> to filter out bots and prevent attacks.
             You can read their privacy policy
             {https://www.hcaptcha.com/privacy=<strong>here</strong>}.
-        ezoic: >
-            In order to fund the project we show ads using a third party technology called <strong>Ezoic</strong>.
-            You can opt-in to allow them to personalise your experience.
-            Their privacy policy is available {https://g.ezoic.net/privacy/pronouns.page=<strong>here</strong>}.
         logsBackups: >
             Logs and backups are stored for no longer than 18 months.
         gdpr: >

routes/privacy.vue

@@ -7,8 +7,8 @@
 
         <p class="small"><em>
             <T>terms.lastUpdate</T><T>quotation.colon</T>
-            2023-02-15
+            2023-07-27
-            (Google Tag Manager)
+            (Newor Media)
         </em></p>
 
         <div v-if="$te('terms.translationDisclaimer')" class="alert alert-warning">
@@ -28,7 +28,7 @@
         <p><T>privacy.content.plausible</T></p>
         <p><T>privacy.content.hCaptcha</T></p>
         <p v-if="config.ads && config.ads.enabled">
-            <T>privacy.content.adsense</T>
+            <T>privacy.content.newor</T>
             <T>privacy.content.gtm</T>
         </p>
         <p><T>privacy.content.logsBackups</T></p>

src/adPlaceholders.js

@@ -2,22 +2,22 @@ export default {
     'support': null, // {slotId: 2557549454, adFormat: 'auto', responsive: true},
 
     'aside-left-top': null,
-    'aside-left-middle': null, // prev: {slotId: 8917042232, adFormat: 'autorelaxed'}, // prev: {slotId: 4999879969, adFormat: 'auto', responsive: true},
+    'aside-left-middle': {slotId: '15311'}, // prev: {slotId: 8917042232, adFormat: 'autorelaxed'}, // prev: {slotId: 4999879969, adFormat: 'auto', responsive: true},
     'aside-left-bottom': null,
 
     'aside-right-top': null,
-    'aside-right-middle': null, // prev: {slotId: 2369847195, adFormat: 'auto', responsive: true},
+    'aside-right-middle': {slotId: '15312'}, // prev: {slotId: 2369847195, adFormat: 'auto', responsive: true},
     'aside-right-bottom': null,  // prev: {slotId: 6664353412, adFormat: 'auto', responsive: true},
 
-    'main-0': {slotId: 3137058361, adFormat: 'auto', adLayout: 'in-article'}, // prev: {slotId: 8172838213, adFormat: 'auto', responsive: true},
+    'main-0': {slotId: '15306'}, // prev: {slotId: 3137058361, adFormat: 'auto', adLayout: 'in-article'}, // prev: {slotId: 8172838213, adFormat: 'auto', responsive: true},
-    'main-1': null, //{slotId: 3299823474, adFormat: 'auto', responsive: true},
+    'main-1': {slotId: '15309'}, //{slotId: 3299823474, adFormat: 'auto', responsive: true},
-    'main-2': null, // {slotId: 3108251782, adFormat: 'auto', responsive: true},
+    'main-2': {slotId: '15310'}, // {slotId: 3108251782, adFormat: 'auto', responsive: true},
     'main-3': null, // {slotId: 6716873048, adFormat: 'auto', responsive: true},
     'main-4': null,
     'main-5': null,
     'main-6': null,
 
-    // 'footer': {slotId: 6584462360, adFormat: 'autorelaxed'},
+    'footer': {slotId: '15307'}, // prev: {slotId: 6584462360, adFormat: 'autorelaxed'},
 
-    'small-homepage': {slotId: 6146027401, adFormat: 'auto', responsive: true},
+    'small-homepage': {slotId: '15306'}, //{slotId: 6146027401, adFormat: 'auto', responsive: true},
 };