diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 10:32:41 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 10:32:41 +0200 |
| commit | fdca5532e6cf3245f70ab185821c5b1b0ff83dba (patch) | |
| tree | 65fd88df6c58c3d003dae37f97a8b8b17c04ef73 | |
| parent | 1cc3d24cd859ed10b47aaa0117ab5647676447ee (diff) | |
| parent | b09e1ad26df8d92940985741eb8137ec947b5c4d (diff) | |
| download | forums-fdca5532e6cf3245f70ab185821c5b1b0ff83dba.tar forums-fdca5532e6cf3245f70ab185821c5b1b0ff83dba.tar.gz forums-fdca5532e6cf3245f70ab185821c5b1b0ff83dba.tar.bz2 forums-fdca5532e6cf3245f70ab185821c5b1b0ff83dba.tar.xz forums-fdca5532e6cf3245f70ab185821c5b1b0ff83dba.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/viewtopic_body.html
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 08b3ae96aa..06d30fc1fa 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1737,6 +1737,20 @@ viewtopic_body_footer_before * Purpose: Add content to the bottom of the View topic screen below the posts and quick reply, directly before the jumpbox in Prosilver. +viewtopic_body_poll_after +=== +* Locations: + + styles/prosilver/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 +* 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 index d2e8b08525..87a9e95dce 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -68,6 +68,8 @@ <!-- 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 @@ <hr /> <!-- ENDIF --> +<!-- EVENT viewtopic_body_poll_after --> + <!-- BEGIN postrow --> <!-- EVENT viewtopic_body_postrow_post_before --> <!-- IF postrow.S_FIRST_UNREAD --> |