From 4e79764aca4b569bb4f651d6d365bf102e9e4d54 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 9 Apr 2014 14:15:57 +0200
Subject: [PATCH 1/3] [ticket/12376] Add template events viewtopic_body_polls

PHPBB3-12376
---
 phpBB/docs/events.md                          | 26 +++++++++++++++++++
 .../prosilver/template/viewtopic_body.html    |  6 ++++-
 .../subsilver2/template/viewtopic_body.html   |  4 ++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 1cc1300c05..68f4afad21 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -693,6 +693,32 @@ viewtopic_body_footer_before
 and quick reply, directly before the jumpbox in Prosilver, breadcrumbs in
 Subsilver2.
 
+viewtopic_body_poll_fieldset_append
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.0-b3
+* Purpose: Add content before the items in the polls fieldset
+the list.
+
+viewtopic_body_poll_fieldset_prepend
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.0-b3
+* Purpose: Add content after the items in the polls fieldset
+the list.
+
+viewtopic_body_poll_question_prepend
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.0-b3
+* Purpose: Add content directly before the poll question on the View topic screen
+
 viewtopic_body_post_buttons_after
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 8912382c48..5db95e7879 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -67,10 +67,12 @@
 		<div class="inner">
 
 		<div class="content">
-			<h2 class="poll-title">{POLL_QUESTION}</h2>
+			<h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_QUESTION}</h2>
 			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE --><span class="poll_max_votes">{L_MAX_VOTES}</span><!-- ENDIF --></p>
 
 			<fieldset class="polls">
+			<!-- EVENT viewtopic_body_poll_fieldset_prepend -->
+
 			<!-- BEGIN poll_option -->
 				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF --><!-- IF poll_option.POLL_OPTION_MOST_VOTES --> most-votes<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF --> data-poll-option-id="{poll_option.POLL_OPTION_ID}">
 					<dt><!-- IF S_CAN_VOTE --><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label><!-- ELSE -->{poll_option.POLL_OPTION_CAPTION}<!-- ENDIF --></dt>
@@ -98,6 +100,8 @@
 					<dd class="resultbar"><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></dd>
 				</dl>
 			<!-- ENDIF -->
+
+			<!-- EVENT viewtopic_body_poll_fieldset_append -->
 			</fieldset>
 			<div class="vote-submitted hidden">{L_VOTE_SUBMITTED}</div>
 		</div>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index 307ed0f391..6e6ca488ca 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -72,10 +72,11 @@
 
 			<table cellspacing="0" cellpadding="4" border="0" align="center">
 			<tr>
-				<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
+				<td align="center"><span class="gen"><!-- EVENT viewtopic_body_poll_question_prepend --><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
 			</tr>
 			<tr>
 				<td align="{S_CONTENT_FLOW_BEGIN}">
+				<!-- EVENT viewtopic_body_poll_fieldset_prepend -->
 					<table cellspacing="0" cellpadding="2" border="0">
 				<!-- BEGIN poll_option -->
 					<tr>
@@ -100,6 +101,7 @@
 					</tr>
 				<!-- END poll_option -->
 					</table>
+				<!-- EVENT viewtopic_body_poll_fieldset_append -->
 				</td>
 			</tr>
 		<!-- IF S_CAN_VOTE -->

From 21c11c7b2483c04bf94fa0df9b7fa49eff393bd4 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 9 Apr 2014 17:24:34 +0200
Subject: [PATCH 2/3] [ticket/12376] Added viewtopic_body_poll_question_append

PHPBB3-12376
---
 phpBB/docs/events.md                                 | 8 ++++++++
 phpBB/styles/prosilver/template/viewtopic_body.html  | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_body.html | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 68f4afad21..ae421260e8 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -711,6 +711,14 @@ viewtopic_body_poll_fieldset_prepend
 * Purpose: Add content after the items in the polls fieldset
 the list.
 
+viewtopic_body_poll_question_append
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.0-b3
+* Purpose: Add content directly after the poll question on the View topic screen
+
 viewtopic_body_poll_question_prepend
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 5db95e7879..2529374089 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -67,7 +67,7 @@
 		<div class="inner">
 
 		<div class="content">
-			<h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_QUESTION}</h2>
+			<h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_QUESTION}<!-- EVENT viewtopic_body_poll_question_append --></h2>
 			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE --><span class="poll_max_votes">{L_MAX_VOTES}</span><!-- ENDIF --></p>
 
 			<fieldset class="polls">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index 6e6ca488ca..5e6c243a48 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -72,7 +72,7 @@
 
 			<table cellspacing="0" cellpadding="4" border="0" align="center">
 			<tr>
-				<td align="center"><span class="gen"><!-- EVENT viewtopic_body_poll_question_prepend --><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
+				<td align="center"><span class="gen"><!-- EVENT viewtopic_body_poll_question_prepend --><b>{POLL_QUESTION}</b><!-- EVENT viewtopic_body_poll_question_append --></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
 			</tr>
 			<tr>
 				<td align="{S_CONTENT_FLOW_BEGIN}">

From 36aa8ecad860a5a83d790939668078c18442ad22 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 11 Apr 2014 11:59:26 +0200
Subject: [PATCH 3/3] [ticket/12376] Changed to
 viewtopic_body_poll_option_before and after

PHPBB3-12376
---
 phpBB/docs/events.md                                 | 8 ++++----
 phpBB/styles/prosilver/template/viewtopic_body.html  | 6 ++----
 phpBB/styles/subsilver2/template/viewtopic_body.html | 4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index ae421260e8..3f2effd2f6 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -693,22 +693,22 @@ viewtopic_body_footer_before
 and quick reply, directly before the jumpbox in Prosilver, breadcrumbs in
 Subsilver2.
 
-viewtopic_body_poll_fieldset_append
+viewtopic_body_poll_option_after
 ===
 * Locations:
     + styles/prosilver/template/viewtopic_body.html
     + styles/subsilver2/template/viewtopic_body.html
 * Since: 3.1.0-b3
-* Purpose: Add content before the items in the polls fieldset
+* Purpose: Add content after the poll option
 the list.
 
-viewtopic_body_poll_fieldset_prepend
+viewtopic_body_poll_option_before
 ===
 * Locations:
     + styles/prosilver/template/viewtopic_body.html
     + styles/subsilver2/template/viewtopic_body.html
 * Since: 3.1.0-b3
-* Purpose: Add content after the items in the polls fieldset
+* Purpose: Add content before the poll option
 the list.
 
 viewtopic_body_poll_question_append
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 2529374089..039b3286fa 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -71,15 +71,15 @@
 			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE --><span class="poll_max_votes">{L_MAX_VOTES}</span><!-- ENDIF --></p>
 
 			<fieldset class="polls">
-			<!-- EVENT viewtopic_body_poll_fieldset_prepend -->
-
 			<!-- BEGIN poll_option -->
+				<!-- EVENT viewtopic_body_poll_option_before -->
 				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF --><!-- IF poll_option.POLL_OPTION_MOST_VOTES --> most-votes<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF --> data-poll-option-id="{poll_option.POLL_OPTION_ID}">
 					<dt><!-- IF S_CAN_VOTE --><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label><!-- ELSE -->{poll_option.POLL_OPTION_CAPTION}<!-- ENDIF --></dt>
 					<!-- IF S_CAN_VOTE --><dd style="width: auto;" class="poll_option_select"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd><!-- ENDIF -->
 					<dd class="resultbar<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><div class="<!-- IF poll_option.POLL_OPTION_PCT < 20 -->pollbar1<!-- ELSEIF poll_option.POLL_OPTION_PCT < 40 -->pollbar2<!-- ELSEIF poll_option.POLL_OPTION_PCT < 60 -->pollbar3<!-- ELSEIF poll_option.POLL_OPTION_PCT < 80 -->pollbar4<!-- ELSE -->pollbar5<!-- ENDIF -->" style="width:{poll_option.POLL_OPTION_PERCENT_REL};">{poll_option.POLL_OPTION_RESULT}</div></dd>
 					<dd class="poll_option_percent<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><!-- IF poll_option.POLL_OPTION_RESULT == 0 -->{L_NO_VOTES}<!-- ELSE -->{poll_option.POLL_OPTION_PERCENT}<!-- ENDIF --></dd>
 				</dl>
+				<!-- EVENT viewtopic_body_poll_option_after -->
 			<!-- END poll_option -->
 
 				<dl class="poll_total_votes<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->">
@@ -100,8 +100,6 @@
 					<dd class="resultbar"><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></dd>
 				</dl>
 			<!-- ENDIF -->
-
-			<!-- EVENT viewtopic_body_poll_fieldset_append -->
 			</fieldset>
 			<div class="vote-submitted hidden">{L_VOTE_SUBMITTED}</div>
 		</div>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index 5e6c243a48..0c89084b7f 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -76,10 +76,10 @@
 			</tr>
 			<tr>
 				<td align="{S_CONTENT_FLOW_BEGIN}">
-				<!-- EVENT viewtopic_body_poll_fieldset_prepend -->
 					<table cellspacing="0" cellpadding="2" border="0">
 				<!-- BEGIN poll_option -->
 					<tr>
+					<!-- EVENT viewtopic_body_poll_option_before -->
 					<!-- IF S_CAN_VOTE -->
 						<td<!-- IF poll_option.POLL_OPTION_MOST_VOTES --> class="most-votes"<!-- ENDIF -->>
 							<!-- IF S_IS_MULTI_CHOICE -->
@@ -98,10 +98,10 @@
 								<td class="gensmall" valign="top"><b title="{L_POLL_VOTED_OPTION}">x</b></td>
 							<!-- ENDIF -->
 						<!-- ENDIF -->
+					<!-- EVENT viewtopic_body_poll_option_after -->
 					</tr>
 				<!-- END poll_option -->
 					</table>
-				<!-- EVENT viewtopic_body_poll_fieldset_append -->
 				</td>
 			</tr>
 		<!-- IF S_CAN_VOTE -->