diff options
| author | Greg Roach <fisharebest@gmail.com> | 2017-12-11 21:45:26 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2017-12-11 21:45:26 +0000 |
| commit | 9fe03b404f6022086b10aa7c014ef820d8d40d94 (patch) | |
| tree | 38612743d81c43922a07f2bd001f66505f264d1d | |
| parent | 92d61e734263a200d336e16c73776845349801f0 (diff) | |
| download | webtrees-9fe03b404f6022086b10aa7c014ef820d8d40d94.tar.gz webtrees-9fe03b404f6022086b10aa7c014ef820d8d40d94.tar.bz2 webtrees-9fe03b404f6022086b10aa7c014ef820d8d40d94.zip | |
Fix: #1513 - gallery not activating on home page
| -rw-r--r-- | app/Http/Controllers/BaseController.php | 13 | ||||
| -rw-r--r-- | resources/views/blocks/slide-show.php | 2 | ||||
| -rw-r--r-- | resources/views/layouts/default.php | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 7aea6f3fd9..4592ca67f0 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -43,12 +43,13 @@ class BaseController extends LegacyBaseController { $theme = Theme::theme(); $html = View::make($this->layout, [ - 'content' => View::make($name, $data), - 'tree' => $this->tree(), - 'theme_head' => $theme->head($this), - 'theme_body_header' => $theme->bodyHeader(), - 'theme_footer_container' => $theme->footerContainer(), - 'javascript' => $this->getJavascript() . $theme->hookFooterExtraJavascript(), + 'content' => View::make($name, $data), + 'tree' => $this->tree(), + 'theme_head' => $theme->head($this), + 'theme_body_header' => $theme->bodyHeader(), + 'theme_footer_container' => $theme->footerContainer(), + 'theme_footer_javascript' => $theme->hookFooterExtraJavascript(), + 'javascript' => $this->getJavascript() . $theme->hookFooterExtraJavascript(), ]); return new Response($html); diff --git a/resources/views/blocks/slide-show.php b/resources/views/blocks/slide-show.php index 32228d664c..20c39767cf 100644 --- a/resources/views/blocks/slide-show.php +++ b/resources/views/blocks/slide-show.php @@ -74,7 +74,7 @@ $(".wt-icon-media-stop").on('click', function () { $(".wt-icon-media-stop").parent().attr('hidden', true); - $(".wt-icon-media-play").attr('hidden', false); + $(".wt-icon-media-play").parent().attr('hidden', false); play = false; return false; }); diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php index 4adf902493..0d70fd75a3 100644 --- a/resources/views/layouts/default.php +++ b/resources/views/layouts/default.php @@ -25,6 +25,7 @@ <script src="<?= e(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> <script src="<?= e(WT_SELECT2_JS_URL) ?>"></script> <script src="<?= e(WT_WEBTREES_JS_URL) ?>"></script> + <?= $theme_footer_javascript ?> <?= DebugBar::renderHead() ?> <?= DebugBar::render() ?> |