diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2018-11-17 15:22:08 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2018-11-18 18:18:42 +0000 |
| commit | 8d0ebef0d075981bd943e8256e2c81a3b1e92b4b (patch) | |
| tree | 6ce584137d2125125417a6c749d5d5e9a11611f1 /resources/views/layouts | |
| parent | ada1c84947c5c97bcc08a94582e9443f18df3d13 (diff) | |
| download | webtrees-8d0ebef0d075981bd943e8256e2c81a3b1e92b4b.tar.gz webtrees-8d0ebef0d075981bd943e8256e2c81a3b1e92b4b.tar.bz2 webtrees-8d0ebef0d075981bd943e8256e2c81a3b1e92b4b.zip | |
Prefer class-constants to global-constants
Diffstat (limited to 'resources/views/layouts')
| -rw-r--r-- | resources/views/layouts/administration.phtml | 12 | ||||
| -rw-r--r-- | resources/views/layouts/default.phtml | 11 | ||||
| -rw-r--r-- | resources/views/layouts/offline.phtml | 4 |
3 files changed, 16 insertions, 11 deletions
diff --git a/resources/views/layouts/administration.phtml b/resources/views/layouts/administration.phtml index 16eac9c28a..e575d3be5e 100644 --- a/resources/views/layouts/administration.phtml +++ b/resources/views/layouts/administration.phtml @@ -2,6 +2,8 @@ <?php use Fisharebest\Webtrees\FlashMessages; ?> <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\View; ?> +<?php use Fisharebest\Webtrees\Webtrees; ?> + <!DOCTYPE html> <html <?= I18N::htmlAttributes() ?>> <head> @@ -14,11 +16,11 @@ <link rel="icon" href="favicon.ico" type="image/x-icon"> <?php if (I18N::direction() === 'rtl') : ?> - <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor-rtl.css') ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(Webtrees::ASSETS_PATH . 'css/vendor-rtl.css') ?>"> <?php else : ?> - <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor.css') ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(Webtrees::ASSETS_PATH . 'css/vendor.css') ?>"> <?php endif ?> - <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/administration.css') ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(Webtrees::ASSETS_PATH . 'css/administration.css') ?>"> <?= View::stack('styles') ?> @@ -65,8 +67,8 @@ <?= $content ?> - <script src="<?= e(WT_ASSETS_URL . 'js/vendor.js') ?>?<?= filemtime(WT_ROOT . WT_ASSETS_URL . 'js/vendor.js') ?>"></script> - <script src="<?= e(WT_ASSETS_URL . 'js/webtrees.js') ?>?<?= filemtime(WT_ROOT . WT_ASSETS_URL . 'js/webtrees.js') ?>"></script> + <script src="<?= e(Webtrees::ASSETS_PATH . 'js/vendor.js') ?>?<?= filemtime(WT_ROOT . Webtrees::ASSETS_PATH . 'js/vendor.js') ?>"></script> + <script src="<?= e(Webtrees::ASSETS_PATH . 'js/webtrees.js') ?>?<?= filemtime(WT_ROOT . Webtrees::ASSETS_PATH . 'js/webtrees.js') ?>"></script> <?= View::stack('javascript') ?> diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml index 16ad7830ff..cf7c8605a7 100644 --- a/resources/views/layouts/default.phtml +++ b/resources/views/layouts/default.phtml @@ -4,6 +4,7 @@ <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\Theme; ?> <?php use Fisharebest\Webtrees\View; ?> +<?php use Fisharebest\Webtrees\Webtrees; ?> <!DOCTYPE html> <html <?= I18N::htmlAttributes() ?>> @@ -12,7 +13,7 @@ <meta name="csrf" content="<?= e(csrf_token()) ?>"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="robots" content="<?= e($meta_robots ?? 'noindex,nofollow') ?>"> - <meta name="generator" content="<?= e(WT_WEBTREES) ?>"> + <meta name="generator" content="<?= e(Webtrees::NAME) ?> <?= e(Webtrees::VERSION) ?>"> <?php if ($tree !== null) : ?> <meta name="description" content="<?= e($tree->getPreference('META_DESCRIPTION')) ?>"> <?php endif ?> @@ -29,9 +30,9 @@ <link rel="apple-touch-icon" sizes="180x180" href="<?= Theme::theme()::ASSET_DIR ?>favicon180.png"> <?php if (I18N::direction() === 'rtl') : ?> - <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor-rtl.css') ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(Webtrees::ASSETS_PATH . 'css/vendor-rtl.css') ?>"> <?php else : ?> - <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor.css') ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(Webtrees::ASSETS_PATH . 'css/vendor.css') ?>"> <?php endif ?> <?php foreach (Theme::theme()->stylesheets() as $stylesheet) : ?> @@ -134,8 +135,8 @@ </div> </footer> - <script src="<?= e(WT_ASSETS_URL . 'js/vendor.js') ?>?<?= filemtime(WT_ROOT . WT_ASSETS_URL . 'js/vendor.js') ?>"></script> - <script src="<?= e(WT_ASSETS_URL . 'js/webtrees.js') ?>?<?= filemtime(WT_ROOT . WT_ASSETS_URL . 'js/webtrees.js') ?>"></script> + <script src="<?= e(Webtrees::ASSETS_PATH . 'js/vendor.js') ?>?<?= filemtime(WT_ROOT . Webtrees::ASSETS_PATH . 'js/vendor.js') ?>"></script> + <script src="<?= e(Webtrees::ASSETS_PATH . 'js/webtrees.js') ?>?<?= filemtime(WT_ROOT . Webtrees::ASSETS_PATH . 'js/webtrees.js') ?>"></script> <script> activate_colorbox(); diff --git a/resources/views/layouts/offline.phtml b/resources/views/layouts/offline.phtml index fa54aa3a96..8eda08ede3 100644 --- a/resources/views/layouts/offline.phtml +++ b/resources/views/layouts/offline.phtml @@ -1,11 +1,13 @@ <?php use Fisharebest\Webtrees\I18N; ?> +<?php use Fisharebest\Webtrees\Webtrees; ?> + <!DOCTYPE html> <html <?= I18N::htmlAttributes() ?>> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><?= WT_WEBTREES ?></title> + <title><?= e(Webtrees::NAME) ?></title> <link rel="icon" href="favicon.ico" type="image/x-icon"> <style type="text/css"> |