makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
This commit is contained in:
Joas Schilling 2014-11-21 19:54:44 +01:00
commit ac33ee2290
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/docs/events.md
View file

@ -117,7 +117,7 @@ acp_ranks_list_column_before
* Locations: * Locations:
+ adm/style/acp_ranks.html + adm/style/acp_ranks.html
* Since: 3.1.0-RC3 * 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 in the ranks list in the ACP
acp_ranks_list_header_after acp_ranks_list_header_after
@ -132,7 +132,7 @@ acp_ranks_list_header_before
* Locations: * Locations:
+ adm/style/acp_ranks.html + adm/style/acp_ranks.html
* Since: 3.1.0-RC3 * 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 in the ranks list in the ACP
acp_simple_footer_after acp_simple_footer_after
@ -326,6 +326,13 @@ index_body_block_stats_prepend
* Since: 3.1.0-b3 * Since: 3.1.0-b3
* Purpose: Prepend content to the statistics list on the Board index * 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 index_body_markforums_after
=== ===
* Locations: * Locations:
@ -957,7 +964,7 @@ ucp_pm_viewmessage_post_buttons_after
* Locations: * Locations:
+ styles/prosilver/template/ucp_pm_viewmessage.html + styles/prosilver/template/ucp_pm_viewmessage.html
* Since: 3.1.0-RC3 * 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. the end of the list.
ucp_pm_viewmessage_post_buttons_before ucp_pm_viewmessage_post_buttons_before
@ -965,7 +972,7 @@ ucp_pm_viewmessage_post_buttons_before
* Locations: * Locations:
+ styles/prosilver/template/ucp_pm_viewmessage.html + styles/prosilver/template/ucp_pm_viewmessage.html
* Since: 3.1.0-RC3 * 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. the start of the list.
ucp_pm_viewmessage_print_head_append ucp_pm_viewmessage_print_head_append

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

@ -13,6 +13,8 @@
<!-- INCLUDE forumlist_body.html --> <!-- INCLUDE forumlist_body.html -->
<!-- EVENT index_body_forumlist_body_after -->
<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> <!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
<form method="post" action="{S_LOGIN_ACTION}" class="headerspace"> <form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3> <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>