From 4dde0080cd7f96156a96bb92593a8a46f493682b Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Wed, 13 Sep 2023 17:28:00 +0200
Subject: [PATCH] (ads)(WIP) publift

---
 components/Account.vue             |  6 +--
 components/AdPlaceholder.vue       | 81 ++++++++++++++++++++----------
 components/Dictionary.vue          |  2 +-
 components/Footer.vue              |  2 +-
 components/Header.vue              |  1 +
 components/InclusiveDictionary.vue |  2 +-
 components/NotFound.vue            |  2 +-
 components/Page.vue                |  6 +--
 components/Support.vue             |  2 +-
 components/TermsDictionary.vue     |  2 +-
 layouts/default.vue                |  2 +-
 locale/en/translations.suml        |  6 +++
 routes/any.vue                     |  4 +-
 routes/avoiding.vue                |  4 +-
 routes/blog.vue                    |  2 +-
 routes/blogEntry.vue               |  4 +-
 routes/calendar.vue                |  2 +-
 routes/calendarDay.vue             |  2 +-
 routes/faq.vue                     |  4 +-
 routes/homepage.vue                | 11 ++--
 routes/inclusive.vue               |  2 +-
 routes/links.vue                   |  9 ++--
 routes/mirror.vue                  |  2 +-
 routes/nouns.vue                   |  2 +-
 routes/privacy.vue                 | 19 +++----
 routes/profile.vue                 | 12 ++---
 routes/profileEditor.vue           |  4 +-
 routes/pronoun.vue                 |  6 +--
 routes/pronouns.vue                |  4 +-
 routes/sources.vue                 |  4 +-
 routes/team.vue                    |  4 +-
 routes/terminology.vue             |  2 +-
 src/adPlaceholders.js              | 28 ++++-------
 33 files changed, 133 insertions(+), 112 deletions(-)

diff --git a/components/Account.vue b/components/Account.vue
index a979361f8..5d2a39bbb 100644
--- a/components/Account.vue
+++ b/components/Account.vue
@@ -133,7 +133,7 @@
             </div>
         </div>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <Loading :value="profiles">
             <template v-slot:header>
@@ -146,7 +146,7 @@
             </ul>
         </Loading>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <Loading :value="socialConnections">
             <template v-slot:header>
@@ -192,7 +192,7 @@
             </a>
         </section>
 
-        <AdPlaceholder phkey="main-2"/>
+        <AdPlaceholder :phkey="['content-2', 'content-mobile-2']"/>
 
         <div>
             <iframe v-for="domain in universalDomains"
diff --git a/components/AdPlaceholder.vue b/components/AdPlaceholder.vue
index 9bd1343a4..94778d0ec 100644
--- a/components/AdPlaceholder.vue
+++ b/components/AdPlaceholder.vue
@@ -1,10 +1,13 @@
 <template>
     <div v-if="config.ads && config.ads.enabled && active"
-         :class="[adPlaceholdersVisible ? 'ad-placeholder-preview' : '']">
-        <template v-if="adPlaceholdersVisible">
-            <p class="text-center h5">{{phkey}}</p>
+         :class="[adPlaceholdersVisible ? 'ad-placeholder-preview' : '']"
+         :style="adConfig?.sticky ? 'height: 100%' : null"
+    >
+        <div v-if="adPlaceholdersVisible" :class="[adConfig?.sticky ? 'wrapper-sticky' : '']">
+            <p class="text-center h5">{{currentKey}}</p>
             <Debug :v="adConfig"/>
-        </template>
+        </div>
+        <div v-else-if="adConfig.fuse" :class="['adsbypublift', adConfig?.sticky ? 'wrapper-sticky' : '']" :data-fuse="adConfig.fuse"></div>
         <div v-else-if="adConfig.waldo" :class="['adsbynewor', adConfig.video ? 'waldo-video-tag' : '']" :id="'waldo-tag-' + adConfig.slotId"></div>
         <ins v-else-if="adConfig.adsense" class="adsbygoogle"
              style="display:block;margin-block: 1em;"
@@ -31,40 +34,61 @@ import { adsInternalPerPlaceholder } from "../src/adsInternal";
 import {mapState} from "vuex";
 import {randomItem} from "../src/helpers";
 
+const MOBILE_BREAKPOINT = 992;
+
 export default {
     props: {
         phkey: {required: true},
     },
     data() {
-        if (adsInternalPerPlaceholder[this.phkey]) {
-            return {
-                active: true,
-                adConfig: randomItem(adsInternalPerPlaceholder[this.phkey]),
-            }
-        }
-
-        if (!adPlaceholders[this.phkey]) {
-            return { active: false, adConfig: {} }; // FIXME
-        }
-
-        const {slotId, adFormat, adLayout = null, responsive = false, video = false} = adPlaceholders[this.phkey];
         return {
-            active: true,
-            adConfig: {
-                waldo: true,
-                slotId,
-                adFormat,
-                adLayout,
-                responsive,
-                video,
-            }
+            isMobile: undefined,
         }
     },
     mounted() {
         if (!process.client) { return; }
         (window.adsbygoogle = window.adsbygoogle || []).push({});
+        this.handleResize();
+        window.addEventListener('resize', this.handleResize);
+    },
+    beforeUnmount() {
+        window.removeEventListener('resize', this.handleResize);
+    },
+    methods: {
+        handleResize() {
+            this.isMobile = window.innerWidth < MOBILE_BREAKPOINT;
+        },
     },
     computed: {
+        currentKey() {
+            if (!Array.isArray(this.phkey)) {
+                return this.phkey;
+            }
+            return this.phkey[this.isMobile ? 1 : 0];
+        },
+        active() {
+            return this.isMobile !== undefined && this.currentKey
+                && (adsInternalPerPlaceholder[this.currentKey] || adPlaceholders[this.currentKey]);
+        },
+        adConfig() {
+            if (!this.active) { return {}; }
+
+            if (adsInternalPerPlaceholder[this.currentKey]) {
+                return randomItem(adsInternalPerPlaceholder[this.currentKey]);
+            }
+
+            const {slotId, adFormat, adLayout = null, responsive = false, video = false, sticky = false} = adPlaceholders[this.currentKey];
+            return {
+                fuse: true,
+                slotId,
+                adFormat,
+                adLayout,
+                responsive,
+                video,
+                sticky,
+            }
+        },
+        // adPlaceholdersVisible: () => true,
         ...mapState([
             'adPlaceholdersVisible',
         ]),
@@ -80,7 +104,7 @@ export default {
     padding: 1em;
 }
 
-.adsbygoogle:not(:empty), .adsinternal:not(:empty), .adsbynewor:not(:empty) {
+.adsbygoogle:not(:empty), .adsinternal:not(:empty), .adsbynewor:not(:empty), .adsbypublift:not(:empty) {
     text-decoration: none;
     &:before {
         content: attr(data-label);
@@ -88,4 +112,9 @@ export default {
         font-size: 0.7rem;
     }
 }
+.wrapper-sticky {
+    position: -webkit-sticky;
+    position: sticky;
+    top: 0;
+}
 </style>
diff --git a/components/Dictionary.vue b/components/Dictionary.vue
index ab3f6e8b4..23f22737d 100644
--- a/components/Dictionary.vue
+++ b/components/Dictionary.vue
@@ -143,7 +143,7 @@
             </template>
         </Table>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <template v-if="config.nouns.submit">
             <Separator icon="plus"/>
diff --git a/components/Footer.vue b/components/Footer.vue
index f6ba6711b..eb1e938e2 100644
--- a/components/Footer.vue
+++ b/components/Footer.vue
@@ -174,9 +174,9 @@
                 <Stats/>
             </div>
         </div>
-        <AdPlaceholder phkey="footer"/>
         <EasterEgg/>
         <UkraineBanner class="my-3"/>
+        <AdPlaceholder phkey="footer"/>
         </div>
     </footer>
     <div v-else>
diff --git a/components/Header.vue b/components/Header.vue
index eabe889a6..0e1e0d29c 100644
--- a/components/Header.vue
+++ b/components/Header.vue
@@ -28,6 +28,7 @@
                             <Logo flag class="me-2"/><span class="higher"><T>title</T></span>
                         </h1>
                     </nuxt-link>
+                    <AdPlaceholder :phkey="[null, 'header']"/>
                     <VersionDropdown/>
                 </div>
                 <div class="btn-group-vertical d-flex nav-custom mb-2">
diff --git a/components/InclusiveDictionary.vue b/components/InclusiveDictionary.vue
index 2f43064ba..fd975e0fa 100644
--- a/components/InclusiveDictionary.vue
+++ b/components/InclusiveDictionary.vue
@@ -214,7 +214,7 @@
             </template>
         </Table>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <Separator icon="plus"/>
 
diff --git a/components/NotFound.vue b/components/NotFound.vue
index 366ccf4e7..d0acbcb05 100644
--- a/components/NotFound.vue
+++ b/components/NotFound.vue
@@ -12,6 +12,6 @@
             </nuxt-link>
         </p>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
     </div>
 </template>
diff --git a/components/Page.vue b/components/Page.vue
index 322bc04d2..9d5f53a4b 100644
--- a/components/Page.vue
+++ b/components/Page.vue
@@ -1,9 +1,9 @@
 <template>
     <div>
-        <div class="main-asides d-flex flex-column flex-xxl-row justify-content-center align-items-center align-items-xxl-start">
+        <div class="main-asides d-flex flex-column flex-xxl-row justify-content-center align-items-center align-items-xxl-stretch">
             <aside v-if="!wide" class="aside-left p-0 p-xxl-3">
                 <slot name="aside-left">
-                    <AdPlaceholder phkey="aside-left-middle" class="d-none d-xxl-block"/>
+                    <AdPlaceholder :phkey="['aside-left', null]" class="d-none d-xxl-block"/>
                 </slot>
             </aside>
             <main :class="[wide ? 'wide' : '']">
@@ -11,7 +11,7 @@
             </main>
             <aside v-if="!wide" class="aside-right">
                 <slot name="aside-right">
-                    <AdPlaceholder phkey="aside-right-middle"/>
+                    <AdPlaceholder :phkey="['aside-right', null]"/>
                 </slot>
             </aside>
         </div>
diff --git a/components/Support.vue b/components/Support.vue
index 066606d33..519883ec6 100644
--- a/components/Support.vue
+++ b/components/Support.vue
@@ -1,5 +1,5 @@
 <template>
-    <AdPlaceholder phkey="support"/>
+    <AdPlaceholder phkey="content-footer"/>
     <!--
     <section>
         <h3>
diff --git a/components/TermsDictionary.vue b/components/TermsDictionary.vue
index ebcf0ea1a..944921a1e 100644
--- a/components/TermsDictionary.vue
+++ b/components/TermsDictionary.vue
@@ -100,7 +100,7 @@
             </template>
         </Table>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <Separator icon="plus"/>
 
diff --git a/layouts/default.vue b/layouts/default.vue
index 2838ad4f4..650ca9b82 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -138,7 +138,7 @@
             async loadAds() {
                 if (!this.adsEnabled) { return; }
 
-                await this.$loadScript('newor', `https://cdn.thisiswaldo.com/static/js/15234.js`);
+                await this.$loadScript('newor', `https://cdn.fuseplatform.net/publift/tags/2/3329/fuse.js`);
             },
             async loadGTM() {
                 if (!this.adsEnabled) { return; }
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index d20167850..d918b8759 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -1170,6 +1170,12 @@ privacy:
             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.
+        publift: >
+            In order to fund the project we show ads using third party vendors, including <strong>Publift</strong>,
+            whose privacy policy is available {https://www.publift.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
+            by using the button below.
         logsBackups: >
             Logs and backups are stored for no longer than 18 months.
         gdpr: >
diff --git a/routes/any.vue b/routes/any.vue
index ebcd5ea27..2fce551c2 100644
--- a/routes/any.vue
+++ b/routes/any.vue
@@ -39,7 +39,7 @@
 
         <PronounGroup v-for="pronounGroup in pronounGroups" :key="pronounGroup.name" :pronounGroup="pronounGroup"/>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <section>
             <Share :title="`${$t('pronouns.intro')}: ${$t('pronouns.any.short')}`"/>
@@ -54,7 +54,7 @@
             <T>home.about</T>
             <Homepage align="center"/>
 
-            <AdPlaceholder phkey="main-1"/>
+            <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
         </section>
     </div>
     </Page>
diff --git a/routes/avoiding.vue b/routes/avoiding.vue
index 12772dec5..f01dc17ea 100644
--- a/routes/avoiding.vue
+++ b/routes/avoiding.vue
@@ -8,11 +8,11 @@
             <LinkedText :text="config.pronouns.null.history"/>
         </p>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <Avoiding/>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
     </Page>
 </template>
 
diff --git a/routes/blog.vue b/routes/blog.vue
index 1c38e3064..e1a0937e7 100644
--- a/routes/blog.vue
+++ b/routes/blog.vue
@@ -5,7 +5,7 @@
             <Icon v="pen-nib"/>
             <T>links.blog</T>
         </h2>
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
         <BlogEntriesList :posts="posts" details/>
         <Separator icon="heart"/>
         <Support/>
diff --git a/routes/blogEntry.vue b/routes/blogEntry.vue
index ec995ae64..87138a5ba 100644
--- a/routes/blogEntry.vue
+++ b/routes/blogEntry.vue
@@ -10,11 +10,11 @@
             </router-link>
         </p>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <Spelling :text="content"/>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <div class="d-print-none">
             <Separator icon="heart"/>
diff --git a/routes/calendar.vue b/routes/calendar.vue
index a04842f65..3b94c1c1d 100644
--- a/routes/calendar.vue
+++ b/routes/calendar.vue
@@ -61,7 +61,7 @@
         </template>
 
         <template v-if="!basic">
-            <AdPlaceholder phkey="main-1"/>
+            <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
             <CalendarExtra :year="year"/>
 
             <Separator icon="heart"/>
diff --git a/routes/calendarDay.vue b/routes/calendarDay.vue
index 27665e239..a018a4466 100644
--- a/routes/calendarDay.vue
+++ b/routes/calendarDay.vue
@@ -39,7 +39,7 @@
         </section>
 
         <template v-if="!basic">
-            <AdPlaceholder phkey="main-1"/>
+            <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
             <CalendarExtra :day="day"/>
 
             <Separator icon="heart"/>
diff --git a/routes/faq.vue b/routes/faq.vue
index e9fcaa8b3..852906ee0 100644
--- a/routes/faq.vue
+++ b/routes/faq.vue
@@ -26,7 +26,7 @@
             </div>
         </details>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <section itemscope itemtype="https://schema.org/FAQPage">
             <Answer v-for="question in Object.keys($t('faq.questions'))" :key="question"
@@ -39,7 +39,7 @@
             />
         </section>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <section>
             <Share :title="$t('faq.headerLong')"/>
diff --git a/routes/homepage.vue b/routes/homepage.vue
index 1de3ff323..459b26b79 100644
--- a/routes/homepage.vue
+++ b/routes/homepage.vue
@@ -1,7 +1,7 @@
 <template>
     <Page>
         <UkraineBanner class="mb-4"/>
-        <AdPlaceholder phkey="small-homepage"/>
+        <AdPlaceholder :phkey="['header', null]"/>
         <template v-if="$te('home.welcome')">
             <section>
                 <h2>
@@ -26,11 +26,7 @@
                     </div>
                 </div>
 
-                <AdPlaceholder phkey="main-0"/>
-
                 <CalendarBanner link/>
-
-                <AdPlaceholder phkey="main-1"/>
             </section>
         </template>
 
@@ -41,7 +37,7 @@
 
             <T>home.about</T>
 
-            <AdPlaceholder phkey="main-2"/>
+            <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
             <CardsBanner/>
 
@@ -55,7 +51,6 @@
         <Separator icon="bookmark"/>
 
         <section>
-            <AdPlaceholder phkey="main-3"/>
             <div class="row">
                 <div class="col-12 col-md-6">
                     <LanguageVersions/>
@@ -70,6 +65,8 @@
             </div>
         </section>
 
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
+
         <template v-if="posts.length">
             <Separator icon="pen-nib" class="mb-5"/>
             <section>
diff --git a/routes/inclusive.vue b/routes/inclusive.vue
index 3ec03799e..09b92008c 100644
--- a/routes/inclusive.vue
+++ b/routes/inclusive.vue
@@ -12,7 +12,7 @@
             <Share :title="$t('inclusive.headerLong')"/>
         </section>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <InclusiveDictionary load ref="inclusivedictionary"/>
     </Page>
diff --git a/routes/links.vue b/routes/links.vue
index 2b30f47ff..d3fd2b8cb 100644
--- a/routes/links.vue
+++ b/routes/links.vue
@@ -10,18 +10,15 @@
             <BlogEntriesList :posts="posts" details/>
         </section>
         <Endorsements/>
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
         <Links/>
-        <AdPlaceholder phkey="main-1"/>
         <AcademicLinks v-if="!config.links.split && config.links.academic.length > 0"/>
-        <AdPlaceholder phkey="main-2"/>
         <Media v-if="(config.links.mediaGuests.length + config.links.mediaMentions.length > 0) && (!config.links.split || (config.links.mediaGuests.length + config.links.mediaMentions.length <= 2))"/>
-        <AdPlaceholder phkey="main-3"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
         <Recommended/>
-        <AdPlaceholder phkey="main-4"/>
         <Socials/>
-        <AdPlaceholder phkey="main-5"/>
         <LanguageVersions/>
+        <AdPlaceholder :phkey="['content-2', 'content-mobile-2']"/>
         <section>
             <h2 class="mb-3">
                 <Icon v="home-heart"/>
diff --git a/routes/mirror.vue b/routes/mirror.vue
index 67fafdb65..e5cfba171 100644
--- a/routes/mirror.vue
+++ b/routes/mirror.vue
@@ -14,7 +14,7 @@
             </li>
         </ul>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
     </Page>
 </template>
 
diff --git a/routes/nouns.vue b/routes/nouns.vue
index 1faf693ec..8e7ccf658 100644
--- a/routes/nouns.vue
+++ b/routes/nouns.vue
@@ -13,7 +13,7 @@
             <Share :title="$t('nouns.headerLong')"/>
         </section>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <NounsExtra>
             <details v-if="config.nouns.collapsable" class="border mb-3" ref="dictionarywrapper">
diff --git a/routes/privacy.vue b/routes/privacy.vue
index 5e099cdd9..a2ba37928 100644
--- a/routes/privacy.vue
+++ b/routes/privacy.vue
@@ -7,8 +7,8 @@
 
         <p class="small"><em>
             <T>terms.lastUpdate</T><T>quotation.colon</T>
-            2023-07-27
-            (Newor Media)
+            2023-09-14
+            (Publift)
         </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.newor</T>
+            <T>privacy.content.publift</T>
             <T>privacy.content.gtm</T>
         </p>
         <p><T>privacy.content.logsBackups</T></p>
@@ -36,12 +36,7 @@
 
         <template v-if="config.ads && config.ads.enabled">
             <hr/>
-            <p>
-                <a href="#" @click.prevent="revokeCookieConsent">
-                    <Icon v="eraser"/>
-                    <T>privacy.consent.revoke</T>
-                </a>
-            </p>
+            <div data-fuse-privacy-tool></div>
         </template>
     </Page>
 </template>
@@ -55,3 +50,9 @@ export default {
     },
 }
 </script>
+
+<style lang="scss">
+#fuse-privacy-tool {
+    font-size: 0.5rem;
+}
+</style>
diff --git a/routes/profile.vue b/routes/profile.vue
index 14290df16..0e71b28e3 100644
--- a/routes/profile.vue
+++ b/routes/profile.vue
@@ -11,7 +11,7 @@
             </div>
         </section>
 
-        <AdPlaceholder phkey="small-homepage"/>
+        <AdPlaceholder :phkey="['header', null]"/>
 
         <div class="position-relative">
             <div v-if="profile.sensitive.length && !contentWarningDismissed" class="content-warning text-center">
@@ -30,20 +30,18 @@
             </div>
         </div>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <CardsBanner/>
 
         <template v-slot:aside-left>
             <ProfileShare :user="user" class="d-none d-xxl-block" :mainPronoun="mainPronoun"/>
-            <AdPlaceholder phkey="aside-left-middle" class="d-none d-xxl-block"/>
+            <AdPlaceholder :phkey="['aside-left', null]" class="d-none d-xxl-block"/>
         </template>
 
         <template v-slot:aside-right>
             <div class="row">
                 <div class="my-2 col-12 col-lg-4 col-xxl-12">
-                    <AdPlaceholder phkey="aside-right-top"/>
-
                     <div v-if="$user() && $user().username === user.username" class="list-group list-group-flare">
                         <div class="list-group-item pt-3">
                             <h5>
@@ -117,8 +115,9 @@
                     </div>
                 </div>
 
+                <AdPlaceholder :phkey="['aside-right', null]"/>
+
                 <div class="my-2 col-12 col-lg-4 col-xxl-12">
-                    <AdPlaceholder phkey="aside-right-middle"/>
                     <div v-if="Object.keys(user.profiles).length > 1" class="list-group list-group-flare">
                         <div class="list-group-item pt-3">
                             <h5>
@@ -137,7 +136,6 @@
 
                 <div class="my-2 col-12 col-lg-4 col-xxl-12">
                     <ProfileShare :user="user" class="d-xxl-none" :mainPronoun="mainPronoun"/>
-                    <AdPlaceholder phkey="aside-right-bottom"/>
                 </div>
             </div>
         </template>
diff --git a/routes/profileEditor.vue b/routes/profileEditor.vue
index f292bc59f..889fab343 100644
--- a/routes/profileEditor.vue
+++ b/routes/profileEditor.vue
@@ -2,7 +2,7 @@
     <Page>
     <MustLogin v-if="!$user()"/>
     <div v-else>
-        <AdPlaceholder phkey="small-homepage"/>
+        <AdPlaceholder :phkey="['header', null]"/>
         <div class="mb-3 d-flex justify-content-between flex-column flex-md-row">
             <h2 class="text-nowrap">
                 <Avatar :user="$user()"/>
@@ -280,7 +280,7 @@
                 </button>
             </section>
 
-            <AdPlaceholder phkey="main-1"/>
+            <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
         </form>
     </div>
     </Page>
diff --git a/routes/pronoun.vue b/routes/pronoun.vue
index e1e17bb0d..701af382c 100644
--- a/routes/pronoun.vue
+++ b/routes/pronoun.vue
@@ -67,11 +67,11 @@
             </template>
         </section>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <GrammarTables :selectedPronoun="selectedPronoun" :counter="counter"/>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <PronounGroup :pronounGroup="pronounGroup"/>
 
@@ -85,7 +85,7 @@
             <Literature :pronoun="selectedPronoun" :sources="groupedSources"/>
         </section>
 
-        <AdPlaceholder phkey="main-2"/>
+        <AdPlaceholder :phkey="['content-2', 'content-mobile-2']"/>
 
         <Separator icon="info"/>
         <section class="mb-0">
diff --git a/routes/pronouns.vue b/routes/pronouns.vue
index 136811cb7..e19260c39 100644
--- a/routes/pronouns.vue
+++ b/routes/pronouns.vue
@@ -16,7 +16,7 @@
 
             <CardsBanner/>
 
-            <AdPlaceholder phkey="main-0"/>
+            <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
             <ul class="list-group mt-4">
                 <li v-for="[group, groupPronouns] in pronounLibrary.split()" class="list-group-item">
@@ -220,7 +220,7 @@
             </ul>
         </section>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
 
         <Separator icon="fist-raised"/>
 
diff --git a/routes/sources.vue b/routes/sources.vue
index a060e6275..9836c3ef6 100644
--- a/routes/sources.vue
+++ b/routes/sources.vue
@@ -13,7 +13,7 @@
             <Share :title="$t('sources.headerLonger')"/>
         </section>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <SourcesChart :sources="sources" label="all pronouns"/>
 
@@ -140,7 +140,7 @@
 
         </template></Loading>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
     </Page>
 </template>
 
diff --git a/routes/team.vue b/routes/team.vue
index e615eb39a..ee8aff0f2 100644
--- a/routes/team.vue
+++ b/routes/team.vue
@@ -88,7 +88,7 @@
             </ul>
         </section>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <section>
             <h3>
@@ -125,7 +125,7 @@
             </template>
         </section>
 
-        <AdPlaceholder phkey="main-1"/>
+        <AdPlaceholder :phkey="['content-1', 'content-mobile-1']"/>
     </Page>
 </template>
 
diff --git a/routes/terminology.vue b/routes/terminology.vue
index 7c480881a..178029edb 100644
--- a/routes/terminology.vue
+++ b/routes/terminology.vue
@@ -14,7 +14,7 @@
 
         <ModerationRules type="rulesTerminology" emphasise/>
 
-        <AdPlaceholder phkey="main-0"/>
+        <AdPlaceholder :phkey="['content-0', 'content-mobile-0']"/>
 
         <TermsDictionary load ref="termsdictionary"/>
     </Page>
diff --git a/src/adPlaceholders.js b/src/adPlaceholders.js
index e3941bba8..cbeb7df2b 100644
--- a/src/adPlaceholders.js
+++ b/src/adPlaceholders.js
@@ -1,23 +1,15 @@
 export default {
-    'support': null, // {slotId: 2557549454, adFormat: 'auto', responsive: true},
+    'header': {slotId: '22990353741', name: '71161633/PRNNSPG_pronounspage/header'},
 
-    'aside-left-top': null,
-    'aside-left-middle': null, // {slotId: '15311'}, // prev: {slotId: 8917042232, adFormat: 'autorelaxed'}, // prev: {slotId: 4999879969, adFormat: 'auto', responsive: true},
-    'aside-left-bottom': null,
+    'content-0': {slotId: '22990470028', name: '71161633/PRNNSPG_pronounspage/incontent_1'},
+    'content-1': {slotId: '22990353738', name: '71161633/PRNNSPG_pronounspage/incontent_2'},
+    'content-footer': {slotId: '22990470040', name: '71161633/PRNNSPG_pronounspage/blog_footer'},
+    'content-mobile-0': {slotId: '22990353744', name: '71161633/PRNNSPG_pronounspage/mrec_1'},
+    'content-mobile-1': {slotId: '22990470043', name: '71161633/PRNNSPG_pronounspage/mrec_2'},
+    'content-mobile-2': {slotId: '22990470046', name: '71161633/PRNNSPG_pronounspage/mrec_3'},
 
-    'aside-right-top': null,
-    'aside-right-middle': {slotId: '15312'}, // prev: {slotId: 2369847195, adFormat: 'auto', responsive: true},
-    'aside-right-bottom': null,  // prev: {slotId: 6664353412, adFormat: 'auto', responsive: true},
+    'aside-left': {slotId: '22990470034', name: '71161633/PRNNSPG_pronounspage/vrec_lhs', sticky: true},
+    'aside-right': {slotId: '22990470031', name: '71161633/PRNNSPG_pronounspage/vrec_rhs', sticky: true},
 
-    'main-0': {slotId: '15597'}, // video: true // prev: {slotId: 3137058361, adFormat: 'auto', adLayout: 'in-article'}, // prev: {slotId: 8172838213, adFormat: 'auto', responsive: true},
-    'main-1': {slotId: '15306'}, //{slotId: 3299823474, adFormat: 'auto', responsive: true},
-    'main-2': {slotId: '15309'}, // {slotId: 3108251782, adFormat: 'auto', responsive: true},
-    'main-3': {slotId: '15310'}, // {slotId: 6716873048, adFormat: 'auto', responsive: true},
-    'main-4': null,
-    'main-5': null,
-    'main-6': null,
-
-    'footer': {slotId: '15307'}, // prev: {slotId: 6584462360, adFormat: 'autorelaxed'},
-
-    'small-homepage': {slotId: '15306'}, //{slotId: 6146027401, adFormat: 'auto', responsive: true},
+    'footer': {slotId: '22990470037', name: '71161633/PRNNSPG_pronounspage/footer'},
 };