ultimate-jekyll-manager 1.6.4 → 1.6.6

package/dist/defaults/dist/_layouts/blueprint/admin/calendar/index.html

@@ -60,6 +60,7 @@ prerender_icons:
   - name: "wifi"
   - name: "battery-full"
   - name: "table-list"
+  - name: "vial"
 ---
 
 <!-- Calendar Root -->
@@ -79,6 +80,7 @@ prerender_icons:
         <h5 class="modal-title" id="campaign-modal-title">
           {% uj_icon "plus", "fa-md me-2" %}
           <span id="campaign-modal-title-text">Create campaign</span>
+          <small class="text-muted fw-normal ms-2 d-none" id="campaign-modal-id" style="font-size: 0.6rem"></small>
         </h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
@@ -87,7 +89,7 @@ prerender_icons:
 
           <!-- Campaign Type -->
           <h6 class="mb-3">
-            {% uj_icon "bullhorn", "fa-sm me-2 text-info" %}
+            {% uj_icon "bullhorn", "me-2 text-info" %}
             Campaign type
           </h6>
           <div class="row mb-4">
@@ -186,9 +188,8 @@ prerender_icons:
                   <div class="col-md-6">
                     <label for="campaign-template" class="form-label">Template</label>
                     <select class="form-select" id="campaign-template" name="campaign.template">
-                      <option value="default" selected>Default</option>
-                      <option value="main/basic/card">Card</option>
-                      <option value="main/basic/plain">Plain</option>
+                      <option value="card" selected>Card</option>
+                      <option value="plain">Plain</option>
                     </select>
                   </div>
                   <div class="col-md-6">
@@ -201,6 +202,18 @@ prerender_icons:
                     </select>
                   </div>
                 </div>
+
+                <div class="mb-3">
+                  <label for="campaign-discount-code" class="form-label">
+                    Discount code
+                    <small class="text-muted fw-normal ms-1">(optional — resolves {discount.code} and {discount.percent})</small>
+                  </label>
+                  <input type="text"
+                         class="form-control"
+                         id="campaign-discount-code"
+                         name="campaign.discountCode"
+                         placeholder="e.g. UPGRADE15">
+                </div>
               </div>
 
               <!-- Push-only fields -->
@@ -271,19 +284,6 @@ prerender_icons:
             </div>
           </div>
 
-          <!-- Discount Code -->
-          <div class="mb-3">
-            <label for="campaign-discount-code" class="form-label">
-              Discount code
-              <small class="text-muted fw-normal ms-1">(optional)</small>
-            </label>
-            <input type="text"
-                   class="form-control"
-                   id="campaign-discount-code"
-                   name="campaign.discountCode"
-                   placeholder="e.g. UPGRADE15">
-          </div>
-
           <!-- Test Mode -->
           <div class="form-check mb-4">
             <input class="form-check-input"
@@ -300,12 +300,12 @@ prerender_icons:
 
           <!-- Schedule -->
           <h6 class="mb-3 mt-4">
-            {% uj_icon "clock", "fa-sm me-2 text-info" %}
+            {% uj_icon "clock", "me-2 text-info" %}
             Schedule
             <small class="text-muted fw-normal ms-1">(UTC)</small>
           </h6>
 
-          <div class="row mb-3">
+          <div class="row mb-2">
             <div class="col-md-5">
               <label for="campaign-date" class="form-label">
                 Date (UTC) <span class="text-danger">*</span>
@@ -330,16 +330,19 @@ prerender_icons:
               <div class="invalid-feedback">Time is required</div>
             </div>
             <div class="col-md-3 d-flex align-items-end">
-              <button type="button" class="btn btn-sm btn-outline-primary w-100" id="btn-send-now">
-                {% uj_icon "paper-plane", "fa-sm me-1" %}
-                Send now
+              <button type="button" class="btn btn-md btn-outline-primary w-100" id="btn-send-now">
+                {% uj_icon "clock", "fa-sm me-1" %}
+                Set now
               </button>
             </div>
           </div>
+          <div class="mb-3" id="campaign-local-time-row" style="display:none">
+            <span class="badge bg-body-secondary text-body-secondary" id="campaign-time-local"></span>
+          </div>
 
           <!-- Recurrence -->
           <h6 class="mb-3 mt-4">
-            {% uj_icon "repeat", "fa-sm me-2 text-info" %}
+            {% uj_icon "repeat", "me-2 text-info" %}
             Recurrence
             <small class="text-muted fw-normal ms-1">(optional)</small>
           </h6>
@@ -361,20 +364,32 @@ prerender_icons:
                 <select class="form-select" id="campaign-recurrence-pattern" name="campaign.recurrence.pattern">
                   <option value="daily">Daily</option>
                   <option value="weekly">Weekly</option>
-                  <option value="monthly" selected>Monthly</option>
+                  <option value="monthly" selected>Monthly (day of month)</option>
+                  <option value="monthly-weekday">Monthly (Nth weekday)</option>
                   <option value="quarterly">Quarterly</option>
                   <option value="yearly">Yearly</option>
                 </select>
               </div>
               <div class="col-md-4">
                 <label for="campaign-recurrence-hour" class="form-label">Hour (UTC)</label>
-                <input type="number"
-                       class="form-control"
-                       id="campaign-recurrence-hour"
-                       name="campaign.recurrence.hour"
-                       value="14"
-                       min="0"
-                       max="23">
+                <div class="input-group">
+                  <input type="number"
+                         class="form-control"
+                         id="campaign-recurrence-hour"
+                         name="campaign.recurrence.hour"
+                         value="14"
+                         min="0"
+                         max="23">
+                  <span class="input-group-text">:</span>
+                  <input type="number"
+                         class="form-control"
+                         id="campaign-recurrence-minute"
+                         name="campaign.recurrence.minute"
+                         value="0"
+                         min="0"
+                         max="59"
+                         placeholder="Min">
+                </div>
               </div>
               <div class="col-md-4">
                 <label for="campaign-recurrence-day" class="form-label">
@@ -391,6 +406,18 @@ prerender_icons:
               </div>
             </div>
 
+            <div class="row mb-3 d-none" id="recurrence-nth-row">
+              <div class="col-md-4">
+                <label for="campaign-recurrence-nth" class="form-label">Occurrence</label>
+                <select class="form-select" id="campaign-recurrence-nth" name="campaign.recurrence.nth">
+                  <option value="1">1st</option>
+                  <option value="2" selected>2nd</option>
+                  <option value="3">3rd</option>
+                  <option value="4">4th</option>
+                </select>
+              </div>
+            </div>
+
             <div class="row mb-3 d-none" id="recurrence-month-row">
               <div class="col-md-4">
                 <label for="campaign-recurrence-month" class="form-label">Month</label>
@@ -418,7 +445,7 @@ prerender_icons:
 
           <!-- Targeting -->
           <h6 class="mb-3 mt-4">
-            {% uj_icon "users", "fa-sm me-2 text-success" %}
+            {% uj_icon "users", "me-2 text-success" %}
             Targeting
           </h6>
 
@@ -472,32 +499,33 @@ prerender_icons:
 
           <div class="mb-3">
             <label for="campaign-segments" class="form-label">
-              Segments
-              <small class="text-muted fw-normal ms-1">(comma-separated IDs)</small>
+              Include segments
+              <small class="text-muted fw-normal ms-1">(AND — contacts must match ALL listed segments)</small>
             </label>
             <input type="text"
                    class="form-control"
                    id="campaign-segments"
                    name="campaign.segments"
-                   placeholder="e.g. seg_abc123, seg_def456">
+                   placeholder="e.g. subscription_free, lifecycle_30d">
+            <small class="form-text text-muted">SSOT keys: subscription_free, subscription_paid, subscription_trialing, subscription_cancelled, subscription_churned_trial, subscription_churned_paid, lifecycle_7d, lifecycle_30d, engagement_active_30d, engagement_inactive_90d, etc.</small>
           </div>
 
           <div class="mb-3">
             <label for="campaign-exclude-segments" class="form-label">
               Exclude segments
-              <small class="text-muted fw-normal ms-1">(comma-separated IDs)</small>
+              <small class="text-muted fw-normal ms-1">(AND — contacts matching ANY excluded segment are removed)</small>
             </label>
             <input type="text"
                    class="form-control"
                    id="campaign-exclude-segments"
                    name="campaign.excludeSegments"
-                   placeholder="e.g. seg_unsubscribed">
+                   placeholder="e.g. subscription_paid, subscription_trialing">
           </div>
 
           <!-- Advanced Settings (collapsible) -->
           <h6 class="mb-3 mt-4">
             <a class="text-decoration-none" data-bs-toggle="collapse" href="#advanced-settings" role="button" aria-expanded="false">
-              {% uj_icon "sliders", "fa-sm me-2 text-info" %}
+              {% uj_icon "sliders", "me-2 text-info" %}
               Advanced settings
               <small class="text-muted fw-normal ms-1">(optional)</small>
             </a>
@@ -548,23 +576,26 @@ prerender_icons:
             </div>
           </div>
 
+          <div class="modal-footer d-flex justify-content-between">
+            <div>
+              <button type="submit" name="action" value="delete" formnovalidate class="btn btn-outline-danger d-none" id="btn-delete-campaign">
+                {% uj_icon "trash", "fa-sm me-1" %}
+                <span class="button-text">Delete</span>
+              </button>
+            </div>
+            <div class="d-flex gap-2">
+              <button type="submit" name="action" value="test" formnovalidate class="btn btn-outline-warning" id="btn-send-test">
+                {% uj_icon "vial", "fa-sm me-1" %}
+                <span class="button-text">Send test</span>
+              </button>
+              <button type="submit" name="action" value="save" class="btn btn-adaptive" id="btn-save-campaign">
+                {% uj_icon "paper-plane", "fa-sm me-1" %}
+                <span class="button-text">Save campaign</span>
+              </button>
+            </div>
+          </div>
         </form>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <div>
-          <button type="button" class="btn btn-outline-danger d-none" id="btn-delete-campaign">
-            {% uj_icon "trash", "fa-sm me-1" %}
-            Delete
-          </button>
-        </div>
-        <div class="d-flex gap-2">
-          <button type="button" class="btn btn-outline-adaptive" data-bs-dismiss="modal">Cancel</button>
-          <button type="submit" form="campaign-editor-form" class="btn btn-adaptive" id="btn-save-campaign">
-            {% uj_icon "paper-plane", "fa-sm me-1" %}
-            <span class="button-text">Save campaign</span>
-          </button>
-        </div>
-      </div>
     </div>
   </div>
 </div>

package/dist/defaults/dist/_layouts/themes/classy/frontend/pages/account/index.html

@@ -1277,6 +1277,36 @@ badges:
             </form>
           </div>
         </div>
+        <div class="card mt-3">
+          <div class="card-body">
+            <div class="d-flex justify-content-between align-items-center mb-1">
+              <h5 class="card-title mb-0">Push notifications</h5>
+              <span id="push-notification-status"><span class="badge bg-secondary">Checking...</span></span>
+            </div>
+            <p class="text-muted small mb-3">Receive push notifications in your browser for important updates.</p>
+
+            <form id="push-subscribe-form" novalidate onsubmit="return false" style="display:none">
+              <button type="submit" class="btn btn-adaptive btn-sm" id="push-subscribe-btn">
+                {% uj_icon "bell", "me-1" %}
+                <span class="button-text">Enable push notifications</span>
+              </button>
+            </form>
+
+            <div class="mt-3 pt-3 border-top">
+              <a class="small text-muted text-decoration-none d-flex align-items-center" data-bs-toggle="collapse" href="#push-token-details" role="button" aria-expanded="false">
+                {% uj_icon "code", "fa-xs me-1" %} Token details
+              </a>
+              <div class="collapse mt-2" id="push-token-details">
+                <div class="input-group input-group-sm">
+                  <input type="text" class="form-control font-monospace bg-body-tertiary" id="push-token-value" readonly value="No token" style="font-size: 0.65rem;">
+                  <button type="button" class="btn btn-outline-adaptive" id="copy-push-token-btn">
+                    {% uj_icon "copy" %}
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
       </section>
 
       <!-- API Keys Section -->

package/dist/gulp/tasks/imagemin.js

@@ -17,8 +17,8 @@ const ujmConfig = Manager.getUJMConfig();
 // Settings
 const CACHE_DIR = '.temp/cache/imagemin';
 const CACHE_BRANCH = 'cache-uj-imagemin';
-const MAX_SOURCE_DIMENSION = 4096;
-const REWRITE_QUALITY = 80;
+const IMAGE_MAX_DIMENSION = 2048;
+const IMAGE_JPEG_QUALITY = 80;
 
 // Variables
 let githubCache;
@@ -129,7 +129,7 @@ async function imagemin(complete) {
   }
 
   // Optionally rewrite oversized source images on disk (opt-in via UJ_IMAGEMIN_REWRITE_SOURCES=true).
-  // Caps longest dimension at MAX_SOURCE_DIMENSION so gulp-responsive-modern + sharp don't stall
+  // Caps longest dimension at IMAGE_MAX_DIMENSION so gulp-responsive-modern + sharp don't stall
   // on huge inputs. Runs BEFORE determineFilesToProcess so cached-but-oversized images get
   // rewritten too; the new on-disk content hashes differently than the stored meta hash, so
   // determineFilesToProcess naturally picks the rewritten image up for re-optimization.
@@ -305,7 +305,7 @@ module.exports = series(
 // Helper Functions
 // ============================================================================
 
-// Rewrite oversized source images in place, capping longest dimension at MAX_SOURCE_DIMENSION.
+// Rewrite oversized source images in place, capping longest dimension at IMAGE_MAX_DIMENSION.
 // Only affects files whose decoded longest side exceeds the cap. Cache invalidation is implicit:
 // the new content hashes differently than the previously-cached entry, so determineFilesToProcess
 // will pick affected files up for re-optimization on its own.
@@ -315,14 +315,14 @@ async function rewriteOversizedSources(files) {
     return;
   }
 
-  logger.log(`🔍 Checking ${responsiveFiles.length} source images for oversize (>${MAX_SOURCE_DIMENSION}px longest side)...`);
+  logger.log(`🔍 Checking ${responsiveFiles.length} source images for oversize (>${IMAGE_MAX_DIMENSION}px longest side)...`);
 
   let rewritten = 0;
   for (const file of responsiveFiles) {
     const metadata = await sharp(file).metadata();
     const longest = Math.max(metadata.width || 0, metadata.height || 0);
 
-    if (longest <= MAX_SOURCE_DIMENSION) {
+    if (longest <= IMAGE_MAX_DIMENSION) {
       continue;
     }
 
@@ -331,15 +331,15 @@ async function rewriteOversizedSources(files) {
 
     // Resize, encode to a buffer (sharp can't write back to its own input file directly), then overwrite.
     const pipeline = sharp(file).resize({
-      width: MAX_SOURCE_DIMENSION,
-      height: MAX_SOURCE_DIMENSION,
+      width: IMAGE_MAX_DIMENSION,
+      height: IMAGE_MAX_DIMENSION,
       fit: 'inside',
       withoutEnlargement: true,
     });
 
     const buffer = ext === 'png'
-      ? await pipeline.png({ quality: REWRITE_QUALITY }).toBuffer()
-      : await pipeline.jpeg({ quality: REWRITE_QUALITY, progressive: true, mozjpeg: true }).toBuffer();
+      ? await pipeline.png({ quality: IMAGE_JPEG_QUALITY }).toBuffer()
+      : await pipeline.jpeg({ quality: IMAGE_JPEG_QUALITY, progressive: true, mozjpeg: true }).toBuffer();
 
     jetpack.write(file, buffer);
     const sizeAfter = buffer.length;
@@ -350,11 +350,11 @@ async function rewriteOversizedSources(files) {
     // with the new hash when determineFilesToProcess() runs.
 
     rewritten++;
-    logger.log(`✂️  Rewrote ${path.relative(rootPathProject, file)}: ${metadata.width}x${metadata.height} → max ${MAX_SOURCE_DIMENSION}px, ${formatBytes(sizeBefore)} → ${formatBytes(sizeAfter)}`);
+    logger.log(`✂️  Rewrote ${path.relative(rootPathProject, file)}: ${metadata.width}x${metadata.height} → max ${IMAGE_MAX_DIMENSION}px, ${formatBytes(sizeBefore)} → ${formatBytes(sizeAfter)}`);
   }
 
   if (rewritten === 0) {
-    logger.log(`✅ No oversized sources found (all within ${MAX_SOURCE_DIMENSION}px)`);
+    logger.log(`✅ No oversized sources found (all within ${IMAGE_MAX_DIMENSION}px)`);
   } else {
     logger.log(`✂️  Rewrote ${rewritten} oversized source image(s)`);
   }