Various changes, and tests ... marking/tracking is not complete ... tinkering, changing, etc. still to be done ... it's just I've made numerous and various changes to different files so a commit really is due

git-svn-id: file:///svn/phpbb/trunk@3953 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2003-04-26 01:17:40 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2003-04-26 01:17:40 +0000
commit: 5362625eabd86278d9f7cbc7175e02e3b5f613ca (patch)
tree: 34adeecdc30441ba7c4b497b986415d7608b933a /phpBB/templates/subSilver
parent: 4e43cb51536fdfff64d8560b054ad601949deb6d (diff)
download: forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar
forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar.gz
forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar.bz2
forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar.xz
forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.zip
6 files changed, 70 insertions, 81 deletions
diff --git a/phpBB/templates/subSilver/index_body.html b/phpBB/templates/subSilver/index_body.html
index 8ee2906ab9..9e48288e6b 100644
--- a/phpBB/templates/subSilver/index_body.html
+++ b/phpBB/templates/subSilver/index_body.html
@@ -35,7 +35,7 @@
 			</table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
 		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
 		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
-		<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"><span class="gensmall"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POSTER --><a href="{forumrow.U_LAST_POSTER}">{forumrow.LAST_POSTER}</a><!-- ELSE -->{forumrow.LAST_POSTER}<!-- ENDIF --><a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span></td>
+		<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"><span class="gensmall"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POSTER --><a href="{forumrow.U_LAST_POSTER}">{forumrow.LAST_POSTER}</a><!-- ELSE -->{forumrow.LAST_POSTER}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- BEGINELSE -->
diff --git a/phpBB/templates/subSilver/report.html b/phpBB/templates/subSilver/report.html
deleted file mode 100644
index a1c3863929..0000000000
--- a/phpBB/templates/subSilver/report.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form action="{S_POST_ACTION}" name="main" method="post">
-
-{ERROR_BOX}
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr>
-		<td class="nav" width="100%" align="left" valign="middle">&nbsp; &nbsp;<a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
-	</tr>
-</table>
-
-<table border="0" cellpadding="3" cellspacing="1" width="100%" class="tablebg">
-	<tr>
-		<th colspan="2" height="25">{L_REPORT_TO_ADMIN}</th>
-	</tr>
-	<tr>
-		<td class="row2" colspan="2" align="center"><span class="gen">&nbsp;{L_REPORT_TO_ADMIN_EXPLAIN}&nbsp;</span></td>
-	</tr>
-	<tr>
-		<td class="row1" width="22%"><span class="gen"><b>{L_REASON}</b></span></td>
-		<td class="row2" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}">{reason.DESCRIPTION}</option><!-- END reason --></select></td>
-	</tr>
-	<!-- IF S_CAN_NOTIFY -->
-	<tr>
-		<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
-		<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
-			<tr valign="middle"> 
-				<td><input type="checkbox" name="notify" /></td>
-				<td><span class="gen">{L_REPORT_NOTIFY}</span></td>
-			</tr>
-		</table></td>
-	</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td class="row1" valign="top"><span class="gen"><b>{L_ADDITIONAL_INFOS}</b></span><br /><span class="gensmall">{L_CAN_BE_LEFT_BLANK}</span></td>
-		<td class="row2"><span class="gen"><textarea name="description" rows="25" cols="40" wrap="virtual" style="width:500px" class="post">{MESSAGE}</textarea></span></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center" height="28"><input type="submit" name="submit" class="mainoption" value="{L_REPORT_TO_ADMIN}" />&nbsp;<input type="submit" name="cancel" class="liteoption" value="{L_CANCEL}"></td>
-	</tr>
-</table>
-
-<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
-	<tr>
-		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
-	</tr>
-</table></form>
-
-<table width="100%" cellspacing="2" border="0" align="center">
-	<tr>
-		<td valign="top" align="right">{JUMPBOX}</td>
-	</tr>
-</table>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/templates/subSilver/report_body.html b/phpBB/templates/subSilver/report_body.html
new file mode 100644
index 0000000000..e38baa303e
--- /dev/null
+++ b/phpBB/templates/subSilver/report_body.html
@@ -0,0 +1,51 @@
+<!-- INCLUDE overall_header.html -->
+
+<form action="{S_POST_ACTION}" name="main" method="post">
+
+{ERROR_BOX}
+
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+	<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>
+
+<table border="0" cellpadding="3" cellspacing="1" width="100%" class="tablebg">
+	<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>
+		<td class="row2" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}">{reason.DESCRIPTION}</option><!-- END reason --></select></td>
+	</tr>
+	<!-- IF S_CAN_NOTIFY -->
+	<tr>
+		<td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td>
+		<td class="row2"><span class="gen"><input type="radio" name="notify" value="1" />{L_YES} &nbsp;<input type="radio" name="notify" value="0" checked="checked" />{L_NO}</span></td>
+	</tr>
+	<!-- ENDIF -->
+	<tr>
+		<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}:</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td>
+		<td class="row2"><textarea class="post" style="width:500px" name="description" rows="25" cols="40"  class="post">{MESSAGE}</textarea></td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2" align="center" height="28"><input type="submit" name="submit" class="mainoption" value="{L_SUBMIT}" />&nbsp;<input type="submit" name="cancel" class="liteoption" value="{L_CANCEL}"></td>
+	</tr>
+</table>
+
+<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+	<tr>
+		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
+	</tr>
+</table></form>
+
+<table width="100%" cellspacing="2" border="0" align="center">
+	<tr>
+		<td valign="top" align="right">{JUMPBOX}</td>
+	</tr>
+</table>
+
+<!-- INCLUDE overall_footer.html -->
+\ No newline at end of file
diff --git a/phpBB/templates/subSilver/viewforum_body.html b/phpBB/templates/subSilver/viewforum_body.html
index cd949f814e..853f7b34b1 100644
--- a/phpBB/templates/subSilver/viewforum_body.html
+++ b/phpBB/templates/subSilver/viewforum_body.html
@@ -139,6 +139,7 @@
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
+		<td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td>
 		<td align="right"><!-- INCLUDE jumpbox.html --></td>
 	</tr>
 </table>
diff --git a/phpBB/templates/subSilver/viewforum_subforum.html b/phpBB/templates/subSilver/viewforum_subforum.html
index 227f32f7aa..4a902fd398 100644
--- a/phpBB/templates/subSilver/viewforum_subforum.html
+++ b/phpBB/templates/subSilver/viewforum_subforum.html
@@ -21,7 +21,7 @@
 			</table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
 		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
 		<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
-		<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> <span class="gensmall">{forumrow.LAST_POST}</span></td>
+		<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME --><span class="gensmall">{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POSTER --><a href="{forumrow.U_LAST_POSTER}">{forumrow.LAST_POSTER}</a><!-- ELSE -->{forumrow.LAST_POSTER}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a></span><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- END forumrow -->
diff --git a/phpBB/templates/subSilver/viewtopic_body.html b/phpBB/templates/subSilver/viewtopic_body.html
index f6bb84430f..f3034414c8 100644
--- a/phpBB/templates/subSilver/viewtopic_body.html
+++ b/phpBB/templates/subSilver/viewtopic_body.html
@@ -91,7 +91,7 @@
 	<!-- ELSEIF postrow.S_WRONG_ENCODING  -->
 		<td colspan="2" height="25" align="center"><span class="gensmall">{postrow.L_IGNORE_POST}</span></td>
 	<!-- ELSE -->
-		<td rowspan="2" 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 rowspan="2" width="150" align="left" valign="top"><a name="{postrow.U_POST_ID}"></a><b class="name">{postrow.POSTER_NAME}</b><span class="postdetails"><br />{postrow.POSTER_RANK}<br />{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /><br />{L_JOINED}: {postrow.POSTER_JOINED}<!-- IF postrow.POSTER_POSTS --><br />{L_POSTS}: {postrow.POSTER_POSTS}<!-- ENDIF --><!-- IF postrow.POSTER_FROM --><br />{L_LOCATION}: {postrow.POSTER_FROM}<!-- ENDIF --></span></td>
 		<td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
 				<td>{postrow.POST_ICON}&nbsp;</td>
@@ -106,35 +106,27 @@
 	<tr class="row2">
 	<!-- ENDIF -->
 		<td><table width="100%" cellspacing="0" cellpadding="5" border="0">
-			<!-- IF postrow.S_POST_UNAPPROVED -->
 			<tr>
-				<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr align="left" valign="middle">
-						<td>{UNAPPROVED_IMG}</td>
-						<td class="gensmall" width="100%">&nbsp;{L_POST_NOT_BEEN_APPROVED}&nbsp;[ <a href="{postrow.U_MCP_APPROVE}">{L_APPROVE_POST}</a> ]</td>
-					</tr>
-				</table></td>
-			</tr>
-			<!-- ENDIF -->
-			<!-- IF postrow.S_POST_REPORTED -->
-			<tr>
-				<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr align="left" valign="middle">
-						<td>{REPORTED_IMG}</td>
-						<td class="gensmall" width="100%">&nbsp;{L_POST_BEEN_REPORTED}&nbsp;[ <a href="{postrow.U_MCP_REPORT}">{L_READ_REPORTS}</a> ]</td>
-					</tr>
-				</table></td>
-			</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td height="100" valign="top"><table width="100%" cellspacing="0" cellpadding="2">
+				<td height="120" valign="top"><table width="100%" cellspacing="0" cellpadding="2">
 					<tr>
 						<td><span class="postbody">{postrow.MESSAGE}</span><!-- IF postrow.S_HAS_ATTACHMENTS --><!-- INCLUDE viewtopic_attach_body.html --><!-- ENDIF --><!-- IF postrow.SIGNATURE --><span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span><!-- ENDIF --><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
 					</tr>
 				</table></td>
 			</tr>
 			<tr>
-				<td align="right" valign="bottom"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><span class="gensmall"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
+				<td><table width="100%" cellspacing="0" cellpadding="0" border="0" >
+					<tr valign="middle">
+						<!-- IF postrow.S_POST_UNAPPROVED -->
+						<td width="5">{UNAPPROVED_IMG}</td>
+						<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:green"  href="{postrow.U_MCP_APPROVE}">{L_POST_NOT_APPROVED}</a></b>&nbsp;</td>
+						<!-- ENDIF -->
+						<!-- IF postrow.S_POST_REPORTED -->
+						<td width="5">{REPORTED_IMG}</td>
+						<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:red" href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></b>&nbsp;</td>
+						<!-- ENDIF -->
+						<td align="right" nowrap="nowrap"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><span class="gensmall"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
+					</tr>
+				</table></td>
 			</tr>
 		</table></td>
 	</tr>
@@ -193,6 +185,7 @@
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
+		<td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td>
 		<td align="right"><!-- INCLUDE jumpbox.html --></td>
 	</tr>
 </table>
author	Paul S. Owen <psotfx@users.sourceforge.net>	2003-04-26 01:17:40 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2003-04-26 01:17:40 +0000
commit	5362625eabd86278d9f7cbc7175e02e3b5f613ca (patch)
tree	34adeecdc30441ba7c4b497b986415d7608b933a /phpBB/templates/subSilver
parent	4e43cb51536fdfff64d8560b054ad601949deb6d (diff)
download	forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar.gz forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar.bz2 forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.tar.xz forums-5362625eabd86278d9f7cbc7175e02e3b5f613ca.zip