1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 22:45:02 +02:00

Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/mcp_front.html
This commit is contained in:
Joas Schilling 2014-12-27 14:09:38 +01:00
commit cf8904bc2c
2 changed files with 45 additions and 0 deletions

View File

@ -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:

View File

@ -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 -->