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/ui/CRUDSkeleton.php | 101 ++++++++++++++++++++++++++------------------------
1 files changed, 53 insertions(+), 48 deletions(-)
diff --git a/inc/ui/CRUDSkeleton.php b/inc/ui/CRUDSkeleton.php
index c62f3a4..307e0b9 100644
--- a/inc/ui/CRUDSkeleton.php
+++ b/inc/ui/CRUDSkeleton.php
@@ -119,7 +119,6 @@
protected ?array $uploaderConfig = null;
// Data
- protected $dataSourceCallback = null;
protected array $templates = [];
// UI Options
@@ -130,7 +129,7 @@
protected array $customDateRanges = [];
protected array $additionalClasses = [];
- protected Registrar $registrar;
+ protected ?Registrar $registrar;
public function __construct() {
$this->icon = jvbDefaultIcon();
$this->user = wp_get_current_user();
@@ -151,7 +150,12 @@
*/
public function content(string $type, string $singular, string $plural): self {
$this->dataType = $type;
- $this->registrar = Registrar::getInstance($type);
+ $registrar = Registrar::getInstance($type);
+ if ($registrar) {
+ $this->registrar = Registrar::getInstance($type)??null;
+ $this->sections = $this->registrar->getSections();
+ }
+
$this->singular = $singular;
$this->plural = $plural;
return $this;
@@ -351,7 +355,7 @@
}
$this->timelineSharedFields = array_keys(array_filter($this->fields, function ($field) {
- if (!array_key_exists('for_all', $field) || $field['for_all'] === false){
+ if (!array_key_exists('for_all', $field) || $field['for_all'] === false || is_null($field['for_all'])){
return true;
}
return false;
@@ -365,7 +369,6 @@
return false;
}));
-
$all = array_merge($this->timelineUniqueFields, $this->timelineSharedFields);
$this->nonTimelineFields = array_filter($this->fields, function ($field) use ($all) {
return !in_array($field, $all);
@@ -466,15 +469,6 @@
}
/**
- * Set the data source callback
- * Callback should accept filters and return array of items
- */
- public function dataSource(callable $callback): self {
- $this->dataSourceCallback = $callback;
- return $this;
- }
-
- /**
* Add a custom template
*/
public function addTemplate(string $name, string $template): self {
@@ -584,14 +578,17 @@
protected function renderUploader(): void {
?>
<details open class="uploader">
- <summary class="row btw"><?= esc_html($this->uploaderConfig['label'] ?? 'Upload Files') ?></summary>
- <?php
- echo Form::render(
- 'new_' . $this->dataType,
- '',
- $this->uploaderConfig
- );
- ?>
+ <summary class="row x-btw"><?= esc_html($this->uploaderConfig['label'] ?? 'Upload Files') ?></summary>
+ <form id="uploader" data-form-id="upload_new_<?=$this->dataType ?>">
+ <?php
+ echo jvbFormRestore();
+ echo Form::render(
+ 'new_' . $this->dataType,
+ '',
+ $this->uploaderConfig
+ );
+ ?>
+ </form>
</details>
<?php
}
@@ -627,8 +624,8 @@
return;
}
?>
- <details class="all-filters col start" data-ignore>
- <summary>Filters <button hidden data-action="clear-filters" data-ignore><?=jvbIcon('x')?><span>Clear Filters</span></span></button></summary>
+ <details class="all-filters col top" data-ignore>
+ <summary>Filters</summary>
<?php
$this->renderSearch();
@@ -642,6 +639,7 @@
?>
<button data-action="refresh" data-ignore><?=jvbIcon('arrows-clockwise')?><span>Hard Refresh</span></span></button>
</details>
+ <button hidden data-action="clear-filters" data-ignore hidden><?=jvbIcon('x')?><span>Clear Filters</span></span></button>
<?php
}
@@ -651,7 +649,7 @@
return;
}
?>
- <div class="search row start nowrap">
+ <div class="search row left nowrap">
<span class="label">Search:</span>
<?= jvbSearch() ?>
</div>
@@ -727,7 +725,7 @@
protected function renderOrderControls():void
{
?>
- <div class="radio-options order row btw w-full">
+ <div class="radio-options order row x-btw w-full">
<?php
$order = [
'orderby' => [
@@ -742,7 +740,7 @@
foreach ($order as $o => $option) {
?>
- <div class="row start">
+ <div class="row left">
<span class="label"><?= ucfirst($o)?>:</span>
<?php
$i = 0;
@@ -772,7 +770,7 @@
return;
}
?>
- <div class="filters row start">
+ <div class="filters row left">
<span class="label">Filters:</span>
<?php
foreach ($this->filters as $key => $config) {
@@ -891,8 +889,8 @@
foreach ($terms as $term) {
$out .= sprintf(
'<option value="%s">%s</option>',
- esc_attr($term['term_id']),
- esc_html($term['name'])
+ esc_attr(is_object($term) ? $term->term_id : $term['term_id']),
+ esc_html(is_object($term) ? $term->name : $term['name'])
);
}
$out .= '</select></div>';
@@ -907,7 +905,7 @@
*/
protected function getCommonTerms(string $taxonomy, ?string $limit = null):array {
if ($limit) {
- if ($limit === 'user') {
+ if (Site::has('membership') && $limit === 'user') {
$manager = new UserTermsManager();
return $manager->fetchUserTerms($this->user_id, $taxonomy);
} else {
@@ -930,7 +928,7 @@
ob_start();
?>
<details class="multi-select" title="Select columns" hidden>
- <summary class="row start nowrap">
+ <summary class="row left nowrap">
<?= jvbDashIcon('columns') ?>
<span class="labels">Toggle Columns</span>
</summary>
@@ -963,7 +961,7 @@
return;
}
?>
- <div class="bulk-controls row nowrap btw">
+ <div class="bulk-controls row nowrap x-btw">
<div class="bulk-select">
<input type="checkbox" id="select-all" class="select-all">
<label for="select-all" class="row"><span>Select All</span><span class="selected-count" hidden></span></label>
@@ -1061,7 +1059,7 @@
}, ARRAY_FILTER_USE_KEY);
echo '<template class="timelineItem">';
- echo Form::renderImagePreview(null, ['fields' => $temp]);
+ echo Form::renderImagePreview(null, $temp);
echo '</template>';
}
if (!array_key_exists('empty', $templates)) {
@@ -1134,7 +1132,7 @@
}
ob_start();
?>
- <div class="item-actions row btw abs">
+ <div class="item-actions row x-btw abs">
<?php
foreach ($this->itemActions as $action) {
$config = $this->defaultItemActions[$action];
@@ -1175,7 +1173,7 @@
<div class="item <?=esc_attr($this->dataType)?> row nowrap">
<?= $this->renderItemSelect()?>
<?=$this->renderImage() ?>
- <div class="col start w-full">
+ <div class="col top w-full">
<h3 data-field="post_title"></h3>
<p data-attr="date"></p>
<p data-field="price"></p>
@@ -1262,7 +1260,7 @@
<td class="field show-<?= esc_attr($name) ?>" data-field="<?= esc_attr($name) ?>" data-field-type="<?=$config['type']?>"<?=(in_array($name, $this->stuck)) ? ' data-stuck':''?>>
<?php
if (in_array('edit', $this->caps)) {
- echo $makeThisDetailed ? '<details><summary class="row btw">See Value</summary>' : '';
+ echo $makeThisDetailed ? '<details><summary class="row x-btw">See Value</summary>' : '';
if (in_array($config['type'], ['selector', 'taxonomy', 'post'])) {
$config['autocomplete'] = true;
}
@@ -1344,7 +1342,7 @@
$makeThisDetailed = (in_array($config['type'], $makeDetails));
?>
<td class="field show-<?= esc_attr($name) ?>" data-field="<?= esc_attr($name) ?>" data-field-type="<?=$config['type']?>"<?=(in_array($name, $this->stuck)) ? ' data-stuck':''?>>
- <?= $makeThisDetailed ? '<details><summary class="row btw">See Value</summary>' : '' ?>
+ <?= $makeThisDetailed ? '<details><summary class="row x-btw">See Value</summary>' : '' ?>
<?php
if (in_array($config['type'], ['selector', 'taxonomy', 'post'])) {
$config['autocomplete'] = true;
@@ -1377,7 +1375,7 @@
$makeThisDetailed = (in_array($config['type'], $makeDetails));
?>
<td class="field show-<?= esc_attr($name) ?>" data-field="<?= esc_attr($name) ?>" data-field-type="<?=$config['type']?>"<?=(in_array($name, $this->stuck)) ? ' data-stuck':''?>>
- <?= $makeThisDetailed ? '<details><summary class="row btw">See Value</summary>' : '' ?>
+ <?= $makeThisDetailed ? '<details><summary class="row x-btw">See Value</summary>' : '' ?>
<?= Form::render($name, '', $config); ?>
<?= $makeThisDetailed ? '</details>' : '' ?>
</td>
@@ -1460,7 +1458,7 @@
protected function renderTableActions(): string {
ob_start();
?>
- <div class="table-actions row btw nowrap">
+ <div class="table-actions row x-btw nowrap">
<?php if (count(array_intersect(['create', 'edit'], $this->caps)) > 0) { ?>
<?= jvbRenderToggleTextField(
'vertical',
@@ -1566,8 +1564,6 @@
echo Form::render('post_status', '', $this->getStatusFieldConfig('edit-'));
}
-
-
if (!empty($this->sections)) {
$tabs = [];
foreach ($this->sections as $config) {
@@ -1605,13 +1601,15 @@
}
if ($this->isTimeline) {
- $temp = array_filter($fields, function ($field) {
- return in_array($field, $this->timelineUniqueFields);
+ $temp = array_filter($fields, function ($field) use ($fields) {
+ return in_array($field, $this->timelineUniqueFields) && (!array_key_exists('hidden', $fields[$field]) || $fields[$field]['hidden'] === false);
}, ARRAY_FILTER_USE_KEY);
$config = [
'type' => 'upload',
'subtype' => 'timeline',
- 'data' => 'timeline',
+ 'multiple' => true,
+ 'limit' => 0,
+ 'data' => ['timeline'],
'label' => 'Progression',
'fields' => $temp
];
@@ -1621,14 +1619,21 @@
if (in_array($field['type'], ['taxonomy', 'selector'])) {
$field = array_merge($field, $this->taxConfig($field['taxonomy'], $field['label']));
}
- $content .= Form::render($slug, '', $field);
+ if (!array_key_exists('hidden', $field) || $field['hidden'] === false) {
+ $content .= Form::render($slug, '', $field);
+ }
}
}
- $content .= Form::render('timeline', '', $config);
+ $content .= Form::render('timeline_gallery', '', $config);
- $tabs['progression']['content'] = $content;
+ if ($tabs) {
+ $tabs['progression']['content'] = $content;
+ } else {
+ echo $content;
+ }
+
$fields = $this->nonTimelineFields;
}
foreach ($fields as $n => $config) {
--
Gitblit v1.10.0