diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-20 10:08:47 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-20 10:08:47 +0200 |
| commit | 5ae821ee2890947d840f315e843c5e820882307a (patch) | |
| tree | ca7c480cd1a6ab8071296bc13813868d1bbb2d8d | |
| parent | aaa13be1ec2c850390fcee6481d9241ee6551f9e (diff) | |
| parent | 00aab15f7c4e66a60a20224f50f79f9f0730ed9e (diff) | |
| download | forums-5ae821ee2890947d840f315e843c5e820882307a.tar forums-5ae821ee2890947d840f315e843c5e820882307a.tar.gz forums-5ae821ee2890947d840f315e843c5e820882307a.tar.bz2 forums-5ae821ee2890947d840f315e843c5e820882307a.tar.xz forums-5ae821ee2890947d840f315e843c5e820882307a.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/mcp_topic.html
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 57db80d255..dbcf346b72 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -535,6 +535,20 @@ mcp_post_additional_options * Since: 3.1.5-RC1 * Purpose: Add content within the list of post moderation actions +mcp_topic_topic_title_after +=== +* Locations: + + styles/prosilver/template/mcp_topic.html +* Since: 3.1.6-RC1 +* Purpose: Add some information after the topic title + +mcp_topic_topic_title_before +=== +* Locations: + + styles/prosilver/template/mcp_topic.html +* Since: 3.1.6-RC1 +* Purpose: Add some information before the topic title + mcp_warn_post_add_warning_field_after === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 082bea22f1..25f865e054 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -87,7 +87,7 @@ <h3 id="review"> <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> - {L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE} + {L_TOPIC_REVIEW}{L_COLON} <!-- EVENT mcp_topic_topic_title_before -->{TOPIC_TITLE}<!-- EVENT mcp_topic_topic_title_after --> </h3> <div id="topicreview"> |