diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-14 15:57:41 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-14 15:57:41 +0200 |
| commit | 11167f606015bc4663fa5a122ca95436ff412afc (patch) | |
| tree | a898af494bc0f17614fcce4c68c3565b96435697 | |
| parent | 2d9bb285f91765e5e5ad097aa89c187a62f705d2 (diff) | |
| parent | d004a1c6b8e6eb846db711db1aff62b9259bbec6 (diff) | |
| download | forums-11167f606015bc4663fa5a122ca95436ff412afc.tar forums-11167f606015bc4663fa5a122ca95436ff412afc.tar.gz forums-11167f606015bc4663fa5a122ca95436ff412afc.tar.bz2 forums-11167f606015bc4663fa5a122ca95436ff412afc.tar.xz forums-11167f606015bc4663fa5a122ca95436ff412afc.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index a7bcd9f978..dc821f6c15 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -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: diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index a0a0cd547a..b1e9d1be2c 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -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 --> |