aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-09 20:59:14 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-08-09 20:59:14 +0200
commit32c3267295d20b14a9552f4fc4c66feb7713c550 (patch)
tree398e2b799341e5878f1157b6512bb96c6cac7621 /phpBB
parent1956bd4bbab091bd4bb9095e6413f59ec24b53fc (diff)
parentedeeff597f070f27a28aceb17e9acdb78233128b (diff)
downloadforums-32c3267295d20b14a9552f4fc4c66feb7713c550.tar
forums-32c3267295d20b14a9552f4fc4c66feb7713c550.tar.gz
forums-32c3267295d20b14a9552f4fc4c66feb7713c550.tar.bz2
forums-32c3267295d20b14a9552f4fc4c66feb7713c550.tar.xz
forums-32c3267295d20b14a9552f4fc4c66feb7713c550.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/posting_body.html
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/events.md7
-rw-r--r--phpBB/styles/prosilver/template/posting_layout.html2
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 743db977dc..11c72ca4ee 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1037,6 +1037,13 @@ posting_poll_body_options_after
* Since: 3.1.4-RC1
* Purpose: Add content after the poll options on creating a poll
+posting_topic_title_before
+===
+* Locations:
+ + styles/prosilver/template/posting_layout.html
+* Since: 3.1.6-RC1
+* Purpose: Allows to add some information on the left of the topic title in the posting form
+
quickreply_editor_panel_after
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html
index 34f0c63d5c..19a7351d78 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"><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></h2>
<!-- ELSE -->
<h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
<!-- ENDIF -->