1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-03 23:43:10 +02:00

Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Marc Alexander 2019-07-29 21:43:37 +02:00
commit 2e634e9f96
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 16 additions and 0 deletions

View File

@ -988,6 +988,20 @@ mcp_move_before
* Since: 3.1.10-RC1
* Purpose: Add content before move topic/post form
mcp_move_destination_forum_after
===
* Locations:
+ styles/prosilver/template/mcp_move.html
* Since: 3.2.8-RC1
* Purpose: Add content after the destination select element in the move topic/post form
mcp_move_destination_forum_before
===
* Locations:
+ styles/prosilver/template/mcp_move.html
* Since: 3.2.8-RC1
* Purpose: Add content before the destination select element in the move topic/post form
mcp_post_additional_options
===
* Locations:

View File

@ -43,12 +43,14 @@
<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
<fieldset>
{% EVENT mcp_move_destination_forum_before %}
<dl class="fields2">
<dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt>
<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->
<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF -->
</dl>
{% EVENT mcp_move_destination_forum_after %}
<dl class="fields2">
<dt>&nbsp;</dt>
<dd><strong>{MESSAGE_TEXT}</strong></dd>