diff options
Diffstat (limited to 'resources/views/modules')
17 files changed, 47 insertions, 26 deletions
diff --git a/resources/views/modules/ancestors-chart/page.phtml b/resources/views/modules/ancestors-chart/page.phtml index 95e6dafe48..383e10d2a7 100644 --- a/resources/views/modules/ancestors-chart/page.phtml +++ b/resources/views/modules/ancestors-chart/page.phtml @@ -62,4 +62,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-chart-ancestors" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-chart-ancestors" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/charts/chart.phtml b/resources/views/modules/charts/chart.phtml index a11a2dff21..5980c17490 100644 --- a/resources/views/modules/charts/chart.phtml +++ b/resources/views/modules/charts/chart.phtml @@ -3,13 +3,11 @@ declare(strict_types=1); /** - * @var int $block_id + * @var int $block_id * @var string $chart_url */ ?> -<div id="chart-block-<?= e($block_id) ?>"></div> - -<script> - $(<?= json_encode('#chart-block-' . $block_id, JSON_THROW_ON_ERROR) ?>).load(<?= json_encode($chart_url, JSON_THROW_ON_ERROR) ?>); -</script> +<div id="chart-block-<?= e($block_id) ?>" data-wt-ajax-url="<?= e($chart_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/compact-chart/page.phtml b/resources/views/modules/compact-chart/page.phtml index a4860c656f..a414217c42 100644 --- a/resources/views/modules/compact-chart/page.phtml +++ b/resources/views/modules/compact-chart/page.phtml @@ -39,4 +39,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-chart-compact" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-chart-compact" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/descendancy_chart/page.phtml b/resources/views/modules/descendancy_chart/page.phtml index 65da388f5e..b092dc5da6 100644 --- a/resources/views/modules/descendancy_chart/page.phtml +++ b/resources/views/modules/descendancy_chart/page.phtml @@ -62,4 +62,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-chart-descendants" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-chart-descendants" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/family-book-chart/page.phtml b/resources/views/modules/family-book-chart/page.phtml index 472e9c52c0..44c47cc7e9 100644 --- a/resources/views/modules/family-book-chart/page.phtml +++ b/resources/views/modules/family-book-chart/page.phtml @@ -73,4 +73,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-chart-family-book" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-chart-family-book" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/fanchart/page.phtml b/resources/views/modules/fanchart/page.phtml index 1d0148a0ab..1bf1e587dc 100644 --- a/resources/views/modules/fanchart/page.phtml +++ b/resources/views/modules/fanchart/page.phtml @@ -77,4 +77,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-chart-fan" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-chart-fan" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/hourglass-chart/page.phtml b/resources/views/modules/hourglass-chart/page.phtml index c54217ae07..1b4ca76680 100644 --- a/resources/views/modules/hourglass-chart/page.phtml +++ b/resources/views/modules/hourglass-chart/page.phtml @@ -61,4 +61,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-chart-hourglass" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-chart-hourglass" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/lifespans-chart/page.phtml b/resources/views/modules/lifespans-chart/page.phtml index c298f1aa75..1b770689fd 100644 --- a/resources/views/modules/lifespans-chart/page.phtml +++ b/resources/views/modules/lifespans-chart/page.phtml @@ -84,4 +84,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-timeline-chart" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-timeline-chart" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/pedigree-chart/page.phtml b/resources/views/modules/pedigree-chart/page.phtml index cf63ef800e..6d1823ddaa 100644 --- a/resources/views/modules/pedigree-chart/page.phtml +++ b/resources/views/modules/pedigree-chart/page.phtml @@ -63,4 +63,6 @@ use Fisharebest\Webtrees\Tree; <?= csrf_field() ?> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-chart-pedigree" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-chart-pedigree" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> diff --git a/resources/views/modules/pedigree-map/chart.phtml b/resources/views/modules/pedigree-map/chart.phtml index 9ca82ed780..a79623b2eb 100644 --- a/resources/views/modules/pedigree-map/chart.phtml +++ b/resources/views/modules/pedigree-map/chart.phtml @@ -12,7 +12,7 @@ use Fisharebest\Webtrees\View; ?> <div class="row my-4 gchart wt-pedigree-map-wrapper wt-fullscreen-container"> - <div id="wt-map" class="col-sm-9 wt-ajax-load wt-map" dir="ltr"></div> + <div id="wt-map" class="col-sm-9 wt-map" dir="ltr"></div> <ul class="col-sm-3 wt-map-sidebar wt-page-options-value list-unstyled px-1 mb-0"></ul> </div> diff --git a/resources/views/modules/pedigree-map/page.phtml b/resources/views/modules/pedigree-map/page.phtml index c5dea7cd73..fe4db97a8d 100644 --- a/resources/views/modules/pedigree-map/page.phtml +++ b/resources/views/modules/pedigree-map/page.phtml @@ -52,6 +52,6 @@ use Fisharebest\Webtrees\Tree; </form> -<div class="wt-ajax-load wt-page-content"> +<div class="wt-page-content"> <?= $map ?> </div> diff --git a/resources/views/modules/place-hierarchy/map.phtml b/resources/views/modules/place-hierarchy/map.phtml index c97538954a..41bd503162 100644 --- a/resources/views/modules/place-hierarchy/map.phtml +++ b/resources/views/modules/place-hierarchy/map.phtml @@ -12,7 +12,7 @@ use Fisharebest\Webtrees\View; ?> <div class="row gchart wt-place-hierarchy-wrapper wt-fullscreen-container"> - <div id="wt-map" class="col-sm-9 wt-ajax-load wt-map" dir="ltr"></div> + <div id="wt-map" class="col-sm-9 wt-map" dir="ltr"><?= view('icons/spinner') ?></div> <ul class="col-sm-3 wt-map-sidebar wt-page-options-value list-unstyled px-md-1 mb-0"></ul> </div> diff --git a/resources/views/modules/places/tab.phtml b/resources/views/modules/places/tab.phtml index b73666f6b4..eab2e7753c 100644 --- a/resources/views/modules/places/tab.phtml +++ b/resources/views/modules/places/tab.phtml @@ -13,7 +13,7 @@ use Fisharebest\Webtrees\I18N; <div class="row gx-1 wt-places-tab-wrapper wt-fullscreen-container"> <div class="col-sm-9"> - <div id="wt-map" class="wt-ajax-load wt-map" dir="ltr"></div> + <div id="wt-map" class="wt-map" dir="ltr"><?= view('icons/spinner') ?></div> </div> <div class="col-sm-3"> <ul class="wt-map-sidebar list-unstyled mb-0"></ul> diff --git a/resources/views/modules/relationships-chart/page.phtml b/resources/views/modules/relationships-chart/page.phtml index ccb87f664a..f9ba93ae82 100644 --- a/resources/views/modules/relationships-chart/page.phtml +++ b/resources/views/modules/relationships-chart/page.phtml @@ -90,7 +90,9 @@ use Fisharebest\Webtrees\View; </form> <?php if ($individual1 !== null && $individual2 !== null) : ?> - <div class="wt-ajax-load wt-page-content wt-chart wt-chart-relationships" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> + <div class="wt-page-content wt-chart wt-chart-relationships" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> + </div> <?php endif ?> <?php View::push('javascript') ?> diff --git a/resources/views/modules/statistics-chart/custom.phtml b/resources/views/modules/statistics-chart/custom.phtml index 381e3111e8..993604a9f8 100644 --- a/resources/views/modules/statistics-chart/custom.phtml +++ b/resources/views/modules/statistics-chart/custom.phtml @@ -212,9 +212,7 @@ use Fisharebest\Webtrees\View; <?= csrf_field() ?> </form> - <div id="custom-chart" class="wt-ajax-load"> - <!-- Not initially empty, to disable spinner --> - </div> + <div id="custom-chart"></div> </div> <?php View::push('javascript') ?> @@ -282,7 +280,7 @@ use Fisharebest\Webtrees\View; } function loadCustomChart() { - $("#custom-chart").html(""); + $("#custom-chart").html(<?= json_encode(view('icons/spinner')) ?>); var form = $("#own-stats-form"); jQuery.post(form.attr("action"), form.serialize()) .done(function (data) { diff --git a/resources/views/modules/statistics-chart/page.phtml b/resources/views/modules/statistics-chart/page.phtml index 864ae2bb4f..c62c398c17 100644 --- a/resources/views/modules/statistics-chart/page.phtml +++ b/resources/views/modules/statistics-chart/page.phtml @@ -28,7 +28,9 @@ use Fisharebest\Webtrees\View; <div class="tab-content"> <?php foreach ($tabs as $url) : ?> - <div class="tab-pane fade wt-ajax-load" role="tabpanel" id="tab-<?= e(md5($url)) ?>"></div> + <div class="tab-pane fade" role="tabpanel" id="tab-<?= e(md5($url)) ?>"> + <?= view('icons/spinner') ?> + </div> <?php endforeach ?> </div> </div> @@ -39,7 +41,10 @@ use Fisharebest\Webtrees\View; // Bootstrap tabs - load content dynamically using AJAX $('a[data-bs-toggle="tab"][data-wt-href]').on('show.bs.tab', function () { - $(this.getAttribute('href') + ':empty').load(this.dataset.wtHref); + if (this.dataset.wtHref !== '') { + $(this.getAttribute('href')).load(this.dataset.wtHref); + this.dataset.wtHref = ''; + } }); // If the URL contains a fragment, then activate the corresponding tab. diff --git a/resources/views/modules/timeline-chart/page.phtml b/resources/views/modules/timeline-chart/page.phtml index 6b10421bbf..5e644c2825 100644 --- a/resources/views/modules/timeline-chart/page.phtml +++ b/resources/views/modules/timeline-chart/page.phtml @@ -87,4 +87,6 @@ use Illuminate\Support\Collection; <?php endforeach ?> </div> -<div class="wt-ajax-load wt-page-content wt-chart wt-timeline-chart" data-wt-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-page-content wt-chart wt-timeline-chart" data-wt-ajax-url="<?= e($ajax_url) ?>"> + <?= view('icons/spinner') ?> +</div> |