1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
This commit is contained in:
Marc Alexander 2015-08-09 20:59:14 +02:00
commit 32c3267295
2 changed files with 8 additions and 1 deletions

View File

@ -1037,6 +1037,13 @@ posting_poll_body_options_after
* Since: 3.1.4-RC1 * Since: 3.1.4-RC1
* Purpose: Add content after the poll options on creating a poll * 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 quickreply_editor_panel_after
=== ===
* Locations: * Locations:

View File

@ -1,7 +1,7 @@
<!-- INCLUDE overall_header.html --> <!-- INCLUDE overall_header.html -->
<!-- IF TOPIC_TITLE --> <!-- 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 --> <!-- ELSE -->
<h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2> <h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
<!-- ENDIF --> <!-- ENDIF -->