diff options
| author | Greg Roach <fisharebest@gmail.com> | 2017-12-30 14:22:13 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2018-01-02 20:18:10 +0000 |
| commit | 27c4cda0cb98970e86f55c22a8248833b6cf40d9 (patch) | |
| tree | 7f7f01577ead547aaefa1db79c77830836f6b5f6 /resources/views/layouts | |
| parent | 87f36d93a85c7feb25fe17c05ec58b902d02c08f (diff) | |
| download | webtrees-27c4cda0cb98970e86f55c22a8248833b6cf40d9.tar.gz webtrees-27c4cda0cb98970e86f55c22a8248833b6cf40d9.tar.bz2 webtrees-27c4cda0cb98970e86f55c22a8248833b6cf40d9.zip | |
Use npm/webpack/babel/laravel-mix to manage and bundle assets
Diffstat (limited to 'resources/views/layouts')
| -rw-r--r-- | resources/views/layouts/administration.php | 29 | ||||
| -rw-r--r-- | resources/views/layouts/default.php | 11 |
2 files changed, 10 insertions, 30 deletions
diff --git a/resources/views/layouts/administration.php b/resources/views/layouts/administration.php index 79f13370d7..bfc3c62aa4 100644 --- a/resources/views/layouts/administration.php +++ b/resources/views/layouts/administration.php @@ -12,20 +12,13 @@ <link rel="icon" href="favicon.ico" type="image/x-icon"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_BOOTSTRAP_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_TYPEAHEAD_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_FONT_AWESOME_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_FONT_AWESOME_RTL_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_DATATABLES_BOOTSTRAP_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_SELECT2_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_DATATABLES_BOOTSTRAP_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e(WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= e($common_url) ?>style.css"> - <link rel="stylesheet" type="text/css" href="<?= e($theme_url) ?>style.css"> - <?php if (I18N::direction() === 'rtl'): ?> - <link rel="stylesheet" type="text/css" href="<?= WT_BOOTSTRAP_RTL_CSS_URL ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor-rtl.css') ?>"> + <?php else: ?> + <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor.css') ?>"> <?php endif ?> + <link rel="stylesheet" type="text/css" href="<?= e($common_url) ?>style.css"> + <link rel="stylesheet" type="text/css" href="<?= e($theme_url) ?>style.css"> <?= DebugBar::renderHead() ?> </head> @@ -70,16 +63,8 @@ <?= $content ?> - <script src="<?= e(WT_JQUERY_JS_URL) ?>"></script> - <script src="<?= e(WT_POPPER_JS_URL) ?>"></script> - <script src="<?= e(WT_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= e(WT_DATATABLES_JS_URL) ?>"></script> - <script src="<?= e(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= e(WT_SELECT2_JS_URL) ?>"></script> - <script src="<?= e(WT_TYPEAHEAD_JS_URL) ?>"></script> - <script src="<?= e(WT_MOMENT_JS_URL) ?>"></script> - <script src="<?= e(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL) ?>"></script> - <script src="<?= e(WT_WEBTREES_JS_URL) ?>"></script> + <script src="<?= e(WT_ASSETS_URL . 'js/vendor.js') ?>"></script> + <script src="<?= e(WT_ASSETS_URL . 'js/webtrees.js') ?>"></script> <?= DebugBar::render() ?> </body> diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php index 04a5e8bfe7..ed30fde74f 100644 --- a/resources/views/layouts/default.php +++ b/resources/views/layouts/default.php @@ -18,14 +18,9 @@ var WT_LOCALE = <?= json_encode(WT_LOCALE) ?>; </script> - <script src="<?= e(WT_JQUERY_JS_URL) ?>"></script> - <script src="<?= e(WT_POPPER_JS_URL) ?>"></script> - <script src="<?= e(WT_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= e(WT_DATATABLES_JS_URL) ?>"></script> - <script src="<?= e(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= e(WT_SELECT2_JS_URL) ?>"></script> - <script src="<?= e(WT_SELECT2_JS_URL) ?>"></script> - <script src="<?= e(WT_TYPEAHEAD_JS_URL) ?>"></script> + <script src="<?= e(WT_ASSETS_URL . 'js/vendor.js') ?>"></script> + <script src="<?= e(WT_ASSETS_URL . 'js/webtrees.js') ?>"></script> + <?= $theme_footer_javascript ?> <?= DebugBar::renderHead() ?> |