diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-04 23:57:06 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-04 23:57:06 +0200 |
| commit | bd36ca101654000bb91127d8f1c3db881a9deaf1 (patch) | |
| tree | 7ca4b61cfc4c1120c6084dd5410f3ad6b8ee5c92 | |
| parent | b5db7d49a8cb50b408cb7b431b44107a6f9f5df4 (diff) | |
| parent | 069e5157471a49918b286c3cabd3bc61941ced32 (diff) | |
| download | forums-bd36ca101654000bb91127d8f1c3db881a9deaf1.tar forums-bd36ca101654000bb91127d8f1c3db881a9deaf1.tar.gz forums-bd36ca101654000bb91127d8f1c3db881a9deaf1.tar.bz2 forums-bd36ca101654000bb91127d8f1c3db881a9deaf1.tar.xz forums-bd36ca101654000bb91127d8f1c3db881a9deaf1.zip | |
Merge remote-tracking branch 'paybas/ticket/12338' into develop-ascraeus
* paybas/ticket/12338:
[ticket/12338] Add Template Event overall_footer_page_body_after
Conflicts:
phpBB/docs/events.md
| -rw-r--r-- | phpBB/docs/events.md | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_footer.html | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index ebfd806b0c..7580c212ce 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -267,6 +267,14 @@ overall_footer_copyright_prepend * Since: 3.1.0-a1 * Purpose: Add content before the copyright line +overall_footer_page_body_after +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Since: 3.1.0-b3 +* Purpose: Add content after the page-body, but before the footer + overall_header_body_before === * Locations: diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 662008b7fa..92d43abc7e 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -1,6 +1,8 @@ <!-- EVENT overall_footer_content_after --> </div> +<!-- EVENT overall_footer_page_body_after --> + <div id="page-footer"> <div class="navbar"> diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index d2b6f6a9d7..200401eeda 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -3,6 +3,8 @@ <!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF --> </div> +<!-- EVENT overall_footer_page_body_after --> + <div id="wrapfooter"> <!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF --> <span class="copyright"> |