Merge branch 'develop-ascraeus' into develop

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

View file

@ -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:

View file

@ -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 -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>