aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-09-12 13:24:29 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-12 13:24:29 +0200
commit087a42a8877a3e84fcea64d20e50330dea2bd175 (patch)
tree3285f050a8ed05fbeaab1ff43e321262f5759b99 /phpBB
parent8f6b50922ffc7d6c55fdfecf09ccde293546db24 (diff)
parentc166adf3c7e9e9bdb188c4b0eb434147fadb4c74 (diff)
downloadforums-087a42a8877a3e84fcea64d20e50330dea2bd175.tar
forums-087a42a8877a3e84fcea64d20e50330dea2bd175.tar.gz
forums-087a42a8877a3e84fcea64d20e50330dea2bd175.tar.bz2
forums-087a42a8877a3e84fcea64d20e50330dea2bd175.tar.xz
forums-087a42a8877a3e84fcea64d20e50330dea2bd175.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/posting_body.html
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/events.md8
-rw-r--r--phpBB/styles/prosilver/template/posting_layout.html2
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 7203e7758e..b99c6bc6d5 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1128,6 +1128,14 @@ posting_preview_poll_after
* Since: 3.1.7-RC1
* Purpose: Add content after the poll preview block
+posting_topic_title_after
+===
+* Locations:
+ + styles/prosilver/template/posting_layout.html
+ + styles/subsilver2/template/posting_body.html
+* Since: 3.1.7-RC1
+* Purpose: Allows to add some information after the topic title in the posting form
+
posting_topic_title_before
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html
index 19a7351d78..22da32076c 100644
--- a/phpBB/styles/prosilver/template/posting_layout.html
+++ b/phpBB/styles/prosilver/template/posting_layout.html
@@ -1,7 +1,7 @@
<!-- INCLUDE overall_header.html -->
<!-- IF TOPIC_TITLE -->
- <h2 class="posting-title"><!-- EVENT posting_topic_title_before --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
+ <h2 class="posting-title"><!-- EVENT posting_topic_title_before --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT posting_topic_title_after --></h2>
<!-- ELSE -->
<h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
<!-- ENDIF -->