From 4089ba01e0881c89a72332e13bc3a80b6bddec2a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 29 Jun 2026 22:15:55 +0000
Subject: [PATCH] =DashboardManager overhaul. A bit easier to modify the output of pages. Still have to get the account pages to work as expected, as well as verify the integrations and others are working - but registrar/content pages work as expected. Also fixed up the table generation in CRUD.js and CRUDSkeleton.php
---
inc/ui/CRUDSkeleton.php | 465 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 289 insertions(+), 176 deletions(-)
diff --git a/inc/ui/CRUDSkeleton.php b/inc/ui/CRUDSkeleton.php
index 3fa2dc6..b231217 100644
--- a/inc/ui/CRUDSkeleton.php
+++ b/inc/ui/CRUDSkeleton.php
@@ -1,8 +1,10 @@
<?php
namespace JVBase\ui;
+use JVBase\base\Site;
use JVBase\managers\UserTermsManager;
use JVBase\meta\Form;
+use JVBase\registrar\Registrar;
use WP_User;
if (!defined('ABSPATH')) {
@@ -117,7 +119,6 @@
protected ?array $uploaderConfig = null;
// Data
- protected $dataSourceCallback = null;
protected array $templates = [];
// UI Options
@@ -128,6 +129,7 @@
protected array $customDateRanges = [];
protected array $additionalClasses = [];
+ protected ?Registrar $registrar;
public function __construct() {
$this->icon = jvbDefaultIcon();
$this->user = wp_get_current_user();
@@ -148,6 +150,12 @@
*/
public function content(string $type, string $singular, string $plural): self {
$this->dataType = $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;
@@ -213,13 +221,17 @@
*/
public function addTaxonomyFilter(array $taxonomies, ?string $limit = null): self {
foreach($taxonomies as $taxonomy) {
- $this->taxonomies[$taxonomy] = [
- 'type' => 'taxonomy',
- 'taxonomy'=> $taxonomy,
- 'limit' => $limit,
- 'label' => JVB_TAXONOMY[$taxonomy]['plural']??'',
- 'icon' => JVB_TAXONOMY[$taxonomy]['icon']??''
- ];
+ $registrar = Registrar::getInstance($taxonomy);
+
+ if ($registrar) {
+ $this->taxonomies[$taxonomy] = [
+ 'type' => 'taxonomy',
+ 'taxonomy'=> $taxonomy,
+ 'limit' => $limit,
+ 'label' => $registrar->getPlural(),
+ 'icon' => $registrar->getIcon()
+ ];
+ }
}
return $this;
@@ -227,8 +239,8 @@
protected function taxConfig(string $taxonomy, string $label = ''):array
{
- $isVerified = jvbUserIsVerified();
- $label = ($label === '') ? JVB_TAXONOMY[$taxonomy]['plural'] : $label;
+ $isVerified = $this->userIsVerified();
+ $label = ($label === '') ? Registrar::getInstance($taxonomy)->getPlural() : $label;
return [
'type' => 'taxonomy',
'label' => $label,
@@ -239,6 +251,13 @@
];
}
+ protected function userIsVerified():bool
+ {
+ $membership = Site::membership();
+
+ return !($membership && $membership->has('member_verified')) || current_user_can('skip_moderation');
+ }
+
public function addSearch():self
{
$this->hasSearch = true;
@@ -336,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;
@@ -350,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);
@@ -451,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 {
@@ -569,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
}
@@ -588,7 +600,7 @@
$dataIgnore = $this->useCRUDjs ? '' : ' data-ignore';
?>
<section class="items-list <?= esc_attr($this->dataType) ?> crud" data-content="<?= esc_attr($this->dataType) ?>" data-singular="<?=$this->singular?>" data-plural="<?=$this->plural?>" data-view="<?= $this->defaultView?>"<?=$dataIgnore?>>
- <div class="wrap">
+ <div id="item-wrap">
<?php
$this->renderControlsAndFilters();
@@ -612,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();
@@ -627,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
}
@@ -636,7 +649,7 @@
return;
}
?>
- <div class="search row start nowrap">
+ <div class="search row left nowrap">
<span class="label">Search:</span>
<?= jvbSearch() ?>
</div>
@@ -649,7 +662,7 @@
return;
}
?>
- <div class="radio-options view row">
+ <div class="radio-options view row left">
<span class="label">View:</span>
<?php
$views = [
@@ -670,7 +683,7 @@
<label for="view-<?=$view?>"
title="<?=$views[$view]['label']?>">
<?= jvbDashIcon($views[$view]['icon']) ?>
- <span class="screen-reader-text"><?=$views[$view]['label']?></span>
+ <span class="label"><?=$views[$view]['label']?></span>
</label>
<?php
}
@@ -685,7 +698,7 @@
return;
}
?>
- <div class="radio-options status row">
+ <div class="radio-options status row left">
<span class="label">Status:</span>
<?php
$i = 1;
@@ -700,6 +713,7 @@
<input type="radio" class="btn" data-filter="status" value="<?=$status?>" name="status" id="<?=$status?>"<?=$checked?>>
<label for="<?=$status?>" title="<?=$config['label']?>">
<?= jvbDashIcon($config['icon']) ?>
+ <span class="label"><?= $config['label'] ?></span>
</label>
<?php
$i++;
@@ -712,34 +726,52 @@
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' => [
- 'date' => 'Order by date created',
- 'alphabetical' => 'Order alphabetically'
+ [
+ 'slug' => 'date',
+ 'label' => 'Date Created',
+ 'icon' => 'calendar'
+ ],
+ [
+ 'slug' => 'alphabetical',
+ 'label' => 'Alphabetically',
+ 'icon' => 'alphabetical',
+ ],
+ [
+ 'slug' => 'date_modified',
+ 'icon' => 'clock-clockwise',
+ 'label' => 'Date Modified',
+ ],
],
'order' => [
- 'sort-ascending' => 'In ascending order (Z-A, oldest to newest)',
- 'sort-descending' => 'In descending order (A-Z, newest to oldest)'
+ [
+ 'slug' => 'desc',
+ 'icon' => 'sort-descending',
+ 'label' => 'Descending (A-Z, 1-10)'
+ ],
+ [
+ 'slug' => 'asc',
+ 'icon' => 'sort-ascending',
+ 'label' => 'Ascending (Z-A, 10-1)'
+ ]
]
];
foreach ($order as $o => $option) {
?>
- <div class="row start">
+ <div class="row left">
<span class="label"><?= ucfirst($o)?>:</span>
<?php
+ $title = $o === 'orderby' ? 'Order by ' : 'Sort ';
$i = 0;
- foreach ($option as $opt => $label) {
- $icon = $opt === 'date' ? 'calendar' : $opt;
- $value = $opt;
- $value = ($value === 'sort-ascending') ? 'asc' : $value;
- $value = ($value === 'sort-descending') ? 'desc' : $value;
+ foreach ($option as $conf) {
?>
- <input id="<?=$opt?>" class="btn" type="radio" name="<?=$o?>" data-filter="<?=$o?>" value="<?=$value?>"<?=$i===0 ? ' checked':''?>>
+ <input id="<?=$o.'-'.$conf['slug'] ?>" class="btn" type="radio" name="<?=$o?>" data-filter="<?=$o?>" value="<?=$conf['slug']?>"<?=$i===0 ? ' checked':''?>>
- <label for="<?=$opt?>" title="<?=$label?>"><?=jvbDashIcon($icon)?></label>
+ <label for="<?=$o.'-'.$conf['slug']?>" title="<?=$title.' '.$conf['label']?>"><?=jvbDashIcon($conf['icon'])?><span class="label"><?= $conf['label'] ?></span></label>
<?php
$i++;
}
@@ -757,7 +789,7 @@
return;
}
?>
- <div class="filters row start">
+ <div class="filters row left">
<span class="label">Filters:</span>
<?php
foreach ($this->filters as $key => $config) {
@@ -837,6 +869,7 @@
$form = ob_get_clean();
echo jvbNewModal(
'date-range',
+ 'date-range',
'Filter Results by Date:',
$form
);
@@ -876,8 +909,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>';
@@ -892,9 +925,9 @@
*/
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->getUserTerms($this->user_id, $taxonomy);
+ return $manager->fetchUserTerms($this->user_id, $taxonomy);
} else {
$limit = (int)$limit;
}
@@ -915,7 +948,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>
@@ -948,7 +981,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>
@@ -973,9 +1006,12 @@
<option value="<?=$control?>"<?=$disabled?>><?=$label?></option>
<?php
}
- foreach ($this->taxonomies as $taxonomy => $config) {
+
+ foreach ($this->taxonomies as $taxonomy =>$config) {
+ $registrar = Registrar::getInstance($taxonomy);
+ if (!$registrar) continue;
?>
- <option value="tax-<?=$taxonomy?>" data-type="selector" data-single="<?=JVB_TAXONOMY[$taxonomy]['singular']?>" data-plural="<?=JVB_TAXONOMY[$taxonomy]['plural']?>" data-taxonomy="<?=$taxonomy?>">Add to <?= JVB_TAXONOMY[$taxonomy]['singular']??$config['label'] ?></option>
+ <option value="tax-<?=$taxonomy?>" data-type="selector" data-single="<?=$registrar->getSingular()?>" data-plural="<?=$registrar->getPlural()?>" data-taxonomy="<?=$taxonomy?>">Add to <?= $registrar->getSingular() ?></option>
<?php
}
?>
@@ -1043,7 +1079,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)) {
@@ -1116,7 +1152,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];
@@ -1157,7 +1193,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>
@@ -1182,7 +1218,6 @@
?>
<template class="contentTable">
<form class="table"
- data-save="content"
data-content="<?= esc_attr($this->dataType) ?>"
data-form-id="content-table-<?= esc_attr($this->dataType) ?>"
<?= $permissions?>>
@@ -1220,9 +1255,9 @@
<?= $this->renderItemSelect() ?>
</td>
<?php
- if (array_key_exists('status', $this->fields)){
+ if (array_key_exists('post_status', $this->fields)){
?>
- <td class="status" data-field="post_status">
+ <td class="post_status" data-field="post_status" data-field-type="radio">
<?= $this->renderStatusRadios() ?>
</td>
<?php
@@ -1236,7 +1271,7 @@
'radio'
];
foreach ($this->fields as $name => $config):
- if (array_key_exists('hidden', $config) || $name === 'status'){
+ if ((array_key_exists('hidden', $config) && $config['hidden'] === true) || $name === 'post_status'){
continue;
}
$makeThisDetailed = (in_array($config['type'], $makeDetails));
@@ -1244,7 +1279,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;
}
@@ -1276,7 +1311,6 @@
?>
<template class="contentTable">
<form class="table"
- data-save="content"
data-content="<?= esc_attr($this->dataType) ?>"
data-form-id="content-table-<?= esc_attr($this->dataType) ?>">
<?= jvbFormStatus() ?>
@@ -1326,7 +1360,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;
@@ -1349,7 +1383,7 @@
</td>
<?php
foreach ($this->fields as $name => $config) {
- if(array_key_exists('hidden', $config) || $name === 'post_status') {
+ if((array_key_exists('hidden', $config) && $config['hidden'] === true) || $name === 'post_status') {
continue;
}
if (!in_array($name, $this->timelineUniqueFields)) {
@@ -1359,7 +1393,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>
@@ -1376,64 +1410,59 @@
* Render table header
*/
protected function renderTableHeader(): string {
- ob_start();
-
- ?>
- <tr>
+ $out = '<tr>
<th scope="col" class="select-header">
<input type="checkbox" id="select-all" name="select-all">
<label for="select-all">All</label>
- </th>
- <?php if (array_key_exists('status', $this->fields)) { ?>
- <th scope="col" class="status-header">Status</th>
- <?php } ?>
- <?php foreach ($this->fields as $name => $config):
- if (array_key_exists('hidden', $config) || $name === 'status'){
- continue;
- }
- ?>
- <th scope="col" class="show-<?= esc_attr($name) ?>"<?= (in_array($name, $this->stuck)) ? ' data-stuck':''?>>
- <?= esc_html($config['label']) ?>
- </th>
- <?php endforeach;
- if (!empty($this->itemActions)) {
- ?>
- <th scope="col" class="show-actions">
- Actions
- </th>
- <?php
- }
- ?>
+ </th>';
- </tr>
- <?php
- return ob_get_clean();
+ if (array_key_exists('post_status', $this->fields)){
+ $out .= '<th scope="col" class="status-header">Status</th>';
+ }
+
+ foreach ($this->fields as $name => $config) {
+ if ($name === 'post_status' || (array_key_exists('hidden', $config) && $config['hidden'] === true)) {
+ continue;
+ }
+ $out .= sprintf(
+ '<th scope="col" class="show-%s"%s>%s</th>',
+ esc_attr($name),
+ in_array($name, $this->stuck) ? ' data-stuck' : '',
+ esc_html($config['label'])
+ );
+ }
+
+ if (!empty($this->itemActions)) {
+ $out .= '<th scope="col" class="show-actions">Actions</th>';
+ }
+ $out .= '</tr>';
+
+ return $out;
}
protected function renderTimelineTableHeader(): string {
- ob_start();
-
- ?>
- <tr>
+ $out = '<tr>
<th scope="col" class="select-header">
<input type="checkbox" id="select-all" name="select-all">
<label for="select-all">All</label>
</th>
<th scope="col" class="show-post_status">
Status
- </th>
- <?php foreach ($this->fields as $name => $config):
- if (array_key_exists('hidden', $config) || $name === 'post_status'){
- continue;
- }
- ?>
- <th scope="col" class="show-<?= esc_attr($name) ?>"<?= (in_array($name, $this->stuck)) ? ' data-stuck':''?>>
- <?= esc_html($config['label']) ?>
- </th>
- <?php endforeach; ?>
- </tr>
- <?php
- return ob_get_clean();
+ </th>';
+
+ foreach ($this->fields as $name => $config) {
+ if ($name === 'post_status' || (array_key_exists('hidden', $config) && $config['hidden'] === true)) {
+ continue;
+ }
+ $out .= sprintf(
+ '<th scope="col" class="show-%s"%s>%s</th>th>',
+ esc_attr($name),
+ in_array($name, $this->stuck) ? ' data-stuck':'',
+ esc_html($config['label'])
+ );
+ }
+ $out .= '</tr>';
+ return $out;
}
/**
@@ -1442,7 +1471,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',
@@ -1461,29 +1490,35 @@
return ob_get_clean();
}
- protected function renderStatusRadios(): string {
- ob_start();
- ?>
- <div class="radio-options status-options row" data-field="post_status" data-field-type="radio">
- <?php foreach ($this->statuses as $status):
- if ($status === 'all') continue;
- if (!array_key_exists($status, $this->allowedStatuses)) continue;
- $config = $this->allowedStatuses[$status];
- ?>
+ protected function renderStatusRadios(): string
+ {
+ $out = '<div class="radio-options status-options row">';
+ foreach ($this->statuses as $status) {
+ if ($status === 'all' || !array_key_exists($status, $this->allowedStatuses)) continue;
+ $config = $this->allowedStatuses[$status];
- <input type="radio"
+ $out .= sprintf(
+ '<input type="radio"
name="post_status"
- id="status-<?= esc_attr($status) ?>"
- value="<?= esc_attr($status) ?>">
- <label for="status-<?= esc_attr($status) ?>">
- <?= jvbDashIcon($config['icon']) ?>
- <span class="screen-reader-text"><?= esc_html($config['label']) ?></span>
- </label>
- <?php endforeach; ?>
- <span class="validation-message" hidden role="alert"></span>
- </div>
- <?php
- return ob_get_clean();
+ id="post_status-%s"
+ class="btn"
+ value="%s">
+ <label for="post_status-%s" title="%s">
+ %s
+ <span class="screen-reader-text">%s</span>
+ </label>',
+ esc_attr($status),
+ esc_attr($status),
+ esc_attr($status),
+ esc_html($config['label']),
+ jvbDashIcon($config['icon']),
+ esc_html($config['label'])
+ );
+ }
+ $out .= '<span class="validation-message" hidden role="alert"></span>
+ </div>';
+
+ return $out;
}
@@ -1529,6 +1564,7 @@
{
echo jvbNewModal(
'create',
+ 'create',
'Creating <span class="count"></span> New '.$this->singular,
str_replace('edit-form"', 'create-form" data-noautosave', $this->editForm())
);
@@ -1537,71 +1573,71 @@
protected function editForm():string
{
ob_start();
+/* <form class="edit-form" data-save="content" data-form-id="edit-<?=$this->dataType?>" data-autosave<?= ($this->isTimeline) ? ' data-timeline' : ''*/
?>
- <form class="edit-form" data-save="content" data-form-id="edit-<?=$this->dataType?>" data-autosave<?= ($this->isTimeline) ? ' data-timeline' : ''?>>
+
+ <form class="edit-form" data-form-id="edit-<?=$this->dataType?>" data-autosave<?= ($this->isTimeline) ? ' data-timeline' : ''?>>
<?= jvbFormStatus() ?>
<input type="hidden" name="form-id" value="<?=uniqid('new-')?>" />
<input type="hidden" name="content" value="<?=$this->dataType?>" />
<div class="fields">
- <div class="field-group radio-options row" data-field="post_status" data-field-type="radio">
- <span>Status:</span>
- <?php
- $this->getApplicableStatuses('edit');
- ?>
- </div>
- <?php if (!$this->userCanPublish) { ?>
- <p class="description">Your account needs to be verified before you can publish content.</p>
- <?php }
+ <?php
+ if (empty($this->sections) && !empty($this->statuses)) {
+ echo Form::render('post_status', '', $this->getStatusFieldConfig('edit-'));
+ }
if (!empty($this->sections)) {
$tabs = [];
- foreach ($this->sections as $slug => $config) {
+ foreach ($this->sections as $config) {
+ $slug = $config['slug'];
$section = [];
if (array_key_exists('icon', $config)) {
$section = [
'icon' => $config['icon']
];
}
+
$tabs[$slug] = array_merge([
- 'title' => $config['label'],
+ 'title' => $config['title'],
'content' => '',
'description' => $config['description']??'',
], $section);
- $icon = jvbSectionIcon($slug);
- if ($icon !== '') {
- $tabs[$slug]['icon'] = $icon;
- }
}
} else {
$tabs = false;
}
-
$fields = $this->fields;
+
if (!$this->isTimeline) {
- $first = ['post_thumbnail', 'post_title', 'price'];
+ $first = $this->registrar->getType() === 'post' ?
+ ['post_thumbnail', 'post_title', 'price'] :
+ ( $this->registrar->getType() === 'term' ?
+ ['name', 'thumbnail', 'description'] :
+ ['username', 'display_name', 'description']);
foreach ($first as $f) {
if (array_key_exists($f, $fields)) {
if ($tabs) {
- $tabs['basic']['content'] .= Form::render($f, '', $fields[$f]);
+ $tabs['main']['content'] .= Form::render($f, '', $fields[$f]);
} else {
- Form::render($f, '', $fields[$f]);
+ echo Form::render($f, '', $fields[$f]);
}
-
unset($fields[$f]);
}
}
}
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
];
@@ -1611,25 +1647,33 @@
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) {
+ if (in_array($config['type'], ['taxonomy', 'selector'])) {
+ $config = array_merge($config, $this->taxConfig($config['taxonomy'], $config['label']));
+ }
if ($tabs) {
- $section = (array_key_exists('section', $config)) ? $config['section'] : 'basic';
- $tabs[$section]['content'] .= Form::render($n,'', $config);
+ $section = (array_key_exists('section', $config)) && !empty($config['section']) ? $config['section'] : 'main';
+ $tabs[$section]['content'] .= Form::render($n, '', $config);
} else {
- if (in_array($config['type'], ['taxonomy', 'selector'])) {
- $config = array_merge($config, $this->taxConfig($config['taxonomy'], $config['label']));
- }
- Form::render($n, '', $config);
+ echo Form::render($n, '', $config);
}
}
@@ -1648,6 +1692,7 @@
{
echo jvbNewModal(
'edit',
+ 'edit',
'Edit your '.$this->singular,
$this->editForm()
);
@@ -1657,19 +1702,18 @@
{
if (empty($this->bulkActions)) return;
ob_start();
+/* <form class="bulk-edit-form" data-save="content" data-form-id="bulk-edit-<?=$this->dataType?>">*/
?>
- <form class="bulk-edit-form" data-save="content" data-form-id="bulk-edit-<?=$this->dataType?>">
+
+ <form class="bulk-edit-form" data-form-id="bulk-edit-<?=$this->dataType?>">
<?= jvbFormStatus() ?>
<div class="selected"></div>
<p class="description">You can unselect items by clicking the image here.</p>
<p class="hint"><strong>IMPORTANT: </strong> Whatever changes you make here will be applied to all selected <?=$this->plural?>.</p>
<div class="fields">
- <div class="field-group radio-options row">
- <?php
- $this->getApplicableStatuses('bulk-');
- ?>
- </div>
<?php
+ echo Form::render('post_status', '', $this->getStatusFieldConfig('bulk-'));
+
if (!empty($this->taxonomies)) {
?>
<div class="taxonomies">
@@ -1701,12 +1745,52 @@
$form = ob_get_clean();
echo jvbNewModal(
'bulkEdit',
+ 'bulkEdit',
'Bulk Edit <span class="selected"></span> '.$this->plural,
$form
);
}
+ protected function getStatusFieldConfig(string $prefix): array
+ {
+ $options = [];
+ foreach ($this->statuses as $status) {
+ if ($status === 'all' || !array_key_exists($status, $this->allowedStatuses)) {
+ continue;
+ }
+ $config = $this->allowedStatuses[$status];
+
+ if (in_array($status, ['future', 'past'])) {
+ if ($status === 'future') {
+ $status = 'publish';
+ $config = ['icon' => 'eye', 'label' => 'Live'];
+ } else {
+ continue;
+ }
+ }
+
+ $options[$status] = [
+ 'label' => $config['label'],
+ 'icon' => $config['icon'],
+ 'disabled' => ($status === 'publish' && !$this->userCanPublish),
+ ];
+ }
+
+ return [
+ 'type' => 'radio',
+ 'label' => 'Status',
+ 'options' => $options,
+ 'inputClass' => 'btn',
+ 'idPrefix' => $prefix,
+ 'class' => 'radio-options row',
+ 'hint' => !$this->userCanPublish
+ ? 'Your account needs to be verified before you can publish content.'
+ : '',
+ ];
+ }
+
protected function getApplicableStatuses(string $prefix) {
+ ob_start();
foreach ($this->statuses as $status) {
if ($status === 'all' || !array_key_exists($status, $this->allowedStatuses)) {
continue;
@@ -1736,5 +1820,34 @@
</label>
<?php
}
+ $out = ob_get_clean();
+ echo Form::fieldWrap('post_status', $out, ['type'=>'group']);
+ }
+
+
+ public static function searchFilter():string
+ {
+ $self = new self();
+ $self->hasSearch = true;
+ ob_start();
+ $self->renderSearch();
+ return ob_get_clean();
+ }
+
+ public static function viewFilter(array $views):string
+ {
+ $self = new self();
+ $self->views = $views;
+ ob_start();
+ $self->renderViewControls();
+ return ob_get_clean();
+ }
+
+ public static function orderFilter(bool $random = false):string
+ {
+ $self = new self();
+ ob_start();
+ $self->renderOrderControls();
+ return ob_get_clean();
}
}
--
Gitblit v1.10.0