makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 22:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
This commit is contained in:
Marc Alexander 2015-08-22 09:09:08 +02:00
commit 1cc3d24cd8
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/docs/events.md
View file

@ -563,6 +563,20 @@ mcp_post_additional_options
* Since: 3.1.5-RC1 * Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions * Purpose: Add content within the list of post moderation actions
mcp_topic_options_after
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some options (field, checkbox, ...) after the subject field when split a subject
mcp_topic_options_before
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some options (field, checkbox, ...) before the subject field when split a subject
mcp_topic_topic_title_after mcp_topic_topic_title_after
=== ===
* Locations: * Locations:

6
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -54,10 +54,12 @@
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT mcp_topic_options_before -->
<dl> <dl>
<dt><label for="subject">{L_SPLIT_SUBJECT}{L_COLON}</label></dt> <dt><label for="subject">{L_SPLIT_SUBJECT}{L_COLON}</label></dt>
<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd> <dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd>
</dl> </dl>
<!-- EVENT mcp_topic_options_after -->
<dl> <dl>
<dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt> <dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt>
<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd> <dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
@ -153,9 +155,9 @@
<div class="action-bar bottom"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_POSTS} {TOTAL_POSTS}
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
&bull; {PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>