diff options
Diffstat (limited to 'resources/views/layouts')
| -rw-r--r-- | resources/views/layouts/administration.php | 6 | ||||
| -rw-r--r-- | resources/views/layouts/default.php | 36 |
2 files changed, 37 insertions, 5 deletions
diff --git a/resources/views/layouts/administration.php b/resources/views/layouts/administration.php index 77242ae5c1..9f54abbfd3 100644 --- a/resources/views/layouts/administration.php +++ b/resources/views/layouts/administration.php @@ -11,9 +11,7 @@ <title><?= $title ?></title> - <link rel="icon" type="image/png" href="<?= Html::escape($common_url) ?>favicon.png"> - <link rel="icon" type="image/png" href="<?= Html::escape($common_url) ?>favicon192.png" sizes="192x192"> - <link rel="apple-touch-icon" sizes="180x180" href="<?= Html::escape($common_url) ?>favicon180.png"> + <link rel="icon" href="favicon.ico" type="image/x-icon"> <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_BOOTSTRAP_CSS_URL) ?>"> <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_FONT_AWESOME_CSS_URL) ?>"> @@ -80,7 +78,5 @@ <script src="<?= Html::escape(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL) ?>"></script> <script src="<?= Html::escape(WT_WEBTREES_JS_URL) ?>"></script> <script src="<?= Html::escape(WT_ADMIN_JS_URL) ?>"></script> - - <?= $javascript ?> </body> </html> diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php new file mode 100644 index 0000000000..c61c379499 --- /dev/null +++ b/resources/views/layouts/default.php @@ -0,0 +1,36 @@ +<?php use Fisharebest\Webtrees\Database; ?> +<?php use Fisharebest\Webtrees\Filter; ?> +<?php use Fisharebest\Webtrees\FlashMessages; ?> +<?php use Fisharebest\Webtrees\Html; ?> +<?php use Fisharebest\Webtrees\I18N; ?> +<!DOCTYPE html> +<html <?= I18N::htmlAttributes() ?>> + <?= $theme_head ?> + <?= $theme_body_header ?> + + <?= $content ?> + + <?= $theme_footer_container ?> + + <script> + // Global constants + var WT_MODULES_DIR = <?= json_encode(WT_MODULES_DIR) ?>; + var WT_GEDCOM = <?= json_encode($tree ? $tree->getName() : '') ?>; + var textDirection = <?= json_encode(I18N::direction()) ?>; + var WT_LOCALE = <?= json_encode(WT_LOCALE) ?>; + </script> + + <script src="<?= Html::escape(WT_JQUERY_JS_URL) ?>"></script> + <script src="<?= Html::escape(WT_POPPER_JS_URL) ?>"></script> + <script src="<?= Html::escape(WT_BOOTSTRAP_JS_URL) ?>"></script> + <script src="<?= Html::escape(WT_DATATABLES_JS_URL) ?>"></script> + <script src="<?= Html::escape(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> + <script src="<?= Html::escape(WT_SELECT2_JS_URL) ?>"></script> + <script src="<?= Html::escape(WT_WEBTREES_JS_URL) ?>"></script> + + </body> +</html> +<!-- webtrees: <?= WT_VERSION ?> -->' . +<!-- Execution time: <?= I18N::number(microtime(true) - WT_START_TIME, 3) ?> seconds --> +<!-- Memory: <?= I18N::number(memory_get_peak_usage(true) / 1024) ?> KB --> +<!-- SQL queries: <?= I18N::number(Database::getQueryCount()) ?> --> |