Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
This commit is contained in:
Marc Alexander 2015-05-14 15:57:41 +02:00
commit 11167f6060
2 changed files with 16 additions and 2 deletions

View file

@ -1385,6 +1385,20 @@ viewforum_forum_name_prepend
* Since: 3.1.0-b3
* Purpose: Add content directly before the forum name link on the View forum screen
viewforum_forum_title_after
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.1.5-RC1
* Purpose: Add content directly after the forum title on the View forum screen
viewforum_forum_title_before
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.1.5-RC1
* Purpose: Add content directly before the forum title on the View forum screen
viewtopic_print_head_append
===
* Locations:

View file

@ -1,7 +1,7 @@
<!-- INCLUDE overall_header.html -->
<!-- EVENT viewforum_forum_title_before -->
<h2 class="forum-title"><!-- EVENT viewforum_forum_name_prepend --><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- EVENT viewforum_forum_name_append --></h2>
<!-- EVENT viewforum_forum_title_after -->
<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
<div>
<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->