aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-01 09:53:08 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-10-01 09:53:08 +0200
commitd3ee8d24bc74f8895620da79e0f9fce3e373e55a (patch)
treeca396cfbe526f5570fc64485aa930baa8e76add7
parentd644de5217fd058e7529f5652e03ce611709156e (diff)
parenteffb5d95d0ecf01f6f5757ea5ee28049a2e8481d (diff)
downloadforums-d3ee8d24bc74f8895620da79e0f9fce3e373e55a.tar
forums-d3ee8d24bc74f8895620da79e0f9fce3e373e55a.tar.gz
forums-d3ee8d24bc74f8895620da79e0f9fce3e373e55a.tar.bz2
forums-d3ee8d24bc74f8895620da79e0f9fce3e373e55a.tar.xz
forums-d3ee8d24bc74f8895620da79e0f9fce3e373e55a.zip
Merge branch 'develop-ascraeus' into develop
Conflicts: phpBB/styles/subsilver2/template/forumlist_body.html
-rw-r--r--phpBB/docs/events.md28
-rw-r--r--phpBB/styles/prosilver/template/forumlist_body.html4
2 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index f8897c926e..370311e8ab 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -222,6 +222,34 @@ forumlist_body_category_header_before
* Since: 3.1.0-a4
* Purpose: Add content before the header of the category on the forum list.
+forumlist_body_forum_row_after
+===
+* Locations:
+ + styles/prosilver/template/forumlist_body.html
+* Since: 3.1.0-RC5
+* Purpose: Add content after the forum list item.
+
+forumlist_body_forum_row_append
+===
+* Locations:
+ + styles/prosilver/template/forumlist_body.html
+* Since: 3.1.0-RC5
+* Purpose: Add content at the start of the forum list item.
+
+forumlist_body_forum_row_before
+===
+* Locations:
+ + styles/prosilver/template/forumlist_body.html
+* Since: 3.1.0-RC5
+* Purpose: Add content before the forum list item.
+
+forumlist_body_forum_row_prepend
+===
+* Locations:
+ + styles/prosilver/template/forumlist_body.html
+* Since: 3.1.0-RC5
+* Purpose: Add content at the end of the forum list item.
+
forumlist_body_last_post_title_prepend
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 22859b2452..c90f5b0639 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -26,7 +26,9 @@
<!-- EVENT forumlist_body_category_header_after -->
<!-- IF not forumrow.S_IS_CAT -->
+ <!-- EVENT forumlist_body_forum_row_before -->
<li class="row">
+ <!-- EVENT forumlist_body_forum_row_prepend -->
<dl class="icon {forumrow.FORUM_IMG_STYLE}">
<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF -->
@@ -80,7 +82,9 @@
</dd>
<!-- ENDIF -->
</dl>
+ <!-- EVENT forumlist_body_forum_row_append -->
</li>
+ <!-- EVENT forumlist_body_forum_row_after -->
<!-- ENDIF -->
<!-- IF forumrow.S_LAST_ROW -->