From 9d39457e35632d2770af986f78286d239fd00c78 Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Mon, 18 Nov 2013 23:17:03 -0500 Subject: [PATCH 1/5] [ticket/12024] Template event overall_header_content_before http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44959 http://tracker.phpbb.com/browse/PHPBB3-12024 PHPBB3-12024 --- phpBB/styles/prosilver/template/overall_footer.html | 1 + phpBB/styles/prosilver/template/overall_header.html | 1 + phpBB/styles/subsilver2/template/overall_footer.html | 1 + phpBB/styles/subsilver2/template/overall_header.html | 1 + 4 files changed, 4 insertions(+) diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index bf5ce30f37..766dc93655 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -1,3 +1,4 @@ +
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index a53e0f8d60..7002ebc630 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -213,3 +213,4 @@
+ diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 3a29a0d752..84a02430b9 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -1,3 +1,4 @@ + {RUN_CRON_TASK} diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 0317d6e45c..20d06e4921 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -243,3 +243,4 @@ function marklist(id, name, state)
+ \ No newline at end of file From bc47455dfba70f43bf335753e0329e2eff6d7082 Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Mon, 18 Nov 2013 23:43:39 -0500 Subject: [PATCH 2/5] [ticket/12024] Replace newline PHPBB3-12024 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 20d06e4921..02e056798b 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -243,4 +243,4 @@ function marklist(id, name, state)
- \ No newline at end of file + From 122e95486c8af0963316c4c46a40e9f8f19a9cad Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Mon, 18 Nov 2013 23:44:59 -0500 Subject: [PATCH 3/5] [ticket/12024] Update events list PHPBB3-12024 --- phpBB/docs/events.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index f0b3b81822..ffcf0258f2 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -64,6 +64,14 @@ overall_footer_breadcrumb_append * Location: styles/prosilver/template/overall_footer.html * 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-a1 +* Purpose: Add content on all pages after the main content, before the footer + overall_footer_copyright_append === * Locations: @@ -85,6 +93,14 @@ overall_header_breadcrumb_append + styles/subsilver2/template/breadcrumbs.html * 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-a1 +* Purpose: Add content on all pages before the main content, after the header + overall_header_head_append === * Locations: From 77dc1ac09a7e6c426ba8e07b398a3c3abeed487f Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Tue, 19 Nov 2013 09:37:00 -0500 Subject: [PATCH 4/5] [ticket/12024] Correct the 'since' information in event list PHPBB3-12024 --- phpBB/docs/events.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index ffcf0258f2..2eb07a5a71 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -69,7 +69,7 @@ overall_footer_content_after * Locations: + styles/prosilver/template/overall_footer.html + styles/subsilver2/template/overall_footer.html -* Since: 3.1.0-a1 +* Since: 3.1.0-a3 * Purpose: Add content on all pages after the main content, before the footer overall_footer_copyright_append @@ -98,7 +98,7 @@ overall_header_content_before * Locations: + styles/prosilver/template/overall_header.html + styles/subsilver2/template/overall_header.html -* Since: 3.1.0-a1 +* Since: 3.1.0-a3 * Purpose: Add content on all pages before the main content, after the header overall_header_head_append From 55670d75b00079a06ed1ac701786e41d7a367f89 Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Tue, 19 Nov 2013 09:55:58 -0500 Subject: [PATCH 5/5] [ticket/12024] Add new line PHPBB3-12024 --- phpBB/styles/prosilver/template/overall_header.html | 1 + phpBB/styles/subsilver2/template/overall_footer.html | 1 + 2 files changed, 2 insertions(+) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 7002ebc630..809c0affcb 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -213,4 +213,5 @@ + diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 84a02430b9..4d69f8dff1 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -1,4 +1,5 @@ + {RUN_CRON_TASK}