diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/views/family-page.phtml | 2 | ||||
| -rw-r--r-- | resources/views/layouts/default.phtml | 12 | ||||
| -rw-r--r-- | resources/views/media-page-menu.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/ckeditor/ckeditor-js.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/gedcom_favorites/favorites.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/relatives/family.phtml | 6 | ||||
| -rw-r--r-- | resources/views/modules/user_favorites/favorites.phtml | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index 9f9dbe1dbc..669ddaa0b3 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -31,7 +31,7 @@ <div class="wt-page-content"> <table id="family-table" class="w-100" role="presentation"> <tr style="vertical-align:top;"> - <td style="width: <?= app()->make(ModuleThemeInterface::class)->parameter('chart-box-x') + 30 ?>px;"> + <td style="width: <?= app(ModuleThemeInterface::class)->parameter('chart-box-x') + 30 ?>px;"> <?php FunctionsCharts::printFamilyChildren($record) ?> </td> <td> diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml index e95b0d291c..c70096a3e6 100644 --- a/resources/views/layouts/default.phtml +++ b/resources/views/layouts/default.phtml @@ -49,18 +49,18 @@ <meta name="msapplication-config" content="<?= e(asset('browserconfig.xml')) ?>"> <link rel="stylesheet" href="<?= e(asset('css/vendor.min.css')) ?>"> - <?php foreach (app()->make(ModuleThemeInterface::class)->stylesheets() as $stylesheet) : ?> + <?php foreach (app(ModuleThemeInterface::class)->stylesheets() as $stylesheet) : ?> <link rel="stylesheet" href="<?= e($stylesheet) ?>"> <?php endforeach ?> <?= View::stack('styles') ?> - <?= app()->make(ModuleService::class)->findByInterface(ModuleAnalyticsInterface::class)->filter(function (ModuleAnalyticsInterface $module): bool { return $module->analyticsCanShow(); })->map(function (ModuleAnalyticsInterface $module): string { return $module->analyticsSnippet($module->analyticsParameters()); })->implode('') ?> + <?= app(ModuleService::class)->findByInterface(ModuleAnalyticsInterface::class)->filter(function (ModuleAnalyticsInterface $module): bool { return $module->analyticsCanShow(); })->map(function (ModuleAnalyticsInterface $module): string { return $module->analyticsSnippet($module->analyticsParameters()); })->implode('') ?> <?= DebugBar::renderHead() ?> </head> - <body class="wt-global wt-theme-<?= e(app()->make(ModuleThemeInterface::class)->name()) ?> wt-route-<?= e(e(app()->make(Request::class)->get('route'))) ?>"> + <body class="wt-global wt-theme-<?= e(app(ModuleThemeInterface::class)->name()) ?> wt-route-<?= e(e(app(Request::class)->get('route'))) ?>"> <header class="wt-header-wrapper d-print-none"> <div class="container wt-header-container"> <div class="row wt-header-content"> @@ -93,7 +93,7 @@ <div class="col wt-secondary-navigation"> <ul class="nav wt-user-menu"> - <?php foreach (app()->make(ModuleThemeInterface::class)->userMenu($tree) as $menu) : ?> + <?php foreach (app(ModuleThemeInterface::class)->userMenu($tree) as $menu) : ?> <?= $menu->bootstrap4() ?> <?php endforeach ?> </ul> @@ -102,7 +102,7 @@ <?php if ($tree !== null) : ?> <nav class="col wt-primary-navigation"> <ul class="nav wt-genealogy-menu"> - <?php foreach (app()->make(ModuleThemeInterface::class)->genealogyMenu($tree) as $menu) : ?> + <?php foreach (app(ModuleThemeInterface::class)->genealogyMenu($tree) as $menu) : ?> <?= $menu->bootstrap4() ?> <?php endforeach ?> </ul> @@ -130,7 +130,7 @@ </main> <footer class="wt-footers container d-print-none"> - <?= app()->make(ModuleService::class)->findByInterface(ModuleFooterInterface::class)->map(function (ModuleFooterInterface $module) use ($tree): string { return $module->getFooter($tree); })->implode('') ?> + <?= app(ModuleService::class)->findByInterface(ModuleFooterInterface::class)->map(function (ModuleFooterInterface $module) use ($tree): string { return $module->getFooter($tree); })->implode('') ?> </footer> <script src="<?= e(asset('js/vendor.min.js')) ?>"></script> diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml index db15244f43..205fc7f66b 100644 --- a/resources/views/media-page-menu.phtml +++ b/resources/views/media-page-menu.phtml @@ -10,7 +10,7 @@ </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <?php if (false && app()->make(ModuleService::class)->findByInterface(CensusAssistantModule::class)) : ?> + <?php if (false && app(ModuleService::class)->findByInterface(CensusAssistantModule::class)) : ?> <a class="dropdown-item menu-obje-link" href="#" onclick="return ilinkitem('<?= e($record->xref()) ?>','manage','<?= e($record->tree()->name()) ?>');"> <?= I18N::translate('Manage the links') ?> </a> diff --git a/resources/views/modules/ckeditor/ckeditor-js.phtml b/resources/views/modules/ckeditor/ckeditor-js.phtml index 96d6dd3a6b..7c41367e77 100644 --- a/resources/views/modules/ckeditor/ckeditor-js.phtml +++ b/resources/views/modules/ckeditor/ckeditor-js.phtml @@ -2,7 +2,7 @@ <?php use Fisharebest\Webtrees\Services\ModuleService; ?> <?php use Fisharebest\Webtrees\View; ?> -<?php if (app()->make(ModuleService::class)->findByInterface(CkeditorModule::class)): ?> +<?php if (app(ModuleService::class)->findByInterface(CkeditorModule::class)): ?> <?php View::push('javascript') ?> <script src="<?= e(CkeditorModule::CKEDITOR_PATH) ?>ckeditor.js"></script> <script src="<?= e(CkeditorModule::CKEDITOR_PATH) ?>adapters/jquery.js"></script> diff --git a/resources/views/modules/gedcom_favorites/favorites.phtml b/resources/views/modules/gedcom_favorites/favorites.phtml index e2456c1bdd..0684eff874 100644 --- a/resources/views/modules/gedcom_favorites/favorites.phtml +++ b/resources/views/modules/gedcom_favorites/favorites.phtml @@ -7,7 +7,7 @@ <?php if ($favorite->favorite_type === 'URL') : ?> <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a> <?php elseif ($favorite->record instanceof Individual) : ?> - <?= app()->make(ModuleThemeInterface::class)->individualBoxLarge($favorite->record) ?> + <?= app(ModuleThemeInterface::class)->individualBoxLarge($favorite->record) ?> <?php elseif ($favorite->record !== null) : ?> <?= $favorite->record->formatList() ?> <?php endif ?> diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml index 5a47c868ed..16b493d2b0 100644 --- a/resources/views/modules/relatives/family.phtml +++ b/resources/views/modules/relatives/family.phtml @@ -32,7 +32,7 @@ <?= Functions::getCloseRelationshipName($individual, $person) ?> </th> <td class="border-0 p-0"> - <?= app()->make(ModuleThemeInterface::class)->individualBoxLarge($person) ?> + <?= app(ModuleThemeInterface::class)->individualBoxLarge($person) ?> </td> </tr> <?php @@ -70,7 +70,7 @@ <?= Functions::getCloseRelationshipName($individual, $person) ?> </th> <td class="border-0 p-0"> - <?= app()->make(ModuleThemeInterface::class)->individualBoxLarge($person) ?> + <?= app(ModuleThemeInterface::class)->individualBoxLarge($person) ?> </td> </tr> <?php @@ -179,7 +179,7 @@ <?= Functions::getCloseRelationshipName($individual, $person) ?> </th> <td class="border-0 p-0"> - <?= app()->make(ModuleThemeInterface::class)->individualBoxLarge($person) ?> + <?= app(ModuleThemeInterface::class)->individualBoxLarge($person) ?> </td> </tr> <?php diff --git a/resources/views/modules/user_favorites/favorites.phtml b/resources/views/modules/user_favorites/favorites.phtml index 1429780524..8e2026ba4b 100644 --- a/resources/views/modules/user_favorites/favorites.phtml +++ b/resources/views/modules/user_favorites/favorites.phtml @@ -7,7 +7,7 @@ <?php if ($favorite->favorite_type === 'URL') : ?> <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a> <?php elseif ($favorite->record instanceof Individual) : ?> - <?= app()->make(ModuleThemeInterface::class)->individualBoxLarge($favorite->record) ?> + <?= app(ModuleThemeInterface::class)->individualBoxLarge($favorite->record) ?> <?php elseif ($favorite->record !== null) : ?> <?= $favorite->record->formatList() ?> <?php endif ?> |