mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_front.html
This commit is contained in:
Joas Schilling
2014-12-27 14:09:38 +01:00
parent 8049b5fd97 ffbe1d424b
commit cf8904bc2c
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/styles/prosilver/template/mcp_front.html
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 -->