Generally related to post tables merge

git-svn-id: file:///svn/phpbb/trunk@3538 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-30 21:40:43 +02:00 · 2003-02-26 00:37:43 +00:00
parent dca34f5db9
commit 5b0d02baa2
10 changed files with 206 additions and 383 deletions
--- a/phpBB/templates/subSilver/posting_body.html
+++ b/phpBB/templates/subSilver/posting_body.html
@@ -5,7 +5,7 @@

 // Define the bbCode tags
 bbcode = new Array();
-bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]');
+bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[flash]','[/flash]','[url]','[/url]');
 imageTag = false;

 // Helpline messages
@@ -106,10 +106,11 @@ function checkForm()
 				<td><input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" /></td>
 				<td><input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" /></td>
 				<td><input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onclick="bbstyle(14)" onmouseover="helpline('p')" /></td>
-				<td><input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" /></td>
+				<td><input type="button" class="button" accesskey="f" name="addbbcode16" value="Flash" style="width: 40px"  onclick="bbstyle(16)" onmouseover="helpline('p')" /></td>
+				<td><input type="button" class="button" accesskey="w" name="addbbcode18" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(18)" onmouseover="helpline('w')" /></td>
 			</tr>
 			<tr>
-				<td colspan="9"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td colspan="10"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td><span class="genmed"> &nbsp;{L_FONT_SIZE}:</span> <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')">
 							<option value="7">{L_FONT_TINY}</option>
@@ -123,11 +124,11 @@ function checkForm()
 				</table></td>
 			</tr>
 			<tr>
-				<td colspan="9" width="450"><input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /></td>
+				<td colspan="10" width="450"><input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /></td>
 				<td align="center"><span class="genmed">{L_FONT_COLOR}</span></td>
 			</tr>
 			<tr>
-				<td colspan="9"><textarea style="width:450px" name="message" rows="15" cols="35" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{MESSAGE}</textarea></td>
+				<td colspan="10"><textarea style="width:450px" name="message" rows="15" cols="35" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{MESSAGE}</textarea></td>
 				<td width="100%" align="center" valign="top"><table cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td bgcolor="black"><script language="javascript" type="text/javascript"><!--
--- a/phpBB/templates/subSilver/posting_topic_review.html
+++ b/phpBB/templates/subSilver/posting_topic_review.html
@@ -2,7 +2,7 @@
 <!-- IF S_DISPLAY_INLINE -->
 <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
 	<tr>
-		<td class="catHead" height="28" align="center"><b><span class="cattitle">{L_TOPIC_REVIEW}</span></b></td>
+		<td class="cat" height="28" align="center"><b><span class="cattitle">{L_TOPIC_REVIEW}</span></b></td>
 	</tr>
 	<tr>
 		<td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}">
@@ -13,10 +13,10 @@

 <!-- ENDIF -->

-<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
+<table class="tablebg" width="100%" cellpadding="2" cellspacing="1" border="0">
 	<tr>
-		<th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th>
-		<th class="thCornerR">{L_MESSAGE}</th>
+		<th width="22%" height="26">{L_AUTHOR}</th>
+		<th>{L_MESSAGE}</th>
 	</tr>
 	<!-- BEGIN postrow -->
 	<!-- IF postrow.S_ROW_COUNT is even -->
@@ -38,7 +38,7 @@
 		</table></td>
 	</tr>
 	<tr>
-		<td colspan="2" height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td>
+		<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
 	</tr>
 	 <!-- END postrow -->
 </table>
--- a/phpBB/templates/subSilver/simple_footer.html
+++ b/phpBB/templates/subSilver/simple_footer.html
@@ -1,5 +1,5 @@

-<div align="center"><span class="copyright"><br />
+<br clear="all" /><div class="copyright" align="center">
 <!--
 	We request you retain the full copyright notice below including the link to www.phpbb.com.
 	This not only gives respect to the large amount of time given freely by the developers
@@ -10,7 +10,7 @@

 	The phpBB Group : 2002
 // -->
-Powered by <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2002 phpBB Group</span></div>
+Powered by <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> {PHPBB_VERSION} &copy; 2002 phpBB Group</div>
 		</td>
 	</tr>
 </table>
--- a/phpBB/templates/subSilver/simple_header.html
+++ b/phpBB/templates/subSilver/simple_header.html
@@ -12,11 +12,12 @@
 <!--
 {T_STYLESHEET_DATA}

-body {margin:0px;padding:0px;border:0px}
+body {background: white;}
 //-->
 </style>
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 </head>

-<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}">
-<span class="gen"><a name="top"></a></span>
+<body>
+
+<a name="top"></a>
--- a/phpBB/templates/subSilver/viewtopic_body.html
+++ b/phpBB/templates/subSilver/viewtopic_body.html
@@ -86,20 +86,16 @@
 		<th nowrap="nowrap">{L_MESSAGE}</th>
 	</tr>
 	<!-- BEGIN postrow -->
+	<!-- IF postrow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
 	<!-- IF postrow.S_BELOW_MIN_KARMA -->
-	<!-- IF postrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
 		<td colspan="2" height="25" align="center"><span class="gensmall">{postrow.L_IGNORE_POST}</span></td>
-	</tr>
+	<!-- ELSEIF postrow.S_WRONG_ENCODING  -->
+		<td colspan="2" height="25" align="center"><span class="gensmall">{postrow.L_IGNORE_POST}</span></td>
 	<!-- ELSE -->
-	<!-- IF postrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
 		<td width="150" align="left" valign="top"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span><br /><span class="postdetails">{postrow.POSTER_RANK}<br />{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /><br />{postrow.POSTER_JOINED}<br />{postrow.POSTER_POSTS}<br />{postrow.POSTER_FROM}</span><br /></td>
 		<td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
 			<tr>
@@ -133,8 +129,8 @@
 				<td width="100%" align="right" nowrap="nowrap"><!-- span class="gensmall">{postrow.RATING}</span -->&nbsp;</td>
 			</tr>
 		</table></td>
-	</tr>
 	<!-- ENDIF -->
+	</tr>
 	<tr>
 		<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
 	</tr>