diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-08-28 15:44:49 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-08-28 15:44:49 +0200 |
| commit | 7c79e7844cfc4e7c2fcd6b508fbbf596f7e10c00 (patch) | |
| tree | 214e41fe2c595ccde736da3638aa98864a178c22 | |
| parent | 08c6f56f4bada72b08ed71ee4515ef0150dc354e (diff) | |
| parent | 71a70500ea946a02a46257f883f90a3936528ac0 (diff) | |
| download | forums-7c79e7844cfc4e7c2fcd6b508fbbf596f7e10c00.tar forums-7c79e7844cfc4e7c2fcd6b508fbbf596f7e10c00.tar.gz forums-7c79e7844cfc4e7c2fcd6b508fbbf596f7e10c00.tar.bz2 forums-7c79e7844cfc4e7c2fcd6b508fbbf596f7e10c00.tar.xz forums-7c79e7844cfc4e7c2fcd6b508fbbf596f7e10c00.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/docs/events.md | 28 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_topic_review.html | 3 |
3 files changed, 35 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d5aa0c3aec..7108254196 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -835,6 +835,20 @@ mcp_topic_options_before * Since: 3.1.6-RC1 * Purpose: Add some options (field, checkbox, ...) before the subject field when split a subject +mcp_topic_postrow_post_details_after +=== +* Locations: + + styles/prosilver/template/mcp_topic.html +* Since: 3.1.10-RC1 +* Purpose: Add content after post details in topic moderation + +mcp_topic_postrow_post_details_before +=== +* Locations: + + styles/prosilver/template/mcp_topic.html +* Since: 3.1.10-RC1 +* Purpose: Add content before post details in topic moderation + mcp_topic_topic_title_after === * Locations: @@ -1449,6 +1463,20 @@ posting_preview_poll_after * Since: 3.1.7-RC1 * Purpose: Add content after the poll preview block +posting_topic_review_row_post_details_after +=== +* Locations: + + styles/prosilver/template/posting_topic_review.html +* Since: 3.1.10-RC1 +* Purpose: Add content after post details in topic review + +posting_topic_review_row_post_details_before +=== +* Locations: + + styles/prosilver/template/posting_topic_review.html +* Since: 3.1.10-RC1 +* Purpose: Add content before post details in topic review + posting_topic_title_after === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 32e5f0236c..c3050a8891 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -112,11 +112,15 @@ </ul> <h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3> + + <!-- EVENT mcp_topic_postrow_post_details_before --> <p class="author"> <a href="#pr{postrow.POST_ID}" title="{postrow.MINI_POST}"> <i class="icon fa-file fa-fw icon-lightgray icon-tiny" aria-hidden="true"></i><span class="sr-only">{postrow.MINI_POST}</span> </a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --> </p> + <!-- EVENT mcp_topic_postrow_post_details_after --> + <!-- IF postrow.S_POST_UNAPPROVED --> <p class="post-notice unapproved"> <a href="{postrow.U_MCP_APPROVE}"><i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><strong>{L_POST_UNAPPROVED}</strong></a> diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index dae0095105..3d7856d27a 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -43,6 +43,7 @@ </ul> <!-- ENDIF --> + <!-- EVENT posting_topic_review_row_post_details_before --> <p class="author"> <!-- IF S_IS_BOT --> <span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{topic_review_row.MINI_POST}</span></span> @@ -53,6 +54,8 @@ <!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> » {topic_review_row.POST_DATE} </p> + <!-- EVENT posting_topic_review_row_post_details_after --> + <div class="content">{topic_review_row.MESSAGE}</div> <!-- IF topic_review_row.S_HAS_ATTACHMENTS --> |