From d7e7d248cbe41cd7a9ef9c2fb022b6c4831f99a3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 31 May 2026 15:22:56 +0000
Subject: [PATCH] =jakevan complete
---
inc/blocks/TimelineBlock.php | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/inc/blocks/TimelineBlock.php b/inc/blocks/TimelineBlock.php
index 09d1b14..c79392e 100644
--- a/inc/blocks/TimelineBlock.php
+++ b/inc/blocks/TimelineBlock.php
@@ -3,7 +3,8 @@
use JVBase\managers\Cache;
use JVBase\meta\Meta;
-use JVBase\utility\Features;
+use JVBase\registrar\Registrar;
+use JVBase\base\Site;
use WP_Block;
if (!defined('ABSPATH')) {
@@ -47,7 +48,8 @@
public function render(array $attributes, string $content, WP_Block $block)
{
global $post;
- if (!$post || !Features::forContent(jvbNoBase($post->post_type))->has('is_timeline') ) {
+ $registrar = Registrar::getInstance($post->post_type);
+ if (!$post || !$registrar || !$registrar->hasFeature('is_timeline') ) {
return '';
}
$this->parentID = $post->ID;
@@ -100,15 +102,15 @@
if ($value === '' || $slug === 'person') {
continue;
}
- $config = JVB_TAXONOMY[$slug];
+ $registrar = Registrar::getInstance($slug);
$taxSlug = jvbCheckBase($slug);
$terms = get_the_terms($this->parentID, $taxSlug);
if ($terms && !is_wp_error($terms)) {
$many = count($terms) > 1;
?>
<li class="<?=$slug?>">
- <span title="<?= $config['singular']?>" class="term tldr" data-short="" data-long="<?= $config['singular']?>">
- <?=jvbIcon($config['icon']??jvbDefaultIcon())?>
+ <span title="<?= $registrar->getSingular()?>" class="term tldr" data-short="" data-long="<?= $registrar->getSingular()?>">
+ <?=jvbIcon($registrar->getIcon())?>
<span></span>
</span>
<?php
@@ -132,6 +134,14 @@
?>
</ul>
</header>
+ <section id="info">
+ <?php
+ $content = $this->get_field('post_content', $extra);
+ if ($content !== '') {
+ echo $this->formatContent($content);
+ }
+ ?>
+ </section>
<section id="at-a-glance" class="row nowrap">
<div class="before">
<h3>Before</h3>
@@ -144,14 +154,6 @@
<?php endif; ?>
</div>
</section>
- <section id="info">
- <?php
- $content = $this->get_field('post_content', $extra);
- if ($content !== '') {
- echo $this->formatContent($content);
- }
- ?>
- </section>
<?php
}
@@ -219,9 +221,10 @@
return '';
}
$out = '<ul class="term-list">';
+ $registrar = Registrar::getInstance('timeline');
foreach ($timeline as $term) {
$link = get_term_link($term->term_id, BASE.'timeline');
- $out .= '<li><a href="'.$link.'" rel="tag" title="See more progressions at this timeline">'.jvbIcon(JVB_TAXONOMY['timeline']['icon']??'hourglass').html_entity_decode($term->name).'</a><small>after the treatment</small></li>';
+ $out .= '<li><a href="'.$link.'" rel="tag" title="See more progressions at this timeline">'.jvbIcon($registrar->getIcon('hourglass')).html_entity_decode($term->name).'</a><small>after the treatment</small></li>';
}
$out .='</ul>';
return $out;
--
Gitblit v1.10.0