diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-19 18:33:56 -0500 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-19 18:33:56 -0500 |
commit | c34118f93ba3c81d3efe21d6585dbc67698aeaaa (patch) | |
tree | 0361b2883b49bdd2b8b52ea162ebdb07990983d7 /phpBB/styles | |
parent | a0f76f73e9a5865d8144b3b3c2316a485794db24 (diff) | |
parent | b8afef5df032ea06239798898112e5f79d823772 (diff) | |
download | forums-c34118f93ba3c81d3efe21d6585dbc67698aeaaa.tar forums-c34118f93ba3c81d3efe21d6585dbc67698aeaaa.tar.gz forums-c34118f93ba3c81d3efe21d6585dbc67698aeaaa.tar.bz2 forums-c34118f93ba3c81d3efe21d6585dbc67698aeaaa.tar.xz forums-c34118f93ba3c81d3efe21d6585dbc67698aeaaa.zip |
Merge remote-tracking branch 'remotes/cyberalien/ticket/11554' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11554:
[ticket/11554] Move forum_fn.js to footer
Diffstat (limited to 'phpBB/styles')
5 files changed, 10 insertions, 11 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 2a207e2f35..3d05c937da 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -3,6 +3,14 @@ */ /** +* Find a member +*/ +function find_username(url) { + popup(url, 760, 570, '_usersearch'); + return false; +} + +/** * Window popup */ function popup(url, width, height, name) { diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index bf5ce30f37..f2113b73ef 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -53,6 +53,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?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script> <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- INCLUDEJS template/ajax.js --> {SCRIPTS} diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index a53e0f8d60..e68ce4dd51 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -41,15 +41,6 @@ <!-- ENDIF --> /** - * Find a member - */ - function find_username(url) - { - popup(url, 760, 570, '_usersearch'); - return false; - } - - /** * New function for handling multiple calls to window.onload and window.unload by pentapenguin */ window.onload = function() @@ -70,7 +61,6 @@ // ]]> </script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script> <link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" /> <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index ec189304fc..144ae8e462 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?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script> {SCRIPTS} <!-- EVENT simple_footer_after --> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 88b2c0c025..667698c371 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -40,7 +40,6 @@ // ]]> </script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script> <link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" /> <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> |