Merge pull request phpbb#3852 from marc1706/ticket/14068

[ticket/14068] Add template events before and after poll panel in viewtopic
marc1706 · Aug 22, 2015 · b09e1ad · b09e1ad
2 parents 583068d + 04b0ba9
commit b09e1ad
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
@@ -1922,6 +1922,22 @@ viewtopic_body_footer_before
 and quick reply, directly before the jumpbox in Prosilver, breadcrumbs in
 Subsilver2.
 
+viewtopic_body_poll_after
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.6-RC1
+* Purpose: Add content after the poll panel.
+
+viewtopic_body_poll_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.6-RC1
+* Purpose: Add content before the poll panel.
+
 viewtopic_body_poll_option_after
 ===
 * Locations:

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -68,6 +68,8 @@ <h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_
 	<!-- EVENT viewtopic_body_pagination_top_after -->
 </div>
 
+<!-- EVENT viewtopic_body_poll_before -->
+
 <!-- IF S_HAS_POLL -->
 	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">
 
@@ -121,6 +123,8 @@ <h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_
 	<hr />
 <!-- ENDIF -->
 
+<!-- EVENT viewtopic_body_poll_after -->
+
 <!-- BEGIN postrow -->
 	<!-- EVENT viewtopic_body_postrow_post_before -->
 	<!-- IF postrow.S_FIRST_UNREAD -->

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -68,6 +68,7 @@ <h2><!-- EVENT viewtopic_topic_title_prepend --><a class="titles" href="{U_VIEW_
 			</table>
 		</td>
 	</tr>
+<!-- EVENT viewtopic_body_poll_before -->
 <!-- IF S_HAS_POLL -->
 	<tr>
 		<td class="row2" colspan="2" align="center"><br clear="all" />
@@ -130,6 +131,7 @@ <h2><!-- EVENT viewtopic_topic_title_prepend --><a class="titles" href="{U_VIEW_
 		</td>
 	</tr>
 <!-- ENDIF -->
+<!-- EVENT viewtopic_body_poll_after -->
 	</table>
 
 <!-- BEGIN postrow -->