diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 09:09:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 09:09:08 +0200 |
| commit | 1cc3d24cd859ed10b47aaa0117ab5647676447ee (patch) | |
| tree | 69276b5de626f7afd53b85bc9c7fd9a41fae3f88 /phpBB | |
| parent | 1a9bc8a7adf001f2ff77f5f98f82321c302277e6 (diff) | |
| parent | 583068da9d071d3350bddad8b411e8430083a174 (diff) | |
| download | forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar.gz forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar.bz2 forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.tar.xz forums-1cc3d24cd859ed10b47aaa0117ab5647676447ee.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/mcp_topic.html
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index b28cb7e3a1..08b3ae96aa 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -563,6 +563,20 @@ mcp_post_additional_options * Since: 3.1.5-RC1 * 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 === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 25f865e054..c21b676370 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -54,10 +54,12 @@ </dl> <!-- ENDIF --> + <!-- EVENT mcp_topic_options_before --> <dl> <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> </dl> + <!-- EVENT mcp_topic_options_after --> <dl> <dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt> <dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd> @@ -153,9 +155,9 @@ <div class="action-bar bottom"> <div class="pagination"> {TOTAL_POSTS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> |