[Phpbb-checkins] r9814 [2/2] - in /branches/phpBB-3_0_0/phpBB: ./ develop/ docs/ includes/ includes/acp/ includes/mcp/ includes/mcp/info/ includes/ucp/ install/ install/schemas/ language/en/ language/en/acp/ language/en/email/ styles/prosilver/template/ styles/subsilver2/template/

[Nils A. <nad...@ph...>]

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html Tue Jul 21 20:59:11 2009
***************
*** 85,90 ****
--- 85,127 ----
  	<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>&nbsp;{L_PM_SUBJECT}&nbsp;</th>
+ 		<th>&nbsp;{L_PM_FROM}&nbsp;</th>
+ 		<th>&nbsp;{L_TO} &amp; {L_BCC}&nbsp;</th>
+ 		<th>&nbsp;{L_SENT_AT}&nbsp;</th>
+ 		<th>&nbsp;{L_REPORTER}&nbsp;</th>
+ 		<th>&nbsp;{L_REPORT_TIME}&nbsp;</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>

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html Tue Jul 21 20:59:11 2009
***************
*** 5,11 ****
  
  	<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
  	<tr>
! 		<th colspan="2" align="center">{L_REPORT_DETAILS}</th>
  	</tr>
  	<tr>
  		<td class="row1"><b class="gen">{L_REPORT_REASON}: </b></td>
--- 5,11 ----
  
  	<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
  	<tr>
! 		<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,59 ****
  
  <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
  <tr>
! 	<th colspan="2" align="center">{L_POST_DETAILS}</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>
  </tr>
  <tr>
! 	<td class="row1"><b class="gen">{L_POST_SUBJECT}: </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="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"> &nbsp; [ <!-- 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 -->
--- 43,59 ----
  
  <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
  <tr>
! 	<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} | <!-- 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"><!-- 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"><!-- 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"> &nbsp; [ <!-- 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,77 ****
  	</tr>
  <!-- ENDIF -->
  <tr>
! 	<td class="row1"><b class="gen">{L_POSTED}: </b></td>
  	<td class="row2"><span class="postdetails">{POST_DATE}</span></td>
  </tr>
  <tr>
  	<th colspan="2" align="center">{L_PREVIEW}</th>
  </tr>
--- 69,98 ----
  	</tr>
  <!-- ENDIF -->
  <tr>
! 	<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}&nbsp;<!-- 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}&nbsp;<!-- ENDIF -->
+ 		<!-- END bcc_recipient -->
+ 		</td>
+ 	</tr>
+ <!-- ENDIF -->
  <tr>
  	<th colspan="2" align="center">{L_PREVIEW}</th>
  </tr>

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_reports.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_reports.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_reports.html Tue Jul 21 20:59:11 2009
***************
*** 7,17 ****
  	<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}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> &nbsp; <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <b>{L_ONLY_TOPIC}</b> &nbsp; <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
  </tr>
  <tr> 
  	<th>&nbsp;{L_POST}&nbsp;</th>
  	<th>&nbsp;{L_AUTHOR}&nbsp;</th>
  	<th>&nbsp;{L_REPORTER}&nbsp;</th>
  	<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
  	<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
--- 7,22 ----
  	<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}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- IF not S_PM -->&nbsp;<span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> &nbsp; <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <b>{L_ONLY_TOPIC}</b> &nbsp; <!-- ENDIF --><!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
  </tr>
  <tr> 
+ 	<!-- IF S_PM -->
+ 	<th>&nbsp;{L_PM}&nbsp;</th>
+ 	<th>&nbsp;{L_TO} &amp; {L_BCC}&nbsp;</th>
+ 	<!-- ELSE -->
  	<th>&nbsp;{L_POST}&nbsp;</th>
  	<th>&nbsp;{L_AUTHOR}&nbsp;</th>
+ 	<!-- ENDIF -->
  	<th>&nbsp;{L_REPORTER}&nbsp;</th>
  	<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
  	<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
***************
*** 19,28 ****
--- 24,40 ----
  <!-- 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>

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/report_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/report_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/report_body.html Tue Jul 21 20:59:11 2009
***************
*** 4,13 ****
  
  <table class="tablebg" width="100%" cellspacing="1">
  <tr>
! 	<th colspan="2">{L_REPORT_POST}</th>
  </tr>
  <tr>
! 	<td class="row3" colspan="2"><span class="gensmall">{L_REPORT_POST_EXPLAIN}</span></td>
  </tr>
  <tr>
  	<td class="row1" width="22%"><b class="gen">{L_REASON}:</b></td>
--- 4,13 ----
  
  <table class="tablebg" width="100%" cellspacing="1">
  <tr>
! 	<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"><!-- 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>

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html Tue Jul 21 20:59:11 2009
***************
*** 93,99 ****
  
  				<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>
  				</tr>
  				</table>
  
--- 93,99 ----
  
  				<table width="100%" cellspacing="0">
  				<tr valign="middle">
! 					<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>