diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-05 14:17:46 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-05 14:17:46 -0500 |
| commit | 921d44aa4dfa307eb3b7e4f24befabb07e727812 (patch) | |
| tree | 5d6cbe03b898a4ec7cc6f1b3e3747b4cbf0aa070 /phpBB/styles | |
| parent | 8d11a147f5ab05443b243559f248e7e52e2e9faf (diff) | |
| download | forums-921d44aa4dfa307eb3b7e4f24befabb07e727812.tar forums-921d44aa4dfa307eb3b7e4f24befabb07e727812.tar.gz forums-921d44aa4dfa307eb3b7e4f24befabb07e727812.tar.bz2 forums-921d44aa4dfa307eb3b7e4f24befabb07e727812.tar.xz forums-921d44aa4dfa307eb3b7e4f24befabb07e727812.zip | |
[feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for core
Moved below overall_footer_after so events can add JS files in that event.
PHPBB3-11598
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_footer.html | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 5c88209ad8..eef9f53409 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -56,8 +56,10 @@ <!-- INCLUDEJS forum_fn.js --> <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js --> <!-- INCLUDEJS ajax.js --> -{$SCRIPTS} <!-- EVENT overall_footer_after --> + +{$SCRIPTS} + </body> </html> diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 2d794d9f71..d2b30c22a0 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -13,9 +13,11 @@ <script type="text/javascript" src="{T_JQUERY_LINK}"></script> <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> -{$SCRIPTS} +<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js --> <!-- EVENT overall_footer_after --> + +{$SCRIPTS} + </body> </html> |