summaryrefslogtreecommitdiff
path: root/app/Module
diff options
context:
space:
mode:
Diffstat (limited to 'app/Module')
-rwxr-xr-xapp/Module/ChartsBlockModule.php34
-rw-r--r--app/Module/FamilyTreeFavoritesModule.php16
-rw-r--r--app/Module/FamilyTreeNewsModule.php9
-rw-r--r--app/Module/FamilyTreeStatisticsModule.php24
-rw-r--r--app/Module/HtmlBlockModule.php51
-rw-r--r--app/Module/LoggedInUsersModule.php9
-rw-r--r--app/Module/LoginBlockModule.php9
-rw-r--r--app/Module/OnThisDayModule.php25
-rw-r--r--app/Module/RecentChangesModule.php9
-rw-r--r--app/Module/ResearchTaskModule.php9
-rw-r--r--app/Module/ReviewChangesModule.php8
-rw-r--r--app/Module/SlideShowModule.php9
-rw-r--r--app/Module/ThemeSelectModule.php9
-rw-r--r--app/Module/TopGivenNamesModule.php9
-rw-r--r--app/Module/TopPageViewsModule.php9
-rw-r--r--app/Module/TopSurnamesModule.php9
-rw-r--r--app/Module/UpcomingAnniversariesModule.php9
-rw-r--r--app/Module/UserJournalModule.php9
-rwxr-xr-xapp/Module/UserMessagesModule.php9
-rw-r--r--app/Module/YahrzeitModule.php9
20 files changed, 204 insertions, 80 deletions
diff --git a/app/Module/ChartsBlockModule.php b/app/Module/ChartsBlockModule.php
index a375f2a0a3..864bb067c3 100755
--- a/app/Module/ChartsBlockModule.php
+++ b/app/Module/ChartsBlockModule.php
@@ -19,13 +19,13 @@ use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\Bootstrap4;
use Fisharebest\Webtrees\Controller\HourglassController;
use Fisharebest\Webtrees\Filter;
-use Fisharebest\Webtrees\FontAwesome;
use Fisharebest\Webtrees\Functions\FunctionsEdit;
use Fisharebest\Webtrees\Functions\FunctionsPrint;
+use Fisharebest\Webtrees\Html;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Module\InteractiveTree\TreeView;
-use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class ChartsBlockModule
@@ -72,19 +72,13 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
$person = Individual::getInstance($pid, $WT_TREE);
}
- $id = $this->getName() . $block_id;
- $class = $this->getName() . '_block';
- if ($ctype == 'gedcom' && Auth::isManager($WT_TREE) || $ctype == 'user' && Auth::check()) {
- $title = FontAwesome::linkIcon('preferences', I18N::translate('Preferences'), ['class' => 'btn btn-link', 'href' => 'block_edit.php?block_id=' . $block_id . '&ged=' . $WT_TREE->getNameHtml() . '&ctype=' . $ctype]) . ' ';
- } else {
- $title = '';
- }
+ $title = $this->getTitle();
if ($person) {
$content = '';
switch ($type) {
case 'pedigree':
- $title .= I18N::translate('Pedigree of %s', $person->getFullName());
+ $title = I18N::translate('Pedigree of %s', $person->getFullName());
$chartController = new HourglassController($person->getXref());
$controller->addInlineJavascript($chartController->setupJavascript());
$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
@@ -101,7 +95,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
$content .= '</tr></table>';
break;
case 'descendants':
- $title .= I18N::translate('Descendants of %s', $person->getFullName());
+ $title = I18N::translate('Descendants of %s', $person->getFullName());
$chartController = new HourglassController($person->getXref());
$controller->addInlineJavascript($chartController->setupJavascript());
ob_start();
@@ -109,7 +103,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
$content .= ob_get_clean();
break;
case 'hourglass':
- $title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
+ $title = I18N::translate('Hourglass chart of %s', $person->getFullName());
$chartController = new HourglassController($person->getXref());
$controller->addInlineJavascript($chartController->setupJavascript());
$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
@@ -126,7 +120,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
$content .= '</tr></table>';
break;
case 'treenav':
- $title .= I18N::translate('Interactive tree of %s', $person->getFullName());
+ $title = I18N::translate('Interactive tree of %s', $person->getFullName());
$mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
$tv = new TreeView;
$content .= '<script>$("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
@@ -140,7 +134,19 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ if ($ctype == 'gedcom' && Auth::isManager($WT_TREE) || $ctype == 'user' && Auth::check()) {
+ $config_url = Html::url('block_edit.php', ['block_id' => $block_id, 'ged' => $WT_TREE->getName()]);
+ } else {
+ $config_url = '';
+ }
+
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => $config_url,
+ 'title' => $title,
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/FamilyTreeFavoritesModule.php b/app/Module/FamilyTreeFavoritesModule.php
index 344e379d0f..4a93804fb8 100644
--- a/app/Module/FamilyTreeFavoritesModule.php
+++ b/app/Module/FamilyTreeFavoritesModule.php
@@ -23,6 +23,7 @@ use Fisharebest\Webtrees\GedcomTag;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
use PDO;
use Ramsey\Uuid\Uuid;
@@ -79,7 +80,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
* @return string
*/
public function getBlock($block_id, $template = true, $cfg = []) {
- global $ctype, $controller, $WT_TREE;
+ global $ctype, $WT_TREE;
$action = Filter::get('action');
switch ($action) {
@@ -127,10 +128,6 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
$userfavs = [];
}
- $id = $this->getName() . $block_id;
- $class = $this->getName() . '_block';
- $title = $this->getTitle();
-
$content = '';
if ($userfavs) {
foreach ($userfavs as $key => $favorite) {
@@ -208,7 +205,14 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ //return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php
index fb3eb5f9b4..8161f4206a 100644
--- a/app/Module/FamilyTreeNewsModule.php
+++ b/app/Module/FamilyTreeNewsModule.php
@@ -22,6 +22,7 @@ use Fisharebest\Webtrees\Functions\FunctionsDate;
use Fisharebest\Webtrees\Html;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class FamilyTreeNewsModule
@@ -129,7 +130,13 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php
index d3651eb32f..0f5752bfd1 100644
--- a/app/Module/FamilyTreeStatisticsModule.php
+++ b/app/Module/FamilyTreeStatisticsModule.php
@@ -27,6 +27,7 @@ use Fisharebest\Webtrees\Module;
use Fisharebest\Webtrees\Query\QueryName;
use Fisharebest\Webtrees\Stats;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class FamilyTreeStatisticsModule
@@ -83,15 +84,6 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn
}
}
- $id = $this->getName() . $block_id;
- $class = $this->getName() . '_block';
- if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
- $title = FontAwesome::linkIcon('preferences', I18N::translate('Preferences'), ['class' => 'btn btn-link', 'href' => 'block_edit.php?block_id=' . $block_id . '&ged=' . $WT_TREE->getNameHtml() . '&ctype=' . $ctype]) . ' ';
- } else {
- $title = '';
- }
- $title .= $this->getTitle() . ' — ' . $WT_TREE->getTitleHtml();
-
$stats = new Stats($WT_TREE);
$content = '';
@@ -201,7 +193,19 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+ $config_url = Html::url('block_edit.php', ['block_id' => $block_id, 'ged' => $WT_TREE->getName()]);
+ } else {
+ $config_url = '';
+ }
+
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => $config_url,
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php
index 7cf4e13282..acda4bbcb1 100644
--- a/app/Module/HtmlBlockModule.php
+++ b/app/Module/HtmlBlockModule.php
@@ -18,15 +18,14 @@ namespace Fisharebest\Webtrees\Module;
use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\Bootstrap4;
use Fisharebest\Webtrees\Filter;
-use Fisharebest\Webtrees\FontAwesome;
use Fisharebest\Webtrees\Functions\FunctionsDate;
use Fisharebest\Webtrees\Functions\FunctionsEdit;
use Fisharebest\Webtrees\Html;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Site;
use Fisharebest\Webtrees\Stats;
-use Fisharebest\Webtrees\Theme;
use Fisharebest\Webtrees\Tree;
+use Fisharebest\Webtrees\View;
/**
* Class HtmlBlockModule
@@ -34,12 +33,14 @@ use Fisharebest\Webtrees\Tree;
class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface {
/** {@inheritdoc} */
public function getTitle() {
- return /* I18N: Name of a module */ I18N::translate('HTML');
+ return /* I18N: Name of a module */
+ I18N::translate('HTML');
}
/** {@inheritdoc} */
public function getDescription() {
- return /* I18N: Description of the “HTML” module */ I18N::translate('Add your own text and graphics.');
+ return /* I18N: Description of the “HTML” module */
+ I18N::translate('Add your own text and graphics.');
}
/**
@@ -55,7 +56,7 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface {
global $ctype, $WT_TREE;
$title = $this->getBlockSetting($block_id, 'title');
- $html = $this->getBlockSetting($block_id, 'html');
+ $content = $this->getBlockSetting($block_id, 'html');
$gedcom = $this->getBlockSetting($block_id, 'gedcom');
$show_timestamp = $this->getBlockSetting($block_id, 'show_timestamp', '0');
$languages = $this->getBlockSetting($block_id, 'languages');
@@ -93,28 +94,27 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface {
/*
* Retrieve text, process embedded variables
*/
- if (strpos($title, '#') !== false || strpos($html, '#') !== false) {
- $title = $stats->embedTags($title);
- $html = $stats->embedTags($html);
- }
-
- /*
- * Start Of Output
- */
- $id = $this->getName() . $block_id;
- $class = $this->getName() . '_block';
- if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
- $title = FontAwesome::linkIcon('preferences', I18N::translate('Preferences'), ['class' => 'btn btn-link', 'href' => 'block_edit.php?block_id=' . $block_id . '&ged=' . $WT_TREE->getNameHtml() . '&ctype=' . $ctype]) . ' ' . $title;
- }
-
- $content = $html;
+ $title = $stats->embedTags($title);
+ $content = $stats->embedTags($content);
if ($show_timestamp) {
$content .= '<br>' . FunctionsDate::formatTimestamp($this->getBlockSetting($block_id, 'timestamp', WT_TIMESTAMP) + WT_TIMESTAMP_OFFSET);
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+ $config_url = Html::url('block_edit.php', ['block_id' => $block_id, 'ged' => $WT_TREE->getName()]);
+ } else {
+ $config_url = '';
+ }
+
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => $config_url,
+ 'title' => $title,
+ 'content' => $content,
+ ]);
} else {
return $content;
}
@@ -155,13 +155,14 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface {
$templates = [
I18N::translate('Keyword examples') =>
- '#getAllTagsTable#',
+ '#getAllTagsTable#',
I18N::translate('Narrative description') =>
- /* I18N: do not translate the #keywords# */ I18N::translate('This family tree was last updated on #gedcomUpdated#. There are #totalSurnames# surnames in this family tree. The earliest recorded event is the #firstEventType# of #firstEventName# in #firstEventYear#. The most recent event is the #lastEventType# of #lastEventName# in #lastEventYear#.<br><br>If you have any comments or feedback please contact #contactWebmaster#.'),
+ /* I18N: do not translate the #keywords# */
+ I18N::translate('This family tree was last updated on #gedcomUpdated#. There are #totalSurnames# surnames in this family tree. The earliest recorded event is the #firstEventType# of #firstEventName# in #firstEventYear#. The most recent event is the #lastEventType# of #lastEventName# in #lastEventYear#.<br><br>If you have any comments or feedback please contact #contactWebmaster#.'),
I18N::translate('Statistics') =>
- '<div class="gedcom_stats">
+ '<div class="gedcom_stats">
<span style="font-weight: bold;"><a href="index.php?command=gedcom">#gedcomTitle#</a></span><br>
' . I18N::translate('This family tree was last updated on %s.', '#gedcomUpdated#') . '
<table id="keywords">
@@ -320,7 +321,7 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface {
<?= I18N::translate('Show the date and time of update') ?>
</legend>
<div class="col-sm-9">
- <?= Bootstrap4::radioButtons('timestamp', FunctionsEdit::optionsNoYes(), $show_timestamp, true) ?>
+ <?= Bootstrap4::radioButtons('show_timestamp', FunctionsEdit::optionsNoYes(), $show_timestamp, true) ?>
</div>
</div>
</fieldset>
diff --git a/app/Module/LoggedInUsersModule.php b/app/Module/LoggedInUsersModule.php
index 74c49c0689..3b67fb111f 100644
--- a/app/Module/LoggedInUsersModule.php
+++ b/app/Module/LoggedInUsersModule.php
@@ -23,6 +23,7 @@ use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
use Fisharebest\Webtrees\User;
+use Fisharebest\Webtrees\View;
/**
* Class LoggedInUsersModule
@@ -100,7 +101,13 @@ class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/LoginBlockModule.php b/app/Module/LoginBlockModule.php
index 009e1452e6..7a03252bb0 100644
--- a/app/Module/LoginBlockModule.php
+++ b/app/Module/LoginBlockModule.php
@@ -19,6 +19,7 @@ use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Site;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class LoginBlockModule
@@ -109,7 +110,13 @@ class LoginBlockModule extends AbstractModule implements ModuleBlockInterface {
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/OnThisDayModule.php b/app/Module/OnThisDayModule.php
index fe829bf094..5ead4dfe1f 100644
--- a/app/Module/OnThisDayModule.php
+++ b/app/Module/OnThisDayModule.php
@@ -21,8 +21,10 @@ use Fisharebest\Webtrees\Filter;
use Fisharebest\Webtrees\FontAwesome;
use Fisharebest\Webtrees\Functions\FunctionsEdit;
use Fisharebest\Webtrees\Functions\FunctionsPrintLists;
+use Fisharebest\Webtrees\Html;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class OnThisDayModule
@@ -62,15 +64,6 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface {
$todayjd = WT_CLIENT_JD;
- $id = $this->getName() . $block_id;
- $class = $this->getName() . '_block';
- if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
- $title = FontAwesome::linkIcon('preferences', I18N::translate('Preferences'), ['class' => 'btn btn-link', 'href' => 'block_edit.php?block_id=' . $block_id . '&ged=' . $WT_TREE->getNameHtml() . '&ctype=' . $ctype]) . ' ';
- } else {
- $title = '';
- }
- $title .= $this->getTitle();
-
$content = '';
// If we are only showing living individuals, then we don't need to search for DEAT events.
@@ -90,7 +83,19 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface {
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+ $config_url = Html::url('block_edit.php', ['block_id' => $block_id, 'ged' => $WT_TREE->getName()]);
+ } else {
+ $config_url = '';
+ }
+
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => $config_url,
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/RecentChangesModule.php b/app/Module/RecentChangesModule.php
index bf11da0a01..3d87dca5db 100644
--- a/app/Module/RecentChangesModule.php
+++ b/app/Module/RecentChangesModule.php
@@ -28,6 +28,7 @@ use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
use Fisharebest\Webtrees\Tree;
+use Fisharebest\Webtrees\View;
use Ramsey\Uuid\Uuid;
/**
@@ -96,7 +97,13 @@ class RecentChangesModule extends AbstractModule implements ModuleBlockInterface
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php
index 3c2634ee8f..f0a6c55050 100644
--- a/app/Module/ResearchTaskModule.php
+++ b/app/Module/ResearchTaskModule.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\GedcomRecord;
use Fisharebest\Webtrees\Html;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class ResearchTaskModule
@@ -119,7 +120,13 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php
index 90cab75f19..945dd86ab0 100644
--- a/app/Module/ReviewChangesModule.php
+++ b/app/Module/ReviewChangesModule.php
@@ -143,7 +143,13 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface
$content .= '</ul>';
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php
index de4c77bcb9..afb877829c 100644
--- a/app/Module/SlideShowModule.php
+++ b/app/Module/SlideShowModule.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\GedcomTag;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Media;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class SlideShowModule
@@ -182,7 +183,13 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface {
$content = I18N::translate('This family tree has no images to display.');
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/ThemeSelectModule.php b/app/Module/ThemeSelectModule.php
index 51a46f7f43..b3a0c9499d 100644
--- a/app/Module/ThemeSelectModule.php
+++ b/app/Module/ThemeSelectModule.php
@@ -17,6 +17,7 @@ namespace Fisharebest\Webtrees\Module;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class ThemeSelectModule
@@ -51,7 +52,13 @@ class ThemeSelectModule extends AbstractModule implements ModuleBlockInterface {
$content = '<ul class="nav text-justify">' . $menu->bootstrap4() . '</ul>';
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php
index 59000f250f..ddfaf88d4a 100644
--- a/app/Module/TopGivenNamesModule.php
+++ b/app/Module/TopGivenNamesModule.php
@@ -22,6 +22,7 @@ use Fisharebest\Webtrees\FontAwesome;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Stats;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class TopGivenNamesModule
@@ -108,7 +109,13 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
$content .= '</div>';
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php
index 7937fadfe5..ab23c68ed7 100644
--- a/app/Module/TopPageViewsModule.php
+++ b/app/Module/TopPageViewsModule.php
@@ -23,6 +23,7 @@ use Fisharebest\Webtrees\FontAwesome;
use Fisharebest\Webtrees\GedcomRecord;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class TopPageViewsModule
@@ -106,7 +107,13 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
$content .= '</table>';
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php
index 0e5273cbbf..b59f6de737 100644
--- a/app/Module/TopSurnamesModule.php
+++ b/app/Module/TopSurnamesModule.php
@@ -24,6 +24,7 @@ use Fisharebest\Webtrees\Functions\FunctionsPrintLists;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Query\QueryName;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class TopSurnamesModule
@@ -119,7 +120,13 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface {
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/UpcomingAnniversariesModule.php b/app/Module/UpcomingAnniversariesModule.php
index fa79666177..cdc1eb394b 100644
--- a/app/Module/UpcomingAnniversariesModule.php
+++ b/app/Module/UpcomingAnniversariesModule.php
@@ -23,6 +23,7 @@ use Fisharebest\Webtrees\Functions\FunctionsEdit;
use Fisharebest\Webtrees\Functions\FunctionsPrintLists;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class UpcomingAnniversariesModule
@@ -97,7 +98,13 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/UserJournalModule.php b/app/Module/UserJournalModule.php
index 8646ff007a..1a344fe4a6 100644
--- a/app/Module/UserJournalModule.php
+++ b/app/Module/UserJournalModule.php
@@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Functions\FunctionsDate;
use Fisharebest\Webtrees\Html;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
/**
* Class UserJournalModule
@@ -101,7 +102,13 @@ class UserJournalModule extends AbstractModule implements ModuleBlockInterface {
$content .= '<p><a href="editnews.php?ctype=user&amp;ged=' . $WT_TREE->getNameUrl() . '">' . I18N::translate('Add a journal entry') . '</a></p>';
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php
index 1ce3508088..aad6313136 100755
--- a/app/Module/UserMessagesModule.php
+++ b/app/Module/UserMessagesModule.php
@@ -23,6 +23,7 @@ use Fisharebest\Webtrees\Html;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
use Fisharebest\Webtrees\User;
+use Fisharebest\Webtrees\View;
/**
* Class UserMessagesModule
@@ -138,7 +139,13 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface
$content .= '</form>';
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
diff --git a/app/Module/YahrzeitModule.php b/app/Module/YahrzeitModule.php
index d0285f2ce9..f63a2677f5 100644
--- a/app/Module/YahrzeitModule.php
+++ b/app/Module/YahrzeitModule.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Functions\FunctionsDb;
use Fisharebest\Webtrees\GedcomTag;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\View;
use Ramsey\Uuid\Uuid;
/**
@@ -217,7 +218,13 @@ class YahrzeitModule extends AbstractModule implements ModuleBlockInterface {
}
if ($template) {
- return Theme::theme()->formatBlock($id, $title, $class, $content);
+ return View::make('blocks/template', [
+ 'block' => str_replace('_', '-', $this->getName()),
+ 'id' => $block_id,
+ 'config_url' => '',
+ 'title' => $this->getTitle(),
+ 'content' => $content,
+ ]);
} else {
return $content;
}
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 22:20:09 +0000