diff options
| author | Nils Adermann <naderman@naderman.de> | 2009-07-21 20:59:11 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2009-07-21 20:59:11 +0000 |
| commit | 6e4a7c03d14d6fcc03955fbe26c3d5f725eb929d (patch) | |
| tree | 055fde9f035382ec59b83962cc4120022fbf7ced /phpBB/styles/subsilver2/template | |
| parent | 0ee8d7ab15caae94cdd381e9f449713c8838b611 (diff) | |
| download | forums-6e4a7c03d14d6fcc03955fbe26c3d5f725eb929d.tar forums-6e4a7c03d14d6fcc03955fbe26c3d5f725eb929d.tar.gz forums-6e4a7c03d14d6fcc03955fbe26c3d5f725eb929d.tar.bz2 forums-6e4a7c03d14d6fcc03955fbe26c3d5f725eb929d.tar.xz forums-6e4a7c03d14d6fcc03955fbe26c3d5f725eb929d.zip | |
Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/subsilver2/template')
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_front.html | 37 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_post.html | 33 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_reports.html | 14 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/report_body.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html | 2 |
5 files changed, 80 insertions, 10 deletions
diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html index 029ba3cb3c..aefc6ccd6c 100644 --- a/phpBB/styles/subsilver2/template/mcp_front.html +++ b/phpBB/styles/subsilver2/template/mcp_front.html @@ -85,6 +85,43 @@ <br clear="all" /><br /> <!-- ENDIF --> +<!-- IF S_SHOW_PM_REPORTS --> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <td class="row3" colspan="6" align="center"><b class="gen">{L_LATEST_REPORTED_PMS}</b></td> + </tr> + <tr> + <th> {L_PM_SUBJECT} </th> + <th> {L_PM_FROM} </th> + <th> {L_TO} & {L_BCC} </th> + <th> {L_SENT_AT} </th> + <th> {L_REPORTER} </th> + <th> {L_REPORT_TIME} </th> + </tr> + <!-- BEGIN pm_report --> + <tr> + <td class="row1" valign="top"><span class="gen">{pm_report.PM_SUBJECT}</span><br /><span class="gensmall">[ <a href="{pm_report.U_PM_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td> + <td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.PM_AUTHOR_FULL}</span></td> + <td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.RECIPIENTS}</span></td> + <td class="row2" align="center" width="10%" nowrap="nowrap" valign="top"><span class="gensmall">{pm_report.PM_TIME}</span></td> + <td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.REPORTER_FULL}</span></td> + <td class="row2" align="center" width="10%" nowrap="nowrap" valign="top"><span class="gensmall">{pm_report.REPORT_TIME}</span></td> + </tr> + <!-- BEGINELSE --> + <tr> + <td class="row1" colspan="6" align="center"><span class="gen">{L_PM_REPORTS_ZERO_TOTAL}</span></td> + </tr> + <!-- END pm_report --> + <!-- IF S_HAS_PM_REPORTS --> + <tr> + <td class="row3" colspan="6"><span class="gensmall">{L_PM_REPORTS_TOTAL}</span></td> + </tr> + <!-- ENDIF --> + </table> + + <br clear="all" /><br /> +<!-- ENDIF --> + <!-- IF S_SHOW_LOGS --> <table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="{S_CONTENT_FLOW_END}"> <tr> diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 6260c79d7d..d631ce262f 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -5,7 +5,7 @@ <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> <tr> - <th colspan="2" align="center">{L_REPORT_DETAILS}</th> + <th colspan="2" align="center"><!-- IF S_PM -->{L_PM_REPORT_DETAILS}<!-- ELSE -->{L_REPORT_DETAILS}<!-- ENDIF --></th> </tr> <tr> <td class="row1"><b class="gen">{L_REPORT_REASON}: </b></td> @@ -43,17 +43,17 @@ <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> <tr> - <th colspan="2" align="center">{L_POST_DETAILS}</th> + <th colspan="2" align="center"><!-- IF S_PM -->{L_PM}<!-- ELSE -->{L_POST_DETAILS}<!-- ENDIF --></th> </tr> <tr> - <td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td> + <td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <!-- IF S_PM --><a href="{U_VIEW_POST}">{L_VIEW_PM}</a><!-- ELSE --><a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td> </tr> <tr> - <td class="row1"><b class="gen">{L_POST_SUBJECT}: </b></td> + <td class="row1"><b class="gen"><!-- IF S_PM -->{L_PM_SUBJECT}<!-- ELSE -->{L_POST_SUBJECT}<!-- ENDIF -->: </b></td> <td class="row2"><span class="gen">{POST_SUBJECT}</span> <!-- IF S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span> <!-- ENDIF --> <!-- IF S_POST_REPORTED and not S_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --></td> </tr> <tr> - <td class="row1" width="20%"><b class="gen">{L_POSTER}: </b></td> + <td class="row1" width="20%"><b class="gen"><!-- IF S_PM -->{L_PM_FROM}<!-- ELSE -->{L_POSTER}<!-- ENDIF -->: </b></td> <td class="row2" width="80%"><span class="gen"<!-- IF POST_AUTHOR_COLOUR --> style="font-weight: bold; color: {POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{POST_AUTHOR}</span><span class="gen"> [ <!-- IF U_POST_AUTHOR --><a href="{U_POST_AUTHOR}">{L_READ_PROFILE}</a><!-- ENDIF --><!-- IF S_USER_NOTES --><!-- IF U_POST_AUTHOR --> | <!-- ENDIF --><a href="{U_MCP_USER_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_MCP_WARN_USER -->| <a href="{U_MCP_WARN_USER}">{L_WARN_USER}</a><!-- ENDIF --><!-- ENDIF --> ]</span></td> </tr> <!-- IF S_CAN_VIEWIP --> @@ -69,9 +69,30 @@ </tr> <!-- ENDIF --> <tr> - <td class="row1"><b class="gen">{L_POSTED}: </b></td> + <td class="row1"><b class="gen"><!-- IF S_PM -->{L_SENT_AT}<!-- ELSE -->{L_POSTED}<!-- ENDIF -->: </b></td> <td class="row2"><span class="postdetails">{POST_DATE}</span></td> </tr> +<!-- IF S_TO_RECIPIENT --> + <tr> + <td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_TO}:</b></td> + <td class="row2 gen"> + <!-- BEGIN to_recipient --> + <!-- IF to_recipient.IS_GROUP --><span class="sep"><a href="{to_recipient.U_VIEW}">{to_recipient.NAME}</a></span><!-- ELSE -->{to_recipient.NAME_FULL} <!-- ENDIF --> + <!-- END to_recipient --> + </td> + </tr> +<!-- ENDIF --> + +<!-- IF S_BCC_RECIPIENT --> + <tr> + <td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_BCC}:</b></td> + <td class="row2 gen"> + <!-- BEGIN bcc_recipient --> + <!-- IF bcc_recipient.IS_GROUP --><span class="sep"><a href="{bcc_recipient.U_VIEW}">{bcc_recipient.NAME}</a></span><!-- ELSE -->{bcc_recipient.NAME_FULL} <!-- ENDIF --> + <!-- END bcc_recipient --> + </td> + </tr> +<!-- ENDIF --> <tr> <th colspan="2" align="center">{L_PREVIEW}</th> </tr> diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html index 72b26e8751..1b6a3b82b6 100644 --- a/phpBB/styles/subsilver2/template/mcp_reports.html +++ b/phpBB/styles/subsilver2/template/mcp_reports.html @@ -7,11 +7,16 @@ <th colspan="5" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> </tr> <tr> - <td colspan="5" class="cat" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" /> <b>{L_ONLY_TOPIC}</b> <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> + <td colspan="5" class="cat" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- IF not S_PM --> <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" /> <b>{L_ONLY_TOPIC}</b> <!-- ENDIF --><!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> </tr> <tr> + <!-- IF S_PM --> + <th> {L_PM} </th> + <th> {L_TO} & {L_BCC} </th> + <!-- ELSE --> <th> {L_POST} </th> <th> {L_AUTHOR} </th> + <!-- ENDIF --> <th> {L_REPORTER} </th> <th> {L_REPORT_TIME} </th> <th width="5%"> {L_SELECT} </th> @@ -19,10 +24,17 @@ <!-- BEGIN postrow --> <!-- IF postrow.S_ROW_ is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <!-- IF S_PM --> + <td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEW_DETAILS}">{postrow.PM_SUBJECT}</a></p> + <span class="gensmall">{L_PM_FROM}: {postrow.PM_AUTHOR_FULL}</span></td> + <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><span class="gen">{postrow.RECIPIENTS}</span><br /> + <span class="gensmall">{L_SENT_AT}: {postrow.PM_TIME}</span></td> + <!-- ELSE --> <td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p> <span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td> <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br /> <span class="gensmall">{postrow.POST_TIME}</span></td> + <!-- ENDIF --> <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORTER_FULL}</span></td> <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORT_TIME}</span><br /> <span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td> diff --git a/phpBB/styles/subsilver2/template/report_body.html b/phpBB/styles/subsilver2/template/report_body.html index 6861d28ce1..7cd7d1040f 100644 --- a/phpBB/styles/subsilver2/template/report_body.html +++ b/phpBB/styles/subsilver2/template/report_body.html @@ -4,10 +4,10 @@ <table class="tablebg" width="100%" cellspacing="1"> <tr> - <th colspan="2">{L_REPORT_POST}</th> + <th colspan="2"><!-- IF S_REPORT_POST -->{L_REPORT_POST}<!-- ELSE -->{L_REPORT_MESSAGE}<!-- ENDIF --></th> </tr> <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_REPORT_POST_EXPLAIN}</span></td> + <td class="row3" colspan="2"><span class="gensmall"><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></span></td> </tr> <tr> <td class="row1" width="22%"><b class="gen">{L_REASON}:</b></td> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html index b3387681bc..4971506a6d 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html @@ -93,7 +93,7 @@ <table width="100%" cellspacing="0"> <tr valign="middle"> - <td class="gensmall" align="{S_CONTENT_FLOW_END}"> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td> + <td class="gensmall" align="{S_CONTENT_FLOW_END}"> <!-- IF U_REPORT --><a href="{U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --><!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td> </tr> </table> |
