Merge remote-tracking branch 'origin/development' into upg100/examples

2026-09-29 22:17:24 +00:00 · 2026-09-29 22:17:24 +00:00 · e704bdbbf8
commit e704bdbbf8
parent 9c5ac8094b 99c22caf72
18 changed files with 156 additions and 52 deletions
--- a/library/i18n/locales/ar/mapInfo.json
+++ b/library/i18n/locales/ar/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "كل الشعوب في عرض واحد. صفِّ حسب الصلاة أو الشعب أو المنطقة أو الدولة أو اللغة، فتضيق الخريطة والجدول والإجماليات معًا.",
-      "takeaway": "خذ معك الصفوف التي صفّيتها في جدول بيانات."
+      "takeaway": "الصفوف التي صفّيتها، في جدول بيانات."
    },
    "research-map-plus-grid": {
      "lead": "الخريطة إلى جانب القائمة. اختر شعبًا على الخريطة فتتبعه القائمة، وضيِّق القائمة فتتبعها الخريطة.",
-      "takeaway": "خذ معك ملصقًا للخريطة كما تراها، جاهزًا للطباعة، وحزمة صلاة لتوزّعها.",
+      "takeaway": "ملصق للخريطة كما تراها، جاهز للطباعة، وحزمة صلاة لتوزّعها.",
      "examplePacket": "مثال على حزمة الصلاة: قلب الشرق الأوسط"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "افتح دولة لرؤية مجموعاتها، ثم أنشئ ملصقًا وحزمة صلاة ومجموعة بطاقات للطباعة أو المشاركة.",
      "note": "تُنشأ الملصقات والحزم والبطاقات في متصفحك لكل دولة ما عدا الهند والصين (قريبًا)."
    }
+  },
+  "col": {
+    "peopleGroup": "الشعب",
+    "country": "الدولة",
+    "region": "المنطقة",
+    "population": "السكان"
  }
 }
--- a/library/i18n/locales/de/mapInfo.json
+++ b/library/i18n/locales/de/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "Alle Völker in einer Ansicht. Filtern Sie nach Gebet, Volk, Region, Land oder Sprache – Karte, Tabelle und Summen werden gemeinsam eingegrenzt.",
-      "takeaway": "Nehmen Sie die gefilterten Zeilen als Tabelle mit."
+      "takeaway": "Die gefilterten Zeilen als Tabelle."
    },
    "research-map-plus-grid": {
      "lead": "Die Karte neben der Liste. Wählen Sie ein Volk auf der Karte, und die Liste folgt; grenzen Sie die Liste ein, und die Karte folgt.",
-      "takeaway": "Nehmen Sie ein Poster der Karte, wie Sie sie sehen, druckfertig, und ein Gebetspaket zum Verteilen mit.",
+      "takeaway": "Ein Poster der Karte, wie Sie sie sehen, druckfertig, und ein Gebetspaket zum Verteilen.",
      "examplePacket": "Beispiel-Gebetsheft: Kerngebiet Naher Osten"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Öffnen Sie ein Land, um seine Volksgruppen zu sehen, und erzeugen Sie dann ein Poster, ein Gebetspaket und ein Kartenset zum Drucken oder Teilen.",
      "note": "Poster, Pakete und Karten entstehen in Ihrem Browser für jedes Land außer Indien und China (in Kürze)."
    }
+  },
+  "col": {
+    "peopleGroup": "Volk",
+    "country": "Land",
+    "region": "Region",
+    "population": "Bevölkerung"
  }
 }
--- a/library/i18n/locales/en/mapInfo.json
+++ b/library/i18n/locales/en/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "Every people group in one view. Filter by prayer, people, region, country or language, and the map, the table and the totals all narrow together.",
-      "takeaway": "Take away the rows you filtered to, as a spreadsheet."
+      "takeaway": "The rows you filtered to, as a spreadsheet."
    },
    "research-map-plus-grid": {
      "lead": "The map beside the list. Pick a people group on the map and the list follows it; narrow the list and the map follows back.",
-      "takeaway": "Take away a poster of the map as you see it, ready to print, and a prayer packet to hand out.",
+      "takeaway": "A poster of the map as you see it, ready to print, and a prayer packet to hand out.",
      "examplePacket": "Example packet: Middle East Core"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Open a country to see its groups, then generate a poster, a prayer packet and a card deck to print or share.",
      "note": "Posters, packets and cards generate in your browser for each country except India and China (coming soon)."
    }
+  },
+  "col": {
+    "peopleGroup": "People Group",
+    "country": "Country",
+    "region": "Region",
+    "population": "Population"
  }
 }
--- a/library/i18n/locales/es/mapInfo.json
+++ b/library/i18n/locales/es/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "Todos los pueblos en una sola vista. Filtre por oración, pueblo, región, país o idioma: el mapa, la tabla y los totales se reducen a la vez.",
-      "takeaway": "Llévese las filas que filtró, en una hoja de cálculo."
+      "takeaway": "Las filas que filtró, en una hoja de cálculo."
    },
    "research-map-plus-grid": {
      "lead": "El mapa junto a la lista. Elija un pueblo en el mapa y la lista lo sigue; reduzca la lista y el mapa la sigue.",
-      "takeaway": "Llévese un póster del mapa tal como lo ve, listo para imprimir, y un paquete de oración para repartir.",
+      "takeaway": "Un póster del mapa tal como lo ve, listo para imprimir, y un paquete de oración para repartir.",
      "examplePacket": "Paquete de oración de ejemplo: núcleo de Oriente Medio"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Abre un país para ver sus grupos y genera un póster, un paquete de oración y una baraja de tarjetas para imprimir o compartir.",
      "note": "Los pósteres, paquetes y tarjetas se generan en tu navegador para cada país excepto India y China (próximamente)."
    }
+  },
+  "col": {
+    "peopleGroup": "Pueblo",
+    "country": "País",
+    "region": "Región",
+    "population": "Población"
  }
 }
--- a/library/i18n/locales/fr/mapInfo.json
+++ b/library/i18n/locales/fr/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "Tous les peuples dans une seule vue. Filtrez par prière, peuple, région, pays ou langue : la carte, le tableau et les totaux se réduisent ensemble.",
-      "takeaway": "Emportez les lignes filtrées sous forme de tableur."
+      "takeaway": "Les lignes filtrées, sous forme de tableur."
    },
    "research-map-plus-grid": {
      "lead": "La carte à côté de la liste. Choisissez un peuple sur la carte et la liste le suit ; réduisez la liste et la carte suit.",
-      "takeaway": "Emportez une affiche de la carte telle que vous la voyez, prête à imprimer, et un dossier de prière à distribuer.",
+      "takeaway": "Une affiche de la carte telle que vous la voyez, prête à imprimer, et un dossier de prière à distribuer.",
      "examplePacket": "Livret de prière d’exemple : cœur du Moyen-Orient"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Ouvrez un pays pour voir ses groupes, puis générez une affiche, un dossier de prière et un jeu de cartes à imprimer ou à partager.",
      "note": "Affiches, dossiers et cartes sont générés dans votre navigateur pour chaque pays sauf l'Inde et la Chine (bientôt disponible)."
    }
+  },
+  "col": {
+    "peopleGroup": "Peuple",
+    "country": "Pays",
+    "region": "Région",
+    "population": "Population"
  }
 }
--- a/library/i18n/locales/hi/mapInfo.json
+++ b/library/i18n/locales/hi/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "सभी जनसमूह एक ही दृश्य में। प्रार्थना, जनसमूह, क्षेत्र, देश या भाषा से छाँटें — नक्शा, तालिका और कुल एक साथ सीमित होते हैं।",
-      "takeaway": "छाँटी गई पंक्तियाँ स्प्रेडशीट के रूप में साथ ले जाएँ।"
+      "takeaway": "छाँटी गई पंक्तियाँ, स्प्रेडशीट के रूप में।"
    },
    "research-map-plus-grid": {
      "lead": "सूची के साथ नक्शा। नक्शे पर एक जनसमूह चुनें और सूची उसका अनुसरण करती है; सूची सीमित करें और नक्शा अनुसरण करता है।",
-      "takeaway": "नक्शे का पोस्टर जैसा आप देखते हैं, छपाई के लिए तैयार, और बाँटने के लिए प्रार्थना पैकेट साथ ले जाएँ।",
+      "takeaway": "नक्शे का पोस्टर, जैसा आप उसे देखते हैं, छपाई के लिए तैयार, और बाँटने के लिए प्रार्थना पैकेट।",
      "examplePacket": "उदाहरण प्रार्थना पुस्तिका: मध्य पूर्व का केंद्र"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "किसी देश को खोलकर उसके जनसमूह देखें, फिर छापने या साझा करने के लिए पोस्टर, प्रार्थना पैकेट और कार्ड सेट बनाएँ।",
      "note": "पोस्टर, पैकेट और कार्ड आपके ब्राउज़र में भारत और चीन को छोड़कर हर देश के लिए बनते हैं (शीघ्र आ रहा है)।"
    }
+  },
+  "col": {
+    "peopleGroup": "जनसमूह",
+    "country": "देश",
+    "region": "क्षेत्र",
+    "population": "जनसंख्या"
  }
 }
--- a/library/i18n/locales/it/mapInfo.json
+++ b/library/i18n/locales/it/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "Tutti i popoli in un'unica vista. Filtra per preghiera, popolo, regione, paese o lingua: mappa, tabella e totali si restringono insieme.",
-      "takeaway": "Porta con te le righe filtrate, come foglio di calcolo."
+      "takeaway": "Le righe filtrate, come foglio di calcolo."
    },
    "research-map-plus-grid": {
      "lead": "La mappa accanto all'elenco. Scegli un popolo sulla mappa e l'elenco lo segue; restringi l'elenco e la mappa lo segue.",
-      "takeaway": "Porta con te un poster della mappa così come la vedi, pronto da stampare, e un pacchetto di preghiera da distribuire.",
+      "takeaway": "Un poster della mappa così come la vedi, pronto da stampare, e un pacchetto di preghiera da distribuire.",
      "examplePacket": "Libretto di preghiera di esempio: cuore del Medio Oriente"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Apri un Paese per vederne i gruppi, poi genera un poster, un pacchetto di preghiera e un mazzo di schede da stampare o condividere.",
      "note": "Poster, pacchetti e schede vengono generati nel tuo browser per ogni Paese tranne India e Cina (prossimamente)."
    }
+  },
+  "col": {
+    "peopleGroup": "Popolo",
+    "country": "Paese",
+    "region": "Regione",
+    "population": "Popolazione"
  }
 }
--- a/library/i18n/locales/pt/mapInfo.json
+++ b/library/i18n/locales/pt/mapInfo.json
@ -30,12 +30,12 @@
      "takeaway": "Escritura, áudio, filme, vídeo bíblico, formação — e o que ainda falta. Clique num país para listar os seus povos, ou num povo para a sua ficha com ligações activas a cada recurso encontrado. «Nada encontrado» significa ausente dos acervos que esta versão consultou, nunca prova de que nada exista."
    },
    "dashboard-plus-grid": {
-      "lead": "Todos os povos numa só vista. Filtre por oração, povo, região, país ou idioma: o mapa, a tabela e os totais reduzem-se em conjunto.",
-      "takeaway": "Leve as linhas que filtrou, como folha de cálculo."
+      "lead": "Todos os povos em uma só vista. Filtre por oração, povo, região, país ou idioma, e o mapa, a tabela e os totais se restringem juntos.",
+      "takeaway": "As linhas que você filtrou, em uma planilha."
    },
    "research-map-plus-grid": {
-      "lead": "O mapa ao lado da lista. Escolha um povo no mapa e a lista segue-o; reduza a lista e o mapa segue.",
-      "takeaway": "Leve um pôster do mapa tal como o vê, pronto a imprimir, e um pacote de oração para distribuir.",
+      "lead": "O mapa ao lado da lista. Escolha um povo no mapa e a lista acompanha; restrinja a lista e o mapa acompanha também.",
+      "takeaway": "Um pôster do mapa como você o vê, pronto para imprimir, e um pacote de oração para distribuir.",
      "examplePacket": "Pacote de oração de exemplo: núcleo do Oriente Médio"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Abra um país para ver os seus grupos e gere um cartaz, um pacote de oração e um baralho de cartões para imprimir ou partilhar.",
      "note": "Cartazes, pacotes e cartões são gerados no seu navegador para cada país exceto a Índia e a China (em breve)."
    }
+  },
+  "col": {
+    "peopleGroup": "Povo",
+    "country": "País",
+    "region": "Região",
+    "population": "População"
  }
 }
--- a/library/i18n/locales/ro/mapInfo.json
+++ b/library/i18n/locales/ro/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "Toate popoarele într-o singură vedere. Filtrează după rugăciune, popor, regiune, țară sau limbă — harta, tabelul și totalurile se restrâng împreună.",
-      "takeaway": "Ia cu tine rândurile filtrate, ca foaie de calcul."
+      "takeaway": "Rândurile filtrate, ca foaie de calcul."
    },
    "research-map-plus-grid": {
      "lead": "Harta lângă listă. Alege un popor pe hartă și lista îl urmează; restrânge lista și harta o urmează.",
-      "takeaway": "Ia cu tine un poster al hărții așa cum o vezi, gata de tipărit, și un pachet de rugăciune de împărțit.",
+      "takeaway": "Un poster al hărții așa cum o vezi, gata de tipărit, și un pachet de rugăciune de împărțit.",
      "examplePacket": "Pachet de rugăciune exemplu: nucleul Orientului Mijlociu"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Deschide o țară pentru a-i vedea grupurile, apoi generează un afiș, un pachet de rugăciune și un set de cartonașe pentru tipărire sau partajare.",
      "note": "Afișele, pachetele și cartonașele se generează în browserul tău pentru fiecare țară în afară de India și China (în curând)."
    }
+  },
+  "col": {
+    "peopleGroup": "Popor",
+    "country": "Țară",
+    "region": "Regiune",
+    "population": "Populație"
  }
 }
--- a/library/i18n/locales/ru/mapInfo.json
+++ b/library/i18n/locales/ru/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "Все народы в одном представлении. Фильтруйте по молитве, народу, региону, стране или языку — карта, таблица и итоги сужаются вместе.",
-      "takeaway": "Заберите отфильтрованные строки в виде таблицы."
+      "takeaway": "Отфильтрованные строки в виде таблицы."
    },
    "research-map-plus-grid": {
      "lead": "Карта рядом со списком. Выберите народ на карте — список последует за ним; сузьте список — карта последует за ним.",
-      "takeaway": "Заберите плакат карты в том виде, как вы её видите, готовый к печати, и молитвенный пакет для раздачи.",
+      "takeaway": "Плакат карты в том виде, как вы её видите, готовый к печати, и молитвенный пакет для раздачи.",
      "examplePacket": "Пример молитвенного буклета: центральная часть Ближнего Востока"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "Откройте страну, чтобы увидеть её народности, затем создайте плакат, молитвенный пакет и набор карточек для печати или отправки.",
      "note": "Плакаты, пакеты и карточки создаются в вашем браузере для каждой страны, кроме Индии и Китая (скоро)."
    }
+  },
+  "col": {
+    "peopleGroup": "Народ",
+    "country": "Страна",
+    "region": "Регион",
+    "population": "Население"
  }
 }
--- a/library/i18n/locales/zh/mapInfo.json
+++ b/library/i18n/locales/zh/mapInfo.json
@ -31,11 +31,11 @@
    },
    "dashboard-plus-grid": {
      "lead": "在一个视图中查看所有民族。按祷告、民族、区域、国家或语言筛选，地图、表格和总计会一同收窄。",
-      "takeaway": "把筛选后的行作为电子表格带走。"
+      "takeaway": "筛选后的行，作为电子表格。"
    },
    "research-map-plus-grid": {
      "lead": "地图与列表并排。在地图上选择一个民族，列表随之跟随；缩小列表范围，地图也随之跟随。",
-      "takeaway": "带走一张你所见地图的海报，可直接打印，以及一份可分发的祷告手册。",
+      "takeaway": "一张你所见地图的海报，可直接打印，以及一份可分发的祷告手册。",
      "examplePacket": "示例祷告手册：中东核心地区"
    },
    "prayer-map": {
@ -47,5 +47,11 @@
      "takeaway": "打开一个国家查看其族群，然后生成海报、祷告册和卡片集，可打印或分享。",
      "note": "海报、祷告册和卡片在您的浏览器中生成，适用于除印度和中国以外的每个国家（即将推出）。"
    }
+  },
+  "col": {
+    "peopleGroup": "民族",
+    "country": "国家",
+    "region": "区域",
+    "population": "人口"
  }
 }
--- a/plugin-designs/doxa-maps-spa/doxa-maps-spa.vue
+++ b/plugin-designs/doxa-maps-spa/doxa-maps-spa.vue
@ -138,7 +138,7 @@
        <div class="dms-slot" :ref="el => setSlot(i, el)"></div>
        <!-- The tab's "what can this do for you?" button (library MapInfo), from src/tabInfo.js. It sits
             over the pane, top-right; profile-config info:false removes it. -->
-        <MapInfo v-if="infoFor(t)" :key="'info-' + t.id" v-bind="infoFor(t)"
+        <MapInfo v-if="infoFor(t)" :key="'info-' + t.id" v-bind="infoProps(t)" :style="infoStyle(t)" :placement="infoPos(t).placement || 'top-right'"
          :assets-base="assetsBase" :locale="effectiveLocale" />
        <div v-if="t.state === 'loading'" class="dms-hint">{{ tr('loading', { label: tabLabel(t) }) }}</div>
        <div v-else-if="t.state === 'error'" class="dms-hint err">
@ -1104,6 +1104,22 @@ export default defineComponent({
    // A tab's button shows only when its lead text is in the bundled catalogue: a key that has not
    // landed would otherwise open a popup of raw key names. English is the check because every
    // locale falls back to it.
+    // The entry minus `pos`, which is placement for the button, not a MapInfo prop.
+    infoProps(t) { const { pos, ...props } = this.infoFor(t) || {}; return props },
+    // pos -> MapInfo's own offset variables, inherited by its button and pointer.
+    // The tab's placement at this width: pos, with pos.narrow laid over it on a phone.
+    infoPos(t) {
+      const pos = (this.infoFor(t) || {}).pos || {}
+      const { narrow, ...wide } = pos
+      return this.narrow && narrow ? { ...wide, ...narrow } : wide
+    },
+    infoStyle(t) {
+      const pos = this.infoPos(t)
+      const s = {}
+      if (pos.top) s['--map-info-top'] = pos.top
+      if (pos.side) s['--map-info-side'] = pos.side
+      return s
+    },
    infoFor(t) {
      const e = this.showInfo && t && TAB_INFO[t.id]
      return e && (!e.leadKey || tStatic(e.leadKey, 'en')) ? e : null
--- a/plugin-designs/doxa-maps-spa/src/tabInfo.js
+++ b/plugin-designs/doxa-maps-spa/src/tabInfo.js
@ -11,6 +11,19 @@
 * map's WHOLE catalogue, in eleven locales, into the gallery bundle. upg100 owns 'mapInfo' and merges
 * every tab's translated strings into it. Name keys LITERALLY here: that is what the area scan reads.
 *
+ * ★ pos PLACES THE BUTTON CLEAR OF THE MAP'S OWN CONTROLS (--map-info-top / --map-info-side, default
+ * 12px each). The button sits at the END of the line (right in English, left in Arabic, see MapInfo),
+ * which is also where most of these maps keep their zoom column; measured on rega's 1440 captures in
+ * en and ar (2026-09-29), 12px covered the zoom-in button on Prayer Progress, Cities and Gospel, Big
+ * Picture's header buttons and Simple Research's tab bar. side 56px sits beside a zoom column; top
+ * 46px / 56px clears Big Picture's 38px header bar / Simple Research's tab bar. Regions and UPG-100
+ * open on a view-switch strip whose END holds their Share button, which the default covered exactly
+ * (found by geometry, not visible in a screenshot: only Share's ring showed around the button).
+ * pos.narrow overrides on a phone (the shell's `narrow`, max-width:760px), where the chrome differs:
+ * Regions' and UPG-100's strip is full at its END (selector + Share) and empty at its START, so the
+ * button goes to the start (placement 'top-left', which MapInfo resolves to the logical start, so
+ * Arabic mirrors); Gospel's panel spans to 345px of 390, so its button takes the corner above the
+ * zoom column. Measured with the same probe at 390 in en and ar.
 * ★ ADD AN EXAMPLE ONLY WHEN ITS FILE IS IN THE TREE. A missing file renders the popup's "not
 * available" box in front of the audience; an example that is not there yet is simply left out.
 * ★ KEYS MUST NOT CONTAIN A DOT beyond the area separator: the gallery has no vue-i18n, so MapInfo
@ -19,6 +32,7 @@
 export const TAB_INFO = {
  'upg-100': {
    storageKey: 'upg-100',
+    pos: { side: '56px', narrow: { placement: 'top-left', side: '12px' } },
    leadKey: 'mapInfo.tab.upg-100.lead',
    takeawayKey: 'mapInfo.tab.upg-100.takeaway',
    // The packet pages (12) and the card deck (70) join this list when their pre-generated shots land
@ -29,6 +43,7 @@ export const TAB_INFO = {
  },
  'regions-dashboard': {
    storageKey: 'regions-dashboard',
+    pos: { side: '56px', narrow: { placement: 'top-left', side: '8px' } },
    leadKey: 'mapInfo.tab.regions-dashboard.lead',
    takeawayKey: 'mapInfo.tab.regions-dashboard.takeaway',
    // "except India and China": India is genuinely unsupported -- no sheet, no geometry, and 855
@ -43,16 +58,19 @@ export const TAB_INFO = {
  },
  'dashboard-plus-grid': {
    storageKey: 'dashboard-plus-grid',
+    pos: { top: '46px' },
    leadKey: 'mapInfo.tab.dashboard-plus-grid.lead',
    takeawayKey: 'mapInfo.tab.dashboard-plus-grid.takeaway',
    // Big Picture's export is a spreadsheet, so its example is a real excerpt of one (sr): the six
    // largest groups by population among those joinable locally, of the full list's 2,107. The column
-    // keys are the ones the live table resolves, so the popup header and the real one cannot drift;
-    // cell text stays untranslated because the live table's cells are not translated either.
+    // headers are the live table's own words, COPIED verbatim from dashboard.json into mapInfo.col (all
+    // eleven locales): naming dashboard.* here pulled the whole 'dashboard' area into this bundle
+    // (+50 KB raw). If the table's headers are reworded, copy them again. Cell text stays untranslated
+    // because the live table's cells are not translated either.
    examples: [{
      kind: 'table',
-      columns: [{ key: 'dashboard.people_group' }, { key: 'dashboard.country' },
-        { key: 'dashboard.region' }, { key: 'dashboard.population' }],
+      columns: [{ key: 'mapInfo.col.peopleGroup' }, { key: 'mapInfo.col.country' },
+        { key: 'mapInfo.col.region' }, { key: 'mapInfo.col.population' }],
      rows: [
        ['Hararghe Oromo', 'Ethiopia', 'Africa', 6355000],
        ['Gaaliin', 'Sudan', 'Middle East', 4520000],
@ -66,24 +84,28 @@ export const TAB_INFO = {
  },
  'research-map-plus-grid': {
    storageKey: 'research-map-plus-grid',
+    pos: { top: '56px', side: '56px' },
    leadKey: 'mapInfo.tab.research-map-plus-grid.lead',
    takeawayKey: 'mapInfo.tab.research-map-plus-grid.takeaway',
    examples: [],
  },
  'prayer-map': {
    storageKey: 'prayer-map',
+    pos: { side: '56px' },
    leadKey: 'mapInfo.tab.prayer-map.lead',
    takeawayKey: 'mapInfo.tab.prayer-map.takeaway',
    examples: [],
  },
  'cities-internet': {
    storageKey: 'cities-internet',
+    pos: { side: '56px' },
    leadKey: 'mapInfo.tab.cities-internet.lead',
    takeawayKey: 'mapInfo.tab.cities-internet.takeaway',
    examples: [],
  },
  'gospel-resources': {
    storageKey: 'gospel-resources',
+    pos: { side: '56px', narrow: { side: '4px' } },
    leadKey: 'mapInfo.tab.gospel-resources.lead',
    takeawayKey: 'mapInfo.tab.gospel-resources.takeaway',
    examples: [],
--- a/public/dx-maps/doxa-maps-spa/doxa-maps-spa.js
+++ b/public/dx-maps/doxa-maps-spa/doxa-maps-spa.js
--- a/public/dx-maps/doxa-maps-spa/doxa-maps-spa/app/index.html
+++ b/public/dx-maps/doxa-maps-spa/doxa-maps-spa/app/index.html
@ -61,7 +61,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <doxa-maps-spa> custom element. -->
-  <script src="../../doxa-maps-spa.js" integrity="sha384-Ewornc1TaYE+n7dwZA/Ue40gLXn0JQ5xwXO74Xk5YDFcfAUS8yXIv6jMg8mHRzE/" crossorigin="anonymous"></script>
+  <script src="../../doxa-maps-spa.js" integrity="sha384-WxibTNX89Sfqh9wxX9qWVWrINtWvf5XGsrF2el7XnSHshIC+Yr9rmWl0CWxp3ml3" crossorigin="anonymous"></script>

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/doxa-maps-spa/doxa-maps-spa/index.html
+++ b/public/dx-maps/doxa-maps-spa/doxa-maps-spa/index.html
@ -61,7 +61,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <doxa-maps-spa> custom element. -->
-  <script src="../doxa-maps-spa.js" integrity="sha384-Ewornc1TaYE+n7dwZA/Ue40gLXn0JQ5xwXO74Xk5YDFcfAUS8yXIv6jMg8mHRzE/" crossorigin="anonymous"></script>
+  <script src="../doxa-maps-spa.js" integrity="sha384-WxibTNX89Sfqh9wxX9qWVWrINtWvf5XGsrF2el7XnSHshIC+Yr9rmWl0CWxp3ml3" crossorigin="anonymous"></script>

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/doxa-maps-spa/manifest.json
+++ b/public/dx-maps/doxa-maps-spa/manifest.json
@ -361,7 +361,7 @@
      "bundle": "doxa-maps-spa",
      "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
      "output": "dx-maps/doxa-maps-spa/doxa-maps-spa.js",
-      "integrity": "sha384-Ewornc1TaYE+n7dwZA/Ue40gLXn0JQ5xwXO74Xk5YDFcfAUS8yXIv6jMg8mHRzE/",
+      "integrity": "sha384-WxibTNX89Sfqh9wxX9qWVWrINtWvf5XGsrF2el7XnSHshIC+Yr9rmWl0CWxp3ml3",
      "elements": [
        "doxa-maps-spa"
      ],
@ -389,7 +389,7 @@
          "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
          "embed": {
            "iframe": "<iframe src=\"./doxa-maps-spa/doxa-maps-spa/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-Ewornc1TaYE+n7dwZA/Ue40gLXn0JQ5xwXO74Xk5YDFcfAUS8yXIv6jMg8mHRzE/\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-WxibTNX89Sfqh9wxX9qWVWrINtWvf5XGsrF2el7XnSHshIC+Yr9rmWl0CWxp3ml3\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
          },
          "instances": [
            {
--- a/public/dx-maps/manifest.json
+++ b/public/dx-maps/manifest.json
@ -361,7 +361,7 @@
      "bundle": "doxa-maps-spa",
      "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
      "output": "dx-maps/doxa-maps-spa/doxa-maps-spa.js",
-      "integrity": "sha384-Ewornc1TaYE+n7dwZA/Ue40gLXn0JQ5xwXO74Xk5YDFcfAUS8yXIv6jMg8mHRzE/",
+      "integrity": "sha384-WxibTNX89Sfqh9wxX9qWVWrINtWvf5XGsrF2el7XnSHshIC+Yr9rmWl0CWxp3ml3",
      "elements": [
        "doxa-maps-spa"
      ],
@ -389,7 +389,7 @@
          "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
          "embed": {
            "iframe": "<iframe src=\"./doxa-maps-spa/doxa-maps-spa/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-Ewornc1TaYE+n7dwZA/Ue40gLXn0JQ5xwXO74Xk5YDFcfAUS8yXIv6jMg8mHRzE/\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-WxibTNX89Sfqh9wxX9qWVWrINtWvf5XGsrF2el7XnSHshIC+Yr9rmWl0CWxp3ml3\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
          },
          "instances": [
            {