diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:09:38 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:09:38 +0100 |
| commit | cf8904bc2c8f71af734feea95a5fba8272a8341a (patch) | |
| tree | 6de1075728ba549c836edca9fd327da0f6e1ec93 | |
| parent | 8049b5fd97a58fdf6b654d6d881450808ff5bf84 (diff) | |
| parent | ffbe1d424b831e0679df69565f14b1315635aa41 (diff) | |
| download | forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar.gz forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar.bz2 forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.tar.xz forums-cf8904bc2c8f71af734feea95a5fba8272a8341a.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/mcp_front.html
| -rw-r--r-- | phpBB/docs/events.md | 35 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_front.html | 10 |
2 files changed, 45 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index bc71b5b05f..7ee79813f5 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -431,6 +431,41 @@ mcp_ban_unban_before * Since: 3.1.0-RC3 * Purpose: Add additional fields to the unban form in MCP +mcp_front_latest_logs_after +=== +* Locations: + + styles/prosilver/template/mcp_front.html +* Since: 3.1.3-RC1 +* Purpose: Add content after latest logs list + +mcp_front_latest_logs_before +=== +* Locations: + + styles/prosilver/template/mcp_front.html +* Since: 3.1.3-RC1 +* Purpose: Add content before latest logs list + +mcp_front_latest_reported_before +=== +* Locations: + + styles/prosilver/template/mcp_front.html +* Since: 3.1.3-RC1 +* Purpose: Add content before latest reported posts list + +mcp_front_latest_reported_pms_before +=== +* Locations: + + styles/prosilver/template/mcp_front.html +* Since: 3.1.3-RC1 +* Purpose: Add content before latest reported private messages list + +mcp_front_latest_unapproved_before +=== +* Locations: + + styles/prosilver/template/mcp_front.html +* Since: 3.1.3-RC1 +* Purpose: Add content before latest unapproved posts list + memberlist_body_username_append === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 44295611cf..8fe7dfdf65 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -2,6 +2,8 @@ <h2>{PAGE_TITLE}</h2> +<!-- EVENT mcp_front_latest_unapproved_before --> + <!-- IF S_SHOW_UNAPPROVED --> <form id="mcp_queue" method="post" action="{S_MCP_QUEUE_ACTION}"> @@ -59,6 +61,8 @@ </form> <!-- ENDIF --> +<!-- EVENT mcp_front_latest_reported_before --> + <!-- IF S_SHOW_REPORTS --> <div class="panel"> <div class="inner"> @@ -100,6 +104,8 @@ </div> <!-- ENDIF --> +<!-- EVENT mcp_front_latest_reported_pms_before --> + <!-- IF S_SHOW_PM_REPORTS --> <div class="panel"> <div class="inner"> @@ -141,6 +147,8 @@ </div> <!-- ENDIF --> +<!-- EVENT mcp_front_latest_logs_before --> + <!-- IF S_SHOW_LOGS --> <div class="panel"> <div class="inner"> @@ -180,4 +188,6 @@ </div> <!-- ENDIF --> +<!-- EVENT mcp_front_latest_logs_after --> + <!-- INCLUDE mcp_footer.html --> |