makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 16:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source
This commit is contained in:
Marc Alexander 2014-07-31 21:40:37 +02:00
commit 589cf73202
7 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/overall_header.html
View file

@ -89,6 +89,8 @@ function popup(url, width, height, name)
{$STYLESHEETS}
<!-- EVENT acp_overall_header_stylesheets_after -->
</head>
<body class="{S_CONTENT_DIRECTION} {BODY_CLASS} nojs">

1
phpBB/adm/style/simple_header.html
View file

@ -84,6 +84,7 @@ function find_username(url)
</script>
<!-- EVENT acp_simple_header_head_append -->
{$STYLESHEETS}
<!-- EVENT acp_simple_header_stylesheets_after -->
</head>
<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">

32
phpBB/docs/events.md
View file

@ -64,6 +64,13 @@ acp_overall_header_head_append
* Since: 3.1.0-a1
* Purpose: Add assets within the `<head>` 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 `<head>` tags in the ACP.
Note that INCLUDECSS will not work with this event.
acp_posting_buttons_after
===
* Locations:
@ -96,6 +103,13 @@ acp_simple_header_head_append
* Since: 3.1.0-a1
* Purpose: Add assets within the `<head>` 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 `<head>` tags in the simple header
of the ACP. Note that INCLUDECSS will not work with this event.
acp_users_overview_options_append
===
* Location: adm/style/acp_users_overview.html
@ -609,6 +623,15 @@ 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 `</head>` tag.
Note that INCLUDECSS will not work with this event.
posting_editor_buttons_after
===
* Locations:
@ -767,6 +790,15 @@ simple_header_head_append
* Since: 3.1.0-b4
* Purpose: Add asset calls directly before the `</head>` 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 `</head>` tag.
Note that INCLUDECSS will not work with this event.
topiclist_row_prepend
===
* Locations:

2
phpBB/styles/prosilver/template/overall_header.html
View file

@ -51,6 +51,8 @@
{$STYLESHEETS}
<!-- EVENT overall_header_stylesheets_after -->
</head>
<body id="phpbb" class="nojs notouch section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}">

2
phpBB/styles/prosilver/template/simple_header.html
View file

@ -28,6 +28,8 @@
{$STYLESHEETS}
<!-- EVENT simple_header_stylesheets_after -->
</head>
<body id="phpbb" class="nojs {S_CONTENT_DIRECTION} {BODY_CLASS}">

2
phpBB/styles/subsilver2/template/overall_header.html
View file

@ -135,6 +135,8 @@ function marklist(id, name, state)
{$STYLESHEETS}
<!-- EVENT overall_header_stylesheets_after -->
</head>
<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">

2
phpBB/styles/subsilver2/template/simple_header.html
View file

@ -14,6 +14,8 @@
{$STYLESHEETS}
<!-- EVENT simple_header_stylesheets_after -->
</head>
<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">