diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 06:03:19 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 06:03:19 -0400 |
| commit | 145bc230440f3a1a8d3252cfbfb767678d085320 (patch) | |
| tree | 451833c03814530e0a4b1aaad069fb5ba4ae4fcb /phpBB/adm | |
| parent | 367fe0b4cff31fc11185b84bc7e9e7936fe470e9 (diff) | |
| parent | b98fca54b0fd0e9aaca2f0f12ae9bcae14d014ec (diff) | |
| download | forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.gz forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.bz2 forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.xz forums-145bc230440f3a1a8d3252cfbfb767678d085320.zip | |
Merge remote-tracking branch 'igorw/ticket/10155' into develop
* 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
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/install_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_footer.html | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 726cb1644c..2444a1b597 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -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 diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index fabbee1911..1b3134b5e1 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -12,5 +12,7 @@ </div> </div> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script> + </body> </html> diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 689452c268..dc03d2cfb5 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -20,5 +20,7 @@ </div> </div> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script> + </body> </html> diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index ac9c26a690..272fd5e3fb 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -16,5 +16,7 @@ </div> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script> + </body> </html> |