diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-11 09:14:23 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-11 09:14:23 +0200 |
| commit | 81e045628d3ece7cbb6874725c2db49c71f65fe7 (patch) | |
| tree | 5a9291577cff52bfa04d5d38692fa0dba9bc8310 | |
| parent | 92b23df864d7f0d781956dca8663070d922f75cc (diff) | |
| parent | 972f04ec6a78f06bb5da25729ec1d8758514cdcb (diff) | |
| download | forums-81e045628d3ece7cbb6874725c2db49c71f65fe7.tar forums-81e045628d3ece7cbb6874725c2db49c71f65fe7.tar.gz forums-81e045628d3ece7cbb6874725c2db49c71f65fe7.tar.bz2 forums-81e045628d3ece7cbb6874725c2db49c71f65fe7.tar.xz forums-81e045628d3ece7cbb6874725c2db49c71f65fe7.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/mcp_forum.html
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_forum.html | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 11c72ca4ee..c1c2dcd989 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -479,6 +479,20 @@ mcp_ban_unban_before * Since: 3.1.0-RC3 * Purpose: Add additional fields to the unban form in MCP +mcp_forum_topic_title_before +=== +* Locations: + + styles/prosilver/template/mcp_forum.html +* Since: 3.1.6-RC1 +* Purpose: Add some information before the topic title + +mcp_forum_topic_title_after +=== +* Locations: + + styles/prosilver/template/mcp_forum.html +* Since: 3.1.6-RC1 +* Purpose: Add some information after the topic title + mcp_front_latest_logs_after === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index f0d8d45e40..f62ab11fa1 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -42,7 +42,9 @@ <div class="list-inner"> <!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a> <!-- ENDIF --> + <!-- EVENT mcp_forum_topic_title_before --> <a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> + <!-- EVENT mcp_forum_topic_title_after --> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> <!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.DELETED_IMG}</a> <!-- ENDIF --> <!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> |