diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 19:54:44 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 19:54:44 +0100 |
| commit | ac33ee22900934e758a1715507e3a4206310aec9 (patch) | |
| tree | 14960bb5919ac40d609518ab8c6390ea224dd233 /phpBB | |
| parent | 462664b4b43b094a9e569b7514b84ab90b4095ef (diff) | |
| parent | 2d6734cb0a809107a7b6d3b05608e40653433444 (diff) | |
| download | forums-ac33ee22900934e758a1715507e3a4206310aec9.tar forums-ac33ee22900934e758a1715507e3a4206310aec9.tar.gz forums-ac33ee22900934e758a1715507e3a4206310aec9.tar.bz2 forums-ac33ee22900934e758a1715507e3a4206310aec9.tar.xz forums-ac33ee22900934e758a1715507e3a4206310aec9.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/index_body.html
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 15 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/index_body.html | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 311f3199f6..10d912fad0 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -117,7 +117,7 @@ acp_ranks_list_column_before * Locations: + adm/style/acp_ranks.html * Since: 3.1.0-RC3 -* Purpose: Add content after the last column (but before the action column) +* Purpose: Add content after the last column (but before the action column) in the ranks list in the ACP acp_ranks_list_header_after @@ -132,7 +132,7 @@ acp_ranks_list_header_before * Locations: + adm/style/acp_ranks.html * Since: 3.1.0-RC3 -* Purpose: Add content after the last header-column (but before the action column) +* Purpose: Add content after the last header-column (but before the action column) in the ranks list in the ACP acp_simple_footer_after @@ -326,6 +326,13 @@ index_body_block_stats_prepend * Since: 3.1.0-b3 * Purpose: Prepend content to the statistics list on the Board index +index_body_forumlist_body_after +=== +* Locations: + + styles/prosilver/template/index_body.html +* Since: 3.1.1 +* Purpose: Add content after the forum list body on the index page + index_body_markforums_after === * Locations: @@ -957,7 +964,7 @@ ucp_pm_viewmessage_post_buttons_after * Locations: + styles/prosilver/template/ucp_pm_viewmessage.html * Since: 3.1.0-RC3 -* Purpose: Add post button to private messages (next to edit, quote etc), at +* Purpose: Add post button to private messages (next to edit, quote etc), at the end of the list. ucp_pm_viewmessage_post_buttons_before @@ -965,7 +972,7 @@ ucp_pm_viewmessage_post_buttons_before * Locations: + styles/prosilver/template/ucp_pm_viewmessage.html * Since: 3.1.0-RC3 -* Purpose: Add post button to private messages (next to edit, quote etc), at +* Purpose: Add post button to private messages (next to edit, quote etc), at the start of the list. ucp_pm_viewmessage_print_head_append diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 1e1eb22c6f..f620b6e966 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -13,6 +13,8 @@ <!-- INCLUDE forumlist_body.html --> +<!-- EVENT index_body_forumlist_body_after --> + <!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> <form method="post" action="{S_LOGIN_ACTION}" class="headerspace"> <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --> • <a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3> |