apostrophe 4.27.0-alpha.1 → 4.27.0-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.27.0-alpha.2
+
+### Changes
+
+- Removes commit resolution markers that were left behind in the previous version
+
 ## 4.27.0-alpha.1
 
 ### Adds

package/modules/@apostrophecms/i18n/i18n/de.json

@@ -296,7 +296,9 @@
   "layoutMiddle": "Mitte",
   "layoutBottom": "Unten",
   "layoutTabletShow": "Auf Tablet sichtbar",
+  "layoutTabletShowHelp": "Größer als {{ mobile }}px, kleiner oder gleich {{ tablet }}px",
   "layoutMobileShow": "Auf Mobilgerät sichtbar",
+  "layoutMobileShowHelp": "Kleiner oder gleich {{ mobile }}px",
   "layoutTogggleTooltip": "Verwende „Inhalt bearbeiten“, um Widgets zu bearbeiten, und „Spalten bearbeiten“, um Spalten zu verschieben oder zu skalieren.",
   "leavePageDescription": "Der Inhalt, den du bearbeiten möchtest, gehört zu einem anderen Dokument und muss darin geändert werden.\nÄnderungen an {{ oldTitle }} werden automatisch gespeichert.",
   "leavePageHeading": "{{ oldTitle }} verlassen um {{ newTitle }} zu bearbeiten?",

package/modules/@apostrophecms/i18n/i18n/en.json

@@ -300,7 +300,9 @@
   "layoutMiddle": "Middle",
   "layoutBottom": "Bottom",
   "layoutTabletShow": "Visible on tablet",
+  "layoutTabletShowHelp": "Greater than {{ mobile }}px, less than or equal to {{ tablet }}px",
   "layoutMobileShow": "Visible on mobile",
+  "layoutMobileShowHelp": "Less than or equal to {{ mobile }}px",
   "layoutTogggleTooltip": "Use Edit Content to edit widgets and Edit Columns to move or resize columns",
   "leavePageDescription": "The content you're trying to edit belongs to another document and must be edited there.\nChanges made to {{ oldTitle }} are saved automatically.",
   "leavePageHeading": "Leave {{ oldTitle }} to edit {{ newTitle }}?",

package/modules/@apostrophecms/i18n/i18n/es.json

@@ -295,7 +295,9 @@
   "layoutMiddle": "Medio",
   "layoutBottom": "Abajo",
   "layoutTabletShow": "Visible en tableta",
+  "layoutTabletShowHelp": "Mayor que {{ mobile }}px, menor o igual a {{ tablet }}px",
   "layoutMobileShow": "Visible en móvil",
+  "layoutMobileShowHelp": "Menor o igual a {{ mobile }}px",
   "layoutTogggleTooltip": "Usa \"Editar contenido\" para editar widgets y \"Editar columnas\" para mover o cambiar el tamaño de las columnas.",
   "leavePageDescription": "El contenido que esta buscando editar pertenece a otro documento y debe ser editado ahí.\nCambios hechos a {{ oldTitle }} son guardados automaticamente.",
   "leavePageHeading": "¿Salir de {{ oldTitle }} para editar {{ newTitle }}?",

package/modules/@apostrophecms/i18n/i18n/fr.json

@@ -295,7 +295,9 @@
   "layoutMiddle": "Milieu",
   "layoutBottom": "Bas",
   "layoutTabletShow": "Visible sur tablette",
+  "layoutTabletShowHelp": "Supérieur à {{ mobile }}px, inférieur ou égal à {{ tablet }}px",
   "layoutMobileShow": "Visible sur mobile",
+  "layoutMobileShowHelp": "Inférieur ou égal à {{ mobile }}px",
   "layoutTogggleTooltip": "Utilisez « Modifier le contenu » pour éditer les widgets et « Modifier les colonnes » pour déplacer ou redimensionner les colonnes.",
   "leavePageDescription": "Le contenu que vous essayez d'éditer appartient à un autre document et doit être édité là-bas.\nLes modifications effectuées à {{ oldTitle }} sont enregistrées automatiquement.",
   "leavePageHeading": "Quitter {{ oldTitle }} pour éditer {{ newTitle }} ?",

package/modules/@apostrophecms/i18n/i18n/it.json

@@ -295,7 +295,9 @@
   "layoutMiddle": "Centro",
   "layoutBottom": "Basso",
   "layoutTabletShow": "Visibile su tablet",
+  "layoutTabletShowHelp": "Maggiore di {{ mobile }}px, minore o uguale a {{ tablet }}px",
   "layoutMobileShow": "Visibile su dispositivo mobile",
+  "layoutMobileShowHelp": "Minore o uguale a {{ mobile }}px",
   "layoutTogggleTooltip": "Usa \"Modifica contenuto\" per modificare i widget e \"Modifica colonne\" per spostare o ridimensionare le colonne.",
   "leavePageDescription": "Il contenuto che stai cercando di modificare appartiene a un altro documento e deve essere modificato lì.\nLe modifiche apportate a {{ oldTitle }} sono salvate automaticamente.",
   "leavePageHeading": "Lascia {{ oldTitle }} per modificare {{ newTitle }}?",

package/modules/@apostrophecms/i18n/i18n/pt-BR.json

@@ -295,7 +295,9 @@
   "layoutMiddle": "Meio",
   "layoutBottom": "Inferior",
   "layoutTabletShow": "Visível em tablet",
+  "layoutTabletShowHelp": "Maior que {{ mobile }}px, menor ou igual a {{ tablet }}px",
   "layoutMobileShow": "Visível em celular",
+  "layoutMobileShowHelp": "Menor ou igual a {{ mobile }}px",
   "layoutTogggleTooltip": "Use \"Editar conteúdo\" para editar widgets e \"Editar colunas\" para mover ou redimensionar colunas.",
   "leavePageDescription": "O conteúdo que você está tentando editar pertence a outro documento e deve ser editado lá.\nMudanças em {{ oldTitle }} são salvas automaticamente.",
   "leavePageHeading": "Sair de {{ oldTitle }} para editar {{ newTitle }}?",

package/modules/@apostrophecms/i18n/i18n/sk.json

@@ -295,7 +295,9 @@
   "layoutMiddle": "Stred",
   "layoutBottom": "Dole",
   "layoutTabletShow": "Viditeľné na tablete",
+  "layoutTabletShowHelp": "Väčšie ako {{ mobile }}px, menšie alebo rovné {{ tablet }}px",
   "layoutMobileShow": "Viditeľné na mobile",
+  "layoutMobileShowHelp": "Menšie alebo rovné {{ mobile }}px",
   "layoutTogggleTooltip": "Použite „Upraviť obsah“ na úpravu widgetov a „Upraviť stĺpce“ na presun alebo zmenu veľkosti stĺpcov.",
   "leavePageDescription": "Obsah, ktorý sa pokúšate upraviť, patrí do iného dokumentu a musí byť tam upravený.\nZmeny vykonané na {{ oldTitle }} sa automaticky uložia.",
   "leavePageHeading": "Odísť z {{ oldTitle }} a editovať {{ newTitle }}?",

package/modules/@apostrophecms/layout-column-widget/index.js

@@ -51,10 +51,14 @@ module.exports = {
     label: 'apostrophe:layoutColumn',
     contextualStyles: true,
     operationsInBreadcrumb: true,
-    breakpoints: {
-      tablet: 900,
-      mobile: 600
-    }
+    // The breakpoints used in the breakpoint visibility fields
+    // help text for the layout column
+    labelBreakpoints: {
+      mobile: 600,
+      tablet: 900
+    },
+    // Whether to show help text for the breakpoint visibility fields
+    showBreakpointsHelp: true
   },
   widgetOperations(self, options) {
     return {
@@ -100,6 +104,9 @@ module.exports = {
     };
   },
   fields(self, options) {
+    const breakpoints = options?.labelBreakpoints ||
+      options?.breakpoints || // BC, derpecated
+      {};
     return {
       add: {
         desktop: {
@@ -153,7 +160,15 @@ module.exports = {
               show: {
                 type: 'boolean',
                 label: 'apostrophe:layoutTabletShow',
-                help: `Less than ${options?.breakpoints?.tablet || 900}px`,
+                ...(options?.showBreakpointsHelp
+                  ? {
+                    help: 'apostrophe:layoutTabletShowHelp',
+                    helpInterpolation: {
+                      mobile: breakpoints.mobile || 600,
+                      tablet: breakpoints.tablet || 900
+                    }
+                  }
+                  : {}),
                 def: true
               },
               ...alignSchema
@@ -184,7 +199,14 @@ module.exports = {
               show: {
                 type: 'boolean',
                 label: 'apostrophe:layoutMobileShow',
-                help: `Less than ${options?.breakpoints?.mobile || 600}px`,
+                ...(options?.showBreakpointsHelp
+                  ? {
+                    help: 'apostrophe:layoutMobileShowHelp',
+                    helpInterpolation: {
+                      mobile: breakpoints.mobile || 600
+                    }
+                  }
+                  : {}),
                 def: true
               },
               ...alignSchema

package/modules/@apostrophecms/layout-widget/views/column.html

@@ -1,10 +1,9 @@
 {# Included directly from the `area.html` template.
 The area related `data.*` is available plus `item` and `widgetOptions`. #}
 {%- set lastId = apos.modules['@apostrophecms/layout-widget'].detectLastTabletFullWidthItem(data.area.items) -%}
-{% set styles = apos.styles.render(item) %}
-{% set styleTag = apos.styles.elements(styles, data.scene) %}
-{% set wrapperAttrs = apos.styles.attributes(styles, {}, {asObject: true}) %}
-
+{%- set styles = apos.styles.render(item) -%}
+{%- set styleTag = apos.styles.elements(styles, data.scene) -%}
+{%- set wrapperAttrs = apos.styles.attributes(styles, {}, {asObject: true}) -%}
 {{ styleTag }}
 <div
   {% for key, value in wrapperAttrs %}
@@ -15,8 +14,8 @@ The area related `data.*` is available plus `item` and `widgetOptions`. #}
   data-visible-mobile="{{ item.mobile.show }}"
   {% if lastId and item._id === lastId %}data-tablet-full="true"{% endif %}
   style="
-    --justify: {{ item.desktop.justify }};
-    --align: {{ item.desktop.align }};
+    --justify: {{ item.desktop.justify or 'auto' }};
+    --align: {{ item.desktop.align or 'auto' }};
     {{ wrapperAttrs.style or '' }}
     --colstart: {{ item.desktop.colstart }};
     --colspan: {{ item.desktop.colspan }};

package/modules/@apostrophecms/schema/ui/apos/components/AposInputWrapper.vue

@@ -22,11 +22,11 @@
           }"
           :for="uid"
           :data-apos-test-name="field.name"
-          :data-apos-test-label="$t(label)"
+          :data-apos-test-label="$t(label, field.labelInterpolation)"
           data-apos-test="field-label"
         >
           <span class="apos-field_label-info">
-            {{ $t(label) }}
+            {{ $t(label, field.labelInterpolation) }}
             <span
               v-if="field.required"
               class="apos-field__required"
@@ -102,7 +102,7 @@
         <p
           v-if="(field.help || field.htmlHelp) && !displayOptions.helpTooltip"
           class="apos-field__help"
-          v-html="$t(field.help || field.htmlHelp)"
+          v-html="$t(field.help || field.htmlHelp, field.helpInterpolation)"
         />
         <slot name="additional" />
       </div>

package/modules/@apostrophecms/styles/ui/apos/universal/render.mjs

@@ -721,7 +721,10 @@ function stringifyRules(styles, inline = false) {
 
   styles.forEach((value, key) => {
     if (inline) {
-      rules.push(normalizeRules(value.values()).join(';') + ';');
+      const normalized = normalizeRules(value.values());
+      if (normalized.length) {
+        rules.push(normalized.join(';') + ';');
+      }
       return;
     }
     if (key.startsWith('@media')) {

package/modules/@apostrophecms/ui/ui/apos/stores/modal.js

@@ -81,11 +81,6 @@ export const useModalStore = defineStore('modal', () => {
       return 'apos-rtl';
     }
 
-<<<<<<< ours
-=======
->>>>>>> theirs
-=======
->>>>>>> theirs
     return null;
   }
 
@@ -285,7 +280,6 @@ export const useModalStore = defineStore('modal', () => {
     getAdminDirectionClass,
     getAdminContentDirectionClass,
     getAdminFieldDirectionClass,
->>>>>>> theirs
     add,
     remove,
     get,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "4.27.0-alpha.1",
+  "version": "4.27.0-alpha.2",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "repository": {
@@ -120,11 +120,11 @@
     "webpack": "^5.72.0",
     "webpack-merge": "^5.7.3",
     "xregexp": "^2.0.0",
-    "postcss-viewport-to-container-toggle": "^2.2.0",
-    "express-cache-on-demand": "^1.0.4",
     "@apostrophecms/emulate-mongo-3-driver": "^1.0.6",
+    "express-cache-on-demand": "^1.0.4",
     "broadband": "^1.1.0",
-    "boring": "^1.1.1"
+    "boring": "^1.1.1",
+    "postcss-viewport-to-container-toggle": "^2.2.0"
   },
   "devDependencies": {
     "eslint": "^9.39.1",