merged topic and post review

git-svn-id: file:///svn/phpbb/trunk@4543 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2003-10-09 16:56:40 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2003-10-09 16:56:40 +0000
commit: f0e6b45dcfb81ac132553ceccf7f573b490d524c (patch)
tree: 3c9cc8d3f84b311bfa99e1948aeaaacf073b9dbb
parent: 736b1262e4647c86ba6951ad02c2f8dcc10a3f90 (diff)
download: forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar
forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar.gz
forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar.bz2
forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar.xz
forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.zip
2 files changed, 178 insertions, 141 deletions
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index 72794b5133..db1d745705 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -42,108 +42,140 @@ function checkForm()
 </script>
 <script language="javascript" type="text/javascript" src="styles/subSilver/template/editor.js"></script>
 
-<form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)" {S_FORM_ENCTYPE}><table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr>
-		<td colspan="2" align="left" valign="bottom"><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- IF TOPIC_TITLE --> :: <a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ENDIF --><!-- IF MODERATORS neq '' --><br /><b class="gensmall">{L_MODERATORS}: {MODERATORS}</b><br /><!-- ENDIF --></td>
-	</tr>
-	<tr>
-		<td class="nav" width="100%" align="left" valign="middle"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
-	</tr>
+<form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)" {S_FORM_ENCTYPE}>
+
+<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<tr>
+	<td colspan="2" align="left" valign="bottom"><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- IF TOPIC_TITLE --> :: <a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ENDIF --><!-- IF MODERATORS neq '' --><br /><b class="gensmall">{L_MODERATORS}: {MODERATORS}</b><br /><!-- ENDIF --></td>
+</tr>
+<tr>
+	<td class="nav" width="100%" align="left" valign="middle"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
+</tr>
 </table>
 
 <!-- IF S_DRAFT_SAVED -->
 <table class="tablebg" width="95%" border="0" cellspacing="1" cellpadding="4" align="center">
-	<tr>
-		<th height="28" align="center">{L_INFORMATION}</th>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><span class="gen">{L_DRAFT_SAVED}</span></td>
-	</tr>
-	<tr>
-		<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-	</tr>
-	<tr> 
-		<td class="row2" align="center"><span class="gen">{L_DRAFT_TITLE_EXPLAIN}<br /><br />{L_ENTER_DRAFT_TITLE}&nbsp;&nbsp;</span><input class="post" style="width:450px" type="text" name="draft_title" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /><br /><br />
+<tr>
+	<th height="28" align="center">{L_INFORMATION}</th>
+</tr>
+<tr>
+	<td class="row1" align="center"><span class="gen">{L_DRAFT_SAVED}</span></td>
+</tr>
+<tr>
+	<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+</tr>
+<tr> 
+	<td class="row2" align="center"><span class="gen">{L_DRAFT_TITLE_EXPLAIN}<br /><br />{L_ENTER_DRAFT_TITLE}&nbsp;&nbsp;</span><input class="post" style="width:450px" type="text" name="draft_title" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /><br /><br />
 		<input class="btnmain" type="submit" name="draft_save" value="{L_UPDATE}" />
 		<input type="hidden" name="draft_title_update" value="1" />
 		<input type="hidden" name="draft_id" value="{DRAFT_ID}" />
-		</td>
-	</tr>
+	</td>
+</tr>
 </table>
 <br />
 <!-- ENDIF -->
 
 <!-- IF S_POST_REVIEW -->
 <table class="tablebg" width="95%" border="0" cellspacing="1" cellpadding="4" align="center">
-	<tr>
-		<th height="28" align="center">{L_POST_REVIEW}</th>
-	</tr>
-	<tr> 
-		<td class="row1">&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><span class="gen">{L_POST_REVIEW_EXPLAIN}</span></td>
-	</tr>
-	<tr> 
-		<td class="row1">&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-	</tr>
-	<tr>
-		<td class="row2">
-
-			<table class="tablebg" width="100%" cellpadding="2" cellspacing="1" border="0">
+<tr>
+	<th height="28" align="center">{L_POST_REVIEW}</th>
+</tr>
+<tr>
+	<td class="row1" align="center"><span class="gen">{L_POST_REVIEW_EXPLAIN}</span></td>
+</tr>
+<tr>
+	<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+</tr>
+<tr>
+	<td class="row1">
+		<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+		<tr>
+			<th width="22%" height="28">{L_AUTHOR}</th>
+			<th>{L_MESSAGE}</th>
+		</tr>
+		<!-- BEGIN post_review_row -->
+		<!-- IF post_review_row.S_ROW_COUNT is even -->
+		<tr class="row1">
+		<!-- ELSE -->
+		<tr class="row2">
+		<!-- ENDIF -->
+			<td rowspan="2" align="left" valign="top"><a name="{post_review_row.U_POST_ID}"></a>
+				<table width="150" cellspacing="0" cellpadding="4" border="0">
 				<tr>
-					<th width="22%" height="28">{L_AUTHOR}</th>
-					<th>{L_MESSAGE}</th>
+					<td align="center"><b class="postauthor">{post_review_row.POSTER_NAME}</b></td>
 				</tr>
-				<!-- BEGIN post_postrow -->
-				<!-- IF post_postrow.S_ROW_COUNT is even -->
-				<tr class="row1">
-				<!-- ELSE -->
-				<tr class="row2">
-				<!-- ENDIF -->
-					<td width="22%" align="left" valign="top"><span class="name"><a name="{post_postrow.U_POST_ID}"></a><b>{post_postrow.POSTER_NAME}</b></span></td>
-					<td height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
-							<td width="100%">{post_postrow.MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {post_postrow.POST_DATE}<span class="gen">&nbsp;</span>&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {post_postrow.POST_SUBJECT}</span></td>
-						</tr>
-						<tr>
-							<td colspan="2"><hr /></td>
-						</tr>
+				<tr>
+					<td align="center">{post_review_row.KARMA_IMG}</td>
+				</tr>
+				</table>
+			</td>
+			<td width="100%" height="28">
+				<table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<tr>
+					<td>&nbsp;</td>
+					<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
+					<td class="gensmall" width="100%" valign="middle">{post_review_row.POST_SUBJECT}</td>
+					<td>&nbsp;</td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		<!-- IF post_review_row.S_ROW_COUNT is even -->
+		<tr class="row1">
+		<!-- ELSE -->
+		<tr class="row2">
+		<!-- ENDIF -->
+			<td valign="top">
+				<table width="100%" cellspacing="0" cellpadding="5" border="0">
+				<tr>
+					<td valign="top">
+						<table width="100%" cellspacing="0" cellpadding="2">
 						<tr>
-							<td colspan="2"><span class="postbody">{post_postrow.MESSAGE}</span></td>
+							<td class="postbody">{post_review_row.MESSAGE}</td>
 						</tr>
-					</table></td>
+						</table>
+					</td>
 				</tr>
 				<tr>
-					<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+					<td>
+						<table width="100%" cellspacing="0" cellpadding="0" border="0">
+						<tr valign="middle">
+							<td width="100%">&nbsp;</td>
+							<td width="10" nowrap="nowrap"><a href="{post_review_row.U_MINI_POST}" target="post_review">{post_review_row.MINI_POST_IMG}</a></td>
+							<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {post_review_row.POST_DATE}</td>
+						</tr>
+						</table>
+					</td>
 				</tr>
-				 <!-- END post_postrow -->
-			</table>
-
-		</td>
-	</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+		</tr>
+		<!-- END post_review_row -->
+		</table>
+	</td>
+</tr>
 </table>
 <br />
 <!-- ENDIF -->
 
 <!-- IF S_UNGLOBALISE -->
 <table class="tablebg" width="95%" border="0" cellspacing="1" cellpadding="4" align="center">
-	<tr>
-		<th height="28" align="center">{L_MOVE}</th>
-	</tr>
-	<tr>
-		<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-	</tr>
-	<tr> 
-		<td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
-		<input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" />
-		&nbsp;&nbsp; 
-		<input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" />
-		</td>
-	</tr>
+<tr>
+	<th height="28" align="center">{L_MOVE}</th>
+</tr>
+<tr>
+	<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+</tr>
+<tr> 
+	<td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
+	<input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" />
+	&nbsp;&nbsp; 
+	<input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" />
+	</td>
+</tr>
 </table>
 <br />
 <!-- ENDIF -->
diff --git a/phpBB/styles/subSilver/template/posting_topic_review.html b/phpBB/styles/subSilver/template/posting_topic_review.html
index 5b4e38d0a6..9a871baf6d 100644
--- a/phpBB/styles/subSilver/template/posting_topic_review.html
+++ b/phpBB/styles/subSilver/template/posting_topic_review.html
@@ -1,12 +1,5 @@
 <!-- $Id$ -->
 
-<table class="tablebg" width="95%" border="0" cellpadding="3" cellspacing="1" align="center">
-	<tr>
-		<th height="28" align="center">{L_TOPIC_REVIEW}</th>
-	</tr>
-	<tr>
-		<td class="row1"><div style="overflow: auto; width: 100%; height: 300px; border: 1px;">
-
 <script language="JavaScript" type="text/javascript">
 <!--
 
@@ -60,68 +53,80 @@ function addquote(post_id, username) {
 //-->
 </script>
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th width="22%" height="28">{L_AUTHOR}</th>
-		<th>{L_MESSAGE}</th>
-	</tr>
-	<!-- BEGIN postrow -->
-	<!-- IF postrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-		<td rowspan="2" align="left" valign="top"><a name="{postrow.U_POST_ID}"></a>
-		
-			<table width="150" cellspacing="0" cellpadding="4" border="0">
+<table class="tablebg" width="95%" border="0" cellpadding="3" cellspacing="1" align="center">
+<tr>
+	<th height="28" align="center">{L_TOPIC_REVIEW} - {TOPIC_TITLE}</th>
+</tr>
+<tr>
+	<td class="row1"><div style="overflow: auto; width: 100%; height: 300px; border: 1px;">
+
+		<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+		<tr>
+			<th width="22%" height="28">{L_AUTHOR}</th>
+			<th>{L_MESSAGE}</th>
+		</tr>
+		<!-- BEGIN topic_review_row -->
+		<!-- IF topic_review_row.S_ROW_COUNT is even -->
+		<tr class="row1">
+		<!-- ELSE -->
+		<tr class="row2">
+		<!-- ENDIF -->
+			<td rowspan="2" align="left" valign="top"><a name="{topic_review_row.U_POST_ID}"></a>
+				<table width="150" cellspacing="0" cellpadding="4" border="0">
 				<tr>
-					<td align="center"><b class="postauthor">{postrow.POSTER_NAME}</b></td>
+					<td align="center"><b class="postauthor">{topic_review_row.POSTER_NAME}</b></td>
 				</tr>
 				<tr>
-					<td align="center">{postrow.KARMA_IMG}</td>
+					<td align="center">{topic_review_row.KARMA_IMG}</td>
 				</tr>
-			</table>
-		</td>
-		<td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td>&nbsp;</td>
-				<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
-				<td class="gensmall" width="100%" valign="middle">{postrow.POST_SUBJECT}</td>
-				<td valign="top" nowrap="nowrap">&nbsp;<!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td>
-			</tr>
-		</table></td>
-	</tr>
-	<!-- IF postrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-
-		<td valign="top"><table width="100%" cellspacing="0" cellpadding="5" border="0">
-			<tr>
-				<td valign="top"><table width="100%" cellspacing="0" cellpadding="2">
-					<tr>
-						<td><div id="message_{postrow.POST_ID}" class="postbody">{postrow.MESSAGE}</div></td>
-					</tr>
-				</table></td>
-			</tr>
-			<tr>
-				<td><table width="100%" cellspacing="0" cellpadding="0" border="0">
-					<tr valign="middle">
-						<td width="100%">&nbsp;</td>
-						<td width="10" nowrap="nowrap"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a></td>
-						<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
-					</tr>
-				</table></td>
-			</tr>
-		</table></td>
-	</tr>
-	<tr>
-		<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-	</tr>
-	 <!-- END postrow -->
-</table>
-
+				</table>
+			</td>
+			<td width="100%" height="28">
+				<table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<tr>
+					<td>&nbsp;</td>
+					<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
+					<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
+					<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.U_QUOTE --><a href="{topic_review_row.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		<!-- IF topic_review_row.S_ROW_COUNT is even -->
+		<tr class="row1">
+		<!-- ELSE -->
+		<tr class="row2">
+		<!-- ENDIF -->
+			<td valign="top">
+				<table width="100%" cellspacing="0" cellpadding="5" border="0">
+				<tr>
+					<td valign="top">
+						<table width="100%" cellspacing="0" cellpadding="2">
+						<tr>
+							<td><div id="message_{topic_review_row.POST_ID}" class="postbody">{topic_review_row.MESSAGE}</div></td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<table width="100%" cellspacing="0" cellpadding="0" border="0">
+						<tr valign="middle">
+							<td width="100%">&nbsp;</td>
+							<td width="10" nowrap="nowrap"><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a></td>
+							<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+		</tr>
+		<!-- END topic_review_row -->
+		</table>
 	</div></td>
 </tr>
 </table>
author	Meik Sievertsen <acydburn@phpbb.com>	2003-10-09 16:56:40 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2003-10-09 16:56:40 +0000
commit	f0e6b45dcfb81ac132553ceccf7f573b490d524c (patch)
tree	3c9cc8d3f84b311bfa99e1948aeaaacf073b9dbb
parent	736b1262e4647c86ba6951ad02c2f8dcc10a3f90 (diff)
download	forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar.gz forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar.bz2 forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.tar.xz forums-f0e6b45dcfb81ac132553ceccf7f573b490d524c.zip