diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-18 02:02:44 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-18 02:02:44 +0200 |
| commit | a808c4f9c964dc61eb54c70391d6a04fa6752503 (patch) | |
| tree | 4842c3b7f1ab9950a98fb1403f064ef26d3cc0f3 | |
| parent | 55d911a2fd1f23bf3b36781617667db06396294a (diff) | |
| parent | 917478876297d17bff0f9dff446d1021a150692e (diff) | |
| download | forums-a808c4f9c964dc61eb54c70391d6a04fa6752503.tar forums-a808c4f9c964dc61eb54c70391d6a04fa6752503.tar.gz forums-a808c4f9c964dc61eb54c70391d6a04fa6752503.tar.bz2 forums-a808c4f9c964dc61eb54c70391d6a04fa6752503.tar.xz forums-a808c4f9c964dc61eb54c70391d6a04fa6752503.zip | |
Merge remote-tracking branch 'cyberalien/ticket/11800' into develop
* cyberalien/ticket/11800:
[ticket/11800] Fix scripts variable in subsilver simple_footer
[ticket/11800] Fix JavaScript in simple_footer.html
[ticket/11800] Remove forum_fn from memberlist_search.html
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_search.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/simple_footer.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/simple_footer.html | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 4f029627fc..f9538ef2e2 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -38,7 +38,6 @@ function insert_single(user) // ]]> </script> <!-- ENDIF --> -<!-- INCLUDEJS forum_fn.js --> <h2 class="solo">{L_FIND_USERNAME}</h2> <form method="post" action="{S_MODE_ACTION}" id="search_memberlist"> diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index 144ae8e462..b6afc2fdba 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -8,9 +8,11 @@ <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} +<!-- INCLUDEJS forum_fn.js --> <!-- EVENT simple_footer_after --> + +{$SCRIPTS} + </body> </html> diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html index c847bfedcc..48d3d934f8 100644 --- a/phpBB/styles/subsilver2/template/simple_footer.html +++ b/phpBB/styles/subsilver2/template/simple_footer.html @@ -7,8 +7,9 @@ <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 --> -{SCRIPTS} <!-- EVENT simple_footer_after --> + +{$SCRIPTS} </body> </html> |