aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-09-02 12:03:58 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-09-02 12:03:58 +0200
commit58af8606c1f075ca34a2d6b307a55e598e9f4817 (patch)
treeee8625609452aa73bec1184bb08a81c53113806c
parent48d05bad256444eb9a823f9c376522356e9be77e (diff)
parent5a51acd6433090edd6320bb9ac84e6f2c0fda136 (diff)
downloadforums-58af8606c1f075ca34a2d6b307a55e598e9f4817.tar
forums-58af8606c1f075ca34a2d6b307a55e598e9f4817.tar.gz
forums-58af8606c1f075ca34a2d6b307a55e598e9f4817.tar.bz2
forums-58af8606c1f075ca34a2d6b307a55e598e9f4817.tar.xz
forums-58af8606c1f075ca34a2d6b307a55e598e9f4817.zip
Merge pull request #3853 from marc1706/ticket/14075
[ticket/14075] Add template event after poll preview panel * marc1706/ticket/14075: [ticket/14075] Update version to 3.1.7-RC1 [ticket/14075] Add template event after poll preview panel
-rw-r--r--phpBB/docs/events.md8
-rw-r--r--phpBB/styles/prosilver/template/posting_preview.html2
-rw-r--r--phpBB/styles/subsilver2/template/posting_preview.html1
3 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 1466f783c3..b69cbf77c9 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1235,6 +1235,14 @@ posting_poll_body_options_after
* Since: 3.1.4-RC1
* Purpose: Add content after the poll options on creating a poll
+posting_preview_poll_after
+===
+* Locations:
+ + styles/prosilver/template/posting_preview.html
+ + styles/subsilver2/template/posting_preview.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the poll preview block
+
posting_topic_title_before
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html
index a5aae8c436..aac117c090 100644
--- a/phpBB/styles/prosilver/template/posting_preview.html
+++ b/phpBB/styles/prosilver/template/posting_preview.html
@@ -24,6 +24,8 @@
<!-- ENDIF -->
+<!-- EVENT posting_preview_poll_after -->
+
<div class="postbody">
<h3>{L_PREVIEW}{L_COLON} {PREVIEW_SUBJECT}</h3>
diff --git a/phpBB/styles/subsilver2/template/posting_preview.html b/phpBB/styles/subsilver2/template/posting_preview.html
index b0dbef6a5a..c451e4c871 100644
--- a/phpBB/styles/subsilver2/template/posting_preview.html
+++ b/phpBB/styles/subsilver2/template/posting_preview.html
@@ -38,6 +38,7 @@
</td>
</tr>
<!-- ENDIF -->
+<!-- EVENT posting_preview_poll_after -->
<tr>
<td class="row1">
<table width="100%" border="0" cellspacing="0" cellpadding="0">