makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10452] Fix xHTML errors when print-viewing PMs

Conflicts:
	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
This commit is contained in:
Andreas Fischer 2011-11-14 22:01:36 +01:00
commit 08827fa733
2 changed files with 41 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
View file

@ -1,117 +1,54 @@
<!DOCTYPE html> <!DOCTYPE html>
<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
<head> <head>
<title>{SITENAME} :: {PAGE_TITLE}</title>
<style type="text/css"> <meta http-equiv="imagetoolbar" content="no" />
/* <![CDATA[ */ <meta name="resource-type" content="document" />
body { <meta name="distribution" content="global" />
font-family: Verdana,serif; <meta name="keywords" content="" />
font-size: 10pt; <meta name="description" content="" />
} <meta name="robots" content="noindex" />
{META}
td { <title>{SITENAME} &bull; {PAGE_TITLE}</title>
font-family: Verdana,serif;
font-size: 10pt;
line-height: 150%;
}
.code, .quote {
font-size: smaller;
border: black solid 1px;
}
.forum {
font-family: Arial,Helvetica,sans-serif;
font-weight: bold;
font-size: 18pt;
}
.topic {
font-family: Arial,Helvetica,sans-serif;
font-size: 14pt;
font-weight: bold;
}
.gensmall {
font-size: 8pt;
}
hr {
color: #888888;
height: 3px;
border-style: solid;
}
hr.sep {
color: #AAAAAA;
height: 1px;
border-style: dashed;
}
/* ]]> */
</style>
<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
</head> </head>
<body>
<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> <body id="phpbb">
<tr> <div id="wrap">
<td colspan="2" align="center"><span class="forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td> <a id="top" name="top" accesskey="t"></a>
</tr>
<tr>
<td colspan="2"><br /></td>
</tr>
<tr>
<td><span class="topic">{SUBJECT}</span><br /></td>
<td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td>
</tr>
</table>
<hr width="85%" /> <div id="page-header">
<h1>{SITENAME}</h1>
<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> <h2>{TOPIC_TITLE}</h2>
<tr> <p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
<td width="10%" nowrap="nowrap">{L_PM_FROM}:&nbsp;</td> </div>
<td><strong>{MESSAGE_AUTHOR}</strong> [ {SENT_DATE} ]</td>
</tr>
<!-- IF S_TO_RECIPIENT --> <div id="page-body">
<tr> <div class="page-number">{PAGE_NUMBER}</div>
<td width="10%" nowrap="nowrap">{L_TO}:</td> <div class="post">
<td> <h3>{SUBJECT}</h3>
<!-- BEGIN to_recipient --> <div class="date">{L_SENT_AT} <strong>{SENT_DATE}</strong></div>
<span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->>{to_recipient.NAME}</span>&nbsp; <div class="author">{L_PM_FROM} <strong>{MESSAGE_AUTHOR}</strong></div>
<!-- END to_recipient --> <!-- IF S_TO_RECIPIENT -->
</td> <div class="author">{L_TO} <strong><!-- BEGIN to_recipient -->{to_recipient.NAME}&nbsp;<!-- END to_recipient --></strong></div>
</tr> <!-- ENDIF -->
<!-- ENDIF --> <!-- IF S_BCC_RECIPIENT -->
<div class="author">{L_BCC} <strong><!-- BEGIN bcc_recipient -->{bcc_recipient.NAME}&nbsp;<!-- END bcc_recipient --></strong></div>
<!-- ENDIF -->
<hr />
<div class="content">{MESSAGE}</div>
</div>
<hr />
</div>
<!-- IF S_BCC_RECIPIENT --> <div id="page-footer">
<tr> <div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
<td width="10%" nowrap="nowrap">{L_BCC}:</td> <div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div>
<td> </div>
<!-- BEGIN bcc_recipient --> </div>
<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp;
<!-- END bcc_recipient -->
</td>
</tr>
<!-- ENDIF -->
<tr>
<td colspan="2"><hr class="sep" />{MESSAGE}</td>
</tr>
</table>
<hr width="85%" />
<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
<tr>
<td><span class="gensmall">{PAGE_NUMBER}</span></td>
<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
<tr>
<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
</tr>
</table>
</body> </body>
</html> </html>

2
phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
View file

@ -59,7 +59,7 @@ hr.sep {
<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
<tr> <tr>
<td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td> <td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><br /></td> <td colspan="2"><br /></td>