From 20c50e55b1ec21cf39c4129bd548ec7566e52437 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 18 Jul 2014 10:12:15 -0700 Subject: [PATCH 1/2] [ticket/12864] Add template event to header after stylesheets https://tracker.phpbb.com/browse/PHPBB3-12864 PHPBB3-12864 --- phpBB/adm/style/overall_header.html | 2 ++ phpBB/adm/style/simple_header.html | 1 + phpBB/docs/events.md | 29 +++++++++++++++++++ .../prosilver/template/overall_header.html | 2 ++ .../prosilver/template/simple_header.html | 2 ++ .../subsilver2/template/overall_header.html | 2 ++ .../subsilver2/template/simple_header.html | 2 ++ 7 files changed, 40 insertions(+) diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index afd2b94924..f1f7eee282 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -89,6 +89,8 @@ function popup(url, width, height, name) {$STYLESHEETS} + + diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index bf8f41cd7a..d0b9bf62ed 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -84,6 +84,7 @@ function find_username(url) {$STYLESHEETS} + diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index b6d4bfe214..67246ff001 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -64,6 +64,12 @@ acp_overall_header_head_append * Since: 3.1.0-a1 * Purpose: Add assets within the `` tags in the ACP +acp_overall_header_stylesheets_after +=== +* Location: adm/style/overall_header.html +* Since: 3.1.0-RC3 +* Purpose: Add assets after stylesheets within the `` tags in the ACP + acp_posting_buttons_after === * Locations: @@ -96,6 +102,13 @@ acp_simple_header_head_append * Since: 3.1.0-a1 * Purpose: Add assets within the `` tags in the simple header of the ACP +acp_simple_header_stylesheets_after +=== +* Location: adm/style/simple_header.html +* Since: 3.1.0-RC3 +* Purpose: Add assets after stylesheets within the `` tags in the simple header +of the ACP + acp_users_overview_options_append === * Location: adm/style/acp_users_overview.html @@ -576,6 +589,14 @@ overall_header_page_body_before * Since: 3.1.0-b3 * Purpose: Add content after the page-header, but before the page-body +overall_header_stylesheets_after +=== +* Locations: + + styles/prosilver/template/overall_header.html + + styles/subsilver2/template/overall_header.html +* Since: 3.1.0-RC3 +* Purpose: Add asset calls after stylesheets within the `` tag + posting_editor_buttons_after === * Locations: @@ -734,6 +755,14 @@ simple_header_head_append * Since: 3.1.0-b4 * Purpose: Add asset calls directly before the `` tag +simple_header_stylesheets_after +=== +* Locations: + + styles/prosilver/template/simple_header.html + + styles/subsilver2/template/simple_header.html +* Since: 3.1.0-RC3 +* Purpose: Add asset calls after stylesheets within the `` tag + topiclist_row_prepend === * Locations: diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index df09fc6a30..076a3160f0 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -51,6 +51,8 @@ {$STYLESHEETS} + + diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index d31dd32cf6..0831d5f9dc 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -28,6 +28,8 @@ {$STYLESHEETS} + + diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 711ce66362..316b51dcda 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -135,6 +135,8 @@ function marklist(id, name, state) {$STYLESHEETS} + + diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html index faeeaea3d5..0c3dff4a05 100644 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ b/phpBB/styles/subsilver2/template/simple_header.html @@ -14,6 +14,8 @@ {$STYLESHEETS} + + From 4ce6811d2bacade5845a3830f0c3a454b4167be7 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 27 Jul 2014 22:55:36 -0500 Subject: [PATCH 2/2] [ticket/12864] Update event docs PHPBB3-12864 --- phpBB/docs/events.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 67246ff001..cdd211e912 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -68,7 +68,8 @@ acp_overall_header_stylesheets_after === * Location: adm/style/overall_header.html * Since: 3.1.0-RC3 -* Purpose: Add assets after stylesheets within the `` tags in the ACP +* Purpose: Add assets after stylesheets within the `` tags in the ACP. +Note that INCLUDECSS will not work with this event. acp_posting_buttons_after === @@ -107,7 +108,7 @@ acp_simple_header_stylesheets_after * Location: adm/style/simple_header.html * Since: 3.1.0-RC3 * Purpose: Add assets after stylesheets within the `` tags in the simple header -of the ACP +of the ACP. Note that INCLUDECSS will not work with this event. acp_users_overview_options_append === @@ -595,7 +596,8 @@ overall_header_stylesheets_after + styles/prosilver/template/overall_header.html + styles/subsilver2/template/overall_header.html * Since: 3.1.0-RC3 -* Purpose: Add asset calls after stylesheets within the `` tag +* Purpose: Add asset calls after stylesheets within the `` tag. +Note that INCLUDECSS will not work with this event. posting_editor_buttons_after === @@ -761,7 +763,8 @@ simple_header_stylesheets_after + styles/prosilver/template/simple_header.html + styles/subsilver2/template/simple_header.html * Since: 3.1.0-RC3 -* Purpose: Add asset calls after stylesheets within the `` tag +* Purpose: Add asset calls after stylesheets within the `` tag. +Note that INCLUDECSS will not work with this event. topiclist_row_prepend ===