mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'cyberalien/ticket/10665' into develop

Browse Source 
* 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
This commit is contained in:
Igor Wiedler
2012-04-01 19:52:44 +02:00
parent 813e52a03a 37480e5594
commit 9a075e905d
15 changed files with 169 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/styles/prosilver/template/overall_footer.html
View File

@@ -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>

1
phpBB/styles/prosilver/template/simple_footer.html
View File

@@ -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>

1
phpBB/styles/subsilver2/template/overall_footer.html
View File

@@ -10,6 +10,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>

1
phpBB/styles/subsilver2/template/simple_footer.html
View File

@@ -7,6 +7,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>