From 235ce5716edc2f7cbe80fdccf26eac7269587839 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 08 Jun 2026 04:38:18 +0000
Subject: [PATCH] =FavouritesManager.php and FavouritesRoutes.php fixes. Moving all logic to FavouritesManager.php. Still some left to do
---
inc/blocks/TimelineBlock.php | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/inc/blocks/TimelineBlock.php b/inc/blocks/TimelineBlock.php
index 271dd7e..85b9add 100644
--- a/inc/blocks/TimelineBlock.php
+++ b/inc/blocks/TimelineBlock.php
@@ -35,7 +35,7 @@
$this->cache->flush();
}
add_action('init', [ $this, 'registerBlock' ]);
- add_action('wp_footer', 'jvbRenderGallery');
+ add_action('wp_footer', [$this, 'renderGallery']);
}
public function registerBlock()
@@ -59,13 +59,7 @@
}
$this->content = jvbNoBase($post->post_type);
- $this->children = get_children([
- 'post_parent' => $this->parentID,
- 'post_status' => 'publish',
- 'orderby' => 'date',
- 'order' => 'ASC',
- 'fields' => 'ids'
- ]);
+ $this->children = jvbTimelinePoints($this->parentID,$post->post_type);
$this->total = count($this->children);
ob_start();
@@ -79,6 +73,9 @@
{
$this->renderHeader();
$this->renderTimeline();
+ ?>
+ <ul class="buttons"><li><a href="<?= get_post_type_archive_link(BASE.$this->content) ?>">See All Before & Afters</a></li></ul>
+ <?php
}
protected function get_field(string $fieldName, array $fields) {
@@ -133,7 +130,16 @@
}
?>
</ul>
+ <ul class="buttons"><li><a href="<?= get_post_type_archive_link(BASE.$this->content) ?>">See All Before & Afters</a></li></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>
@@ -146,14 +152,6 @@
<?php endif; ?>
</div>
</section>
- <section id="info">
- <?php
- $content = $this->get_field('post_content', $extra);
- if ($content !== '') {
- echo $this->formatContent($content);
- }
- ?>
- </section>
<?php
}
@@ -183,11 +181,11 @@
$title = ($i === 0) ? 'Before Laser Tattoo Removal' : 'After '.$i.' Treatment'.$plural;
$title = ($i > 0 && !str_contains('Treatment', $fields['post_title'])) ? $fields['post_title'] : $title;
?>
- <section id="<?= $i === 0 ? 'before-treatment' : 'treatment-'.$i ?>" class="timeline-point row a-start nowrap">
+ <section id="<?= $i === 0 ? 'before-treatment' : 'treatment-'.$i ?>" class="timeline-point row top nowrap">
<?php
$img = $this->get_field('post_thumbnail', $fields);
if (is_int($img)) {
- echo jvbFormatImage($img);
+ echo str_replace('<img', '<img data-caption=".info header"', jvbFormatImage($img));
}
?>
<div class="info">
@@ -224,9 +222,14 @@
$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($registrar->getIcon('hourglass')).html_entity_decode($term->name).'</a><small>after the treatment</small></li>';
+ $out .= '<li><small><a href="'.$link.'" rel="tag" title="See more progressions at this timeline">'.jvbIcon($registrar->getIcon('hourglass')).html_entity_decode($term->name).'</a> after the treatment</small></li>';
}
$out .='</ul>';
return $out;
}
+
+ public function renderGallery():void
+ {
+ jvbRenderGallery(true);
+ }
}
--
Gitblit v1.10.0