diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:26:24 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:26:24 -0800 |
| commit | 6403d6848e6d1c325ccc5f487d4747f42151708d (patch) | |
| tree | 8ae8bb76af9cdc6b7188b32d59c01386a396e3dd | |
| parent | 7c1c8708523ea243048c6e96606763d8df5876e3 (diff) | |
| parent | 55670d75b00079a06ed1ac701786e41d7a367f89 (diff) | |
| download | forums-6403d6848e6d1c325ccc5f487d4747f42151708d.tar forums-6403d6848e6d1c325ccc5f487d4747f42151708d.tar.gz forums-6403d6848e6d1c325ccc5f487d4747f42151708d.tar.bz2 forums-6403d6848e6d1c325ccc5f487d4747f42151708d.tar.xz forums-6403d6848e6d1c325ccc5f487d4747f42151708d.zip | |
Merge pull request #1878 from blitze/ticket/12024
[ticket/12024] Template event overall_header_content_before
| -rw-r--r-- | phpBB/docs/events.md | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_header.html | 1 |
5 files changed, 22 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 23e63ed7e4..b15b8b2e6e 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -111,6 +111,14 @@ overall_footer_breadcrumb_append * Since: 3.1.0-a1 * Purpose: Add links to the list of breadcrumbs in the footer +overall_footer_content_after +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Since: 3.1.0-a3 +* Purpose: Add content on all pages after the main content, before the footer + overall_footer_copyright_append === * Locations: @@ -135,6 +143,14 @@ overall_header_breadcrumb_append * Since: 3.1.0-a1 * Purpose: Add links to the list of breadcrumbs in the header +overall_header_content_before +=== +* Locations: + + styles/prosilver/template/overall_header.html + + styles/subsilver2/template/overall_header.html +* Since: 3.1.0-a3 +* Purpose: Add content on all pages before the main content, after the header + overall_header_head_append === * Locations: diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index a831ab6cb4..e32e91432c 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -1,3 +1,4 @@ + <!-- EVENT overall_footer_content_after --> </div> <div id="page-footer"> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 6186fe051e..eb2d2cbafd 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -180,3 +180,5 @@ </div> </div> <!-- ENDIF --> + + <!-- EVENT overall_header_content_before --> diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index dbc9fcd7aa..d2b6f6a9d7 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -1,3 +1,5 @@ + <!-- EVENT overall_footer_content_after --> + <!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF --> </div> diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index a82a640447..16e0f6abaf 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -238,3 +238,4 @@ function marklist(id, name, state) <!-- DEFINE $S_MICRODATA = 0 --> <br /> + <!-- EVENT overall_header_content_before --> |