From 46d681c6b825d21b3f698d793c4e630c687d90ad Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 21 May 2026 21:41:53 +0000
Subject: [PATCH] =Major CustomBlocks.php overhaul, expanding block support and customization from the editor. theme.json should now be updated on new themes to set brand colours, etc. Also note: major change to .col vs .row alignment: simplifying it to .top .bottom vs the confusion of the differences for .col/.row .start and .a-start
---
inc/helpers/ui.php | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/inc/helpers/ui.php b/inc/helpers/ui.php
index 6b60f14..aed22d6 100644
--- a/inc/helpers/ui.php
+++ b/inc/helpers/ui.php
@@ -19,8 +19,8 @@
}
?>
- <aside id="queue" class="left col start btw main" aria-expanded="false" >
- <div class="m-actions row start nowrap">
+ <aside id="queue" class="left col top main" aria-expanded="false" >
+ <div class="m-actions row left nowrap">
<button class="refresh row" title="Check now">
<?= jvbIcon('arrows-clockwise', ['title'=> 'Check now']) ?>
<span class="countdown row indicator" title="Will refresh again...">5</span>
@@ -28,7 +28,7 @@
<div class="popup row"><span></span></div>
</div>
- <div class="header col start">
+ <div class="header col top">
<h2>Queue Status</h2>
<nav class="filters">
<?php
@@ -55,9 +55,9 @@
?>
</nav>
</div>
- <div class="qitems item-grid col a-start nowrap">
+ <div class="qitems item-grid col left nowrap">
</div>
- <div class="queue-actions row btw nowrap">
+ <div class="queue-actions row x-btw nowrap">
<button class="dismiss-all">Clear Completed</button>
<button class="retry-all">Retry Failed</button>
</div>
@@ -70,20 +70,20 @@
</button>
<template class="queueItem">
<div class="item">
- <div class="header row btw">
+ <div class="header row x-btw">
<span class="type"></span>
<span class="status row"><?= jvbIcon('arrows-clockwise') ?><span class="screen-reader-text"></span></span>
</div>
<?php jvbRenderProgressBar('',false,false) ?>
<div class="info">
<div class="details"></div>
- <div class="time row start">
+ <div class="time row left">
<?= jvbIcon('clock') ?>
<span class="started">Started: <time></time></span>
<span class="completed" hidden><span>Completed: </span><time></time></span>
</div>
</div>
- <div class="actions row end">
+ <div class="actions row right">
<button class="retry" data-action="retry"><span>Retry</span><?= jvbIcon('arrows-clockwise')?></button>
<button class="cancel" data-action="cancel"><span>Cancel</span><?= jvbIcon('x-square')?></button>
<button class="refresh" data-action="refresh" title="Refresh to see changes"><span>Refresh</span><?= jvbIcon('arrows-clockwise')?></button>
@@ -212,9 +212,9 @@
* Outputs the search bar (likely don't need anymore)
* @return string
*/
-function jvbSearch(string $placeholder = 'Search...', string $id = 'search'):string
+function jvbSearch(string $placeholder = 'Search...', string $id = 'search', string $label = '', string $buttonText = '', bool $buttonInside = false, bool $hideSearch = false):string
{
- return Form::search($placeholder, $id);
+ return Form::search($placeholder, $id, $label, $buttonText, $buttonInside, $hideSearch);
}
@@ -271,7 +271,7 @@
</aside>
<template class="notificationPopup">
<div class="toast" role="status" aria-live="polite">
- <div class="toast-content row btw">
+ <div class="toast-content row x-btw">
<p></p>
<button type="button" class="close-toast" aria-label="Close">
<?= jvbIcon('x') ?>
@@ -362,7 +362,7 @@
echo '';
return '';
}
- $header = '<nav class="tabs row start" role="tablist">';
+ $header = '<nav class="tabs row left" role="tablist">';
$content = '';
$i = 0;
@@ -434,7 +434,7 @@
<div class="bar">
<div class="fill"></div>
</div>
- <div class="row btw">
+ <div class="row x-btw">
%s
<div class="details">
%s
@@ -451,26 +451,36 @@
return $bar;
}
-function jvbFormStatus(string $message = '') {
- return '<div class="restore-form col" hidden>
- <h3>Looks like we left things hanging...</h3>
- <p>We\'ve filled in the fields with what you put last time.</p>
- <div class="actions">
- <button type="button" data-action="clear-form">
- '.jvbIcon('arrows-clockwise').'
- <span>Start Over</span>
- </button>
- <button type="button" data-action="dismiss-restore">
- '.jvbIcon('x').'
- <span>Dismiss</span>
- </button>
- </div>
- </div>
+function jvbFormStatus(string $message = ''):string
+{
+ return sprintf(
+ '%s
<div class="fstatus row" hidden>
<div class="spinner"></div>
<i class="icon"></i>
- <p class="message">'.$message.'</p>
- </div>';
+ <p class="message">%s</p>
+ </div>',
+ jvbFormRestore(),
+ $message
+ );
+}
+function jvbFormRestore():string
+{
+ return sprintf(
+ '<div class="restore-form col" hidden>
+ <h3>Looks like we left things hanging...</h3>
+ <p>Would you like to continue where you left off?</p>
+ <div class="actions">
+ <button class="restore" type="button" data-action="restore">%s<span>Restore</span></button>
+ <button type="button" class="discard" data-action="clear">
+ %s
+ <span>Discard</span>
+ </button>
+ </div>
+ </div>',
+ jvbFormIcon('clock-clockwise'),
+ jvbFormIcon('x'),
+ );
}
--
Gitblit v1.10.0