mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'igorw/ticket/10155' into develop

Browse Source 
* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
This commit is contained in:
Oleg Pudeyev
2011-09-05 06:03:19 -04:00
parent 367fe0b4cf b98fca54b0
commit 145bc23044
14 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/adm/index.php
View File

@@ -53,6 +53,7 @@ $mode = request_var('mode', '');
// Set custom template for admin area
$template->set_custom_template($phpbb_admin_path . 'style', 'admin');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
// the acp template is never stored in the database

2
phpBB/adm/style/install_footer.html
View File

@@ -12,5 +12,7 @@
</div>
</div>
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
</body>
</html>

2
phpBB/adm/style/overall_footer.html
View File

@@ -20,5 +20,7 @@
</div>
</div>
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
</body>
</html>

2
phpBB/adm/style/simple_footer.html
View File

@@ -16,5 +16,7 @@
</div>
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
</body>
</html>