From 8fda490050fbf6d2ed36077d1705f860e0c72aa1 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 7 May 2014 11:53:25 -0700 Subject: [PATCH 1/2] [ticket/12513] Add simple_header head event with support for CSS assets calls PHPBB3-12513 --- phpBB/docs/events.md | 8 ++++++++ phpBB/styles/prosilver/template/simple_header.html | 4 ++++ phpBB/styles/subsilver2/template/simple_header.html | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 18beb1c64a..66b558a665 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -617,6 +617,14 @@ simple_header_body_before * Since: 3.1.0-b2 * Purpose: Add content to the header body +simple_header_head_append +=== +* Locations: + + styles/prosilver/template/simple_header.html + + styles/subsilver2/template/simple_header.html +* Since: 3.1.0-b4 +* Purpose: Add asset calls directly before the `` tag + topiclist_row_prepend === * Locations: diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index f5e265ac16..48f6cc87da 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -24,6 +24,10 @@ + + +{$STYLESHEETS} + diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html index 37a33415e9..36ac149691 100644 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ b/phpBB/styles/subsilver2/template/simple_header.html @@ -9,6 +9,11 @@ + + + +{$STYLESHEETS} + From d2c5386394840f53b9bb45567b43310e2622fbb7 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 7 May 2014 11:59:49 -0700 Subject: [PATCH 2/2] [ticket/12513] Add asset include support to simple header/footer in ACP PHPBB3-12513 --- phpBB/adm/style/simple_footer.html | 1 + phpBB/adm/style/simple_header.html | 1 + 2 files changed, 2 insertions(+) diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index c549a2df4e..d3f2f17bc7 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -21,6 +21,7 @@ +{$SCRIPTS} diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index ae25f28d32..bf8f41cd7a 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -83,6 +83,7 @@ function find_username(url) // ]]> +{$STYLESHEETS}