diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 12:28:53 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 12:28:53 +0200 |
| commit | 03f3f1141f3edc11a020a48e0ba959105ff6ef59 (patch) | |
| tree | c0cb158626332bb60de94cac5dff6613b40af69c | |
| parent | 48a170549c36c400f3a8d8e59df368b9cea7de76 (diff) | |
| parent | d2c5386394840f53b9bb45567b43310e2622fbb7 (diff) | |
| download | forums-03f3f1141f3edc11a020a48e0ba959105ff6ef59.tar forums-03f3f1141f3edc11a020a48e0ba959105ff6ef59.tar.gz forums-03f3f1141f3edc11a020a48e0ba959105ff6ef59.tar.bz2 forums-03f3f1141f3edc11a020a48e0ba959105ff6ef59.tar.xz forums-03f3f1141f3edc11a020a48e0ba959105ff6ef59.zip | |
Merge pull request #2424 from VSEphpbb/ticket/12513
[ticket/12513] Add simple_header head event with support for asset calls
* VSEphpbb/ticket/12513:
[ticket/12513] Add asset include support to simple header/footer in ACP
[ticket/12513] Add simple_header head event with support for CSS assets calls
| -rw-r--r-- | phpBB/adm/style/simple_footer.html | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_header.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/events.md | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/simple_header.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/simple_header.html | 5 |
5 files changed, 19 insertions, 0 deletions
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 @@ <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- EVENT acp_simple_footer_after --> +{$SCRIPTS} </body> </html> 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) // ]]> </script> <!-- EVENT acp_simple_header_head_append --> +{$STYLESHEETS} </head> <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}"> 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 `</head>` 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 @@ <!-- DEFINE $POPUP = 1 --> +<!-- EVENT simple_header_head_append --> + +{$STYLESHEETS} + </head> <body id="phpbb" class="nojs {S_CONTENT_DIRECTION} {BODY_CLASS}"> 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 @@ <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" /> <link rel="stylesheet" href="{T_STYLESHEET_LANG_LINK}" type="text/css" /> + +<!-- EVENT simple_header_head_append --> + +{$STYLESHEETS} + </head> <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}"> |