diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-01 19:52:44 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-01 19:52:44 +0200 |
| commit | 9a075e905d23110f0b3310f9bfe6e89b44be1b57 (patch) | |
| tree | fb87c78dc1c8fcd26b93c285011311a6ab8ce20e /phpBB/styles/prosilver | |
| parent | 813e52a03ad654a357439d6d80f66a18b189eb62 (diff) | |
| parent | 37480e5594145bbead07c8f70644d52983f92913 (diff) | |
| download | forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar.gz forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar.bz2 forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.tar.xz forums-9a075e905d23110f0b3310f9bfe6e89b44be1b57.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10665' into develop
* cyberalien/ticket/10665:
[ticket/10665] Adding includejs to acp templates
[ticket/10665] Solution for T_SUPER_TEMPLATE_PATH
[ticket/10665] New test class for templates with tree
[ticket/10665] Changing template->_js_include to public
[ticket/10665] Moving filter parameters to one array
[ticket/10665] INCLUDEJS unit test
[ticket/10665] Changing template compiler test
[ticket/10665] INCLUDEJS template changes
[ticket/10665] INCLUDEJS template tag
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/simple_footer.html | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 1561bae26a..47071ba4df 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -52,7 +52,8 @@ <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" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script> -<script type="text/javascript" src="{T_TEMPLATE_PATH}/ajax.js"></script> +<!-- INCLUDEJS template/ajax.js --> +{SCRIPTS} </body> </html> diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index 3458d02495..549c31cfb6 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -8,6 +8,7 @@ <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" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +{SCRIPTS} </body> </html> |