From 4feb08390cbd72224b5d8147ba274f0558b6cbb5 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 11 Apr 2003 06:07:58 +0000
Subject: re-use include...

git-svn-id: file:///svn/phpbb/trunk@3813 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/templates/subSilver/viewtopic_attach_body.html | 12 +++++-------
 phpBB/templates/subSilver/viewtopic_body.html        |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'phpBB/templates/subSilver')

diff --git a/phpBB/templates/subSilver/viewtopic_attach_body.html b/phpBB/templates/subSilver/viewtopic_attach_body.html
index eb91497d1b..c94d378f5c 100644
--- a/phpBB/templates/subSilver/viewtopic_attach_body.html
+++ b/phpBB/templates/subSilver/viewtopic_attach_body.html
@@ -1,6 +1,6 @@
 <br /><br />
 <!-- BEGIN attachment -->
-<hr /><br />
+<hr />
 	<!-- IF postrow.attachment.IS_DENIED -->
 		<span class="postbody">[{postrow.attachment.L_DENIED}]</span><br /><br />
 	<!-- ENDIF -->
@@ -18,21 +18,19 @@
 		<param name="Loop" value="0"> 
 		<embed type="application/x-mplayer2" pluginspage="http://www.microsoft.com/windows95/downloads/contents/wurecommended/s_wufeatured/mediaplayer/default.asp" src="{postrow.attachment.U_DOWNLOAD_LINK}" name=MediaPlayer2 showcontrols=1 showdisplay=0 showstatusbar=1 autosize=1 autostart=0 visible=1 animationatstart=0 loop=0></embed> 
 		</object>
-		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ELSEIF postrow.attachment.IS_IMAGE -->
 		<span class="postbody">{postrow.attachment.COMMENT}<br />
 		<img src="{postrow.attachment.U_DOWNLOAD_LINK}" alt="{postrow.attachment.DOWNLOAD_NAME}" /></span>
-		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ELSEIF postrow.attachment.IS_THUMBNAIL -->
 		<span class="postbody">{postrow.attachment.COMMENT}<br />
 		<a href="{postrow.attachment.U_DOWNLOAD_LINK}" target="_blank"><img src="{postrow.attachment.IMG_THUMB_SRC}" alt="{postrow.attachment.DOWNLOAD_NAME}" border="0" /></a></span>
-		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ELSE -->
 		<span class="postbody">{postrow.attachment.COMMENT}</span><br />
 		<span class="postbody">{postrow.attachment.UPLOAD_IMG}
 		<a href="{postrow.attachment.U_DOWNLOAD_LINK}" target="_blank">{postrow.attachment.DOWNLOAD_NAME}</a> - {postrow.attachment.FILESIZE} {postrow.attachment.SIZE_VAR}<br /></span>
-		<span class="gensmall">{postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<span class="gensmall">{postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ENDIF -->
-
-	{postrow.attachment.HELLO}
 <!-- END attachment -->
diff --git a/phpBB/templates/subSilver/viewtopic_body.html b/phpBB/templates/subSilver/viewtopic_body.html
index 6318bf794b..848a45f6de 100644
--- a/phpBB/templates/subSilver/viewtopic_body.html
+++ b/phpBB/templates/subSilver/viewtopic_body.html
@@ -128,7 +128,7 @@
 			</tr>
 			<!-- ENDIF -->
 			<tr>
-				<td><span class="postbody">{postrow.MESSAGE}<!-- IF postrow.S_HAS_ATTACHMENTS --></span><!-- MERGE_INCLUDE viewtopic_attach_body.html --><span class="postbody"><!-- ENDIF -->{postrow.SIGNATURE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
+				<td><span class="postbody">{postrow.MESSAGE}<!-- IF postrow.S_HAS_ATTACHMENTS --></span><!-- INCLUDE viewtopic_attach_body.html --><span class="postbody"><!-- ENDIF -->{postrow.SIGNATURE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
 			</tr>
 		</table></td>
 	</tr>
-- 
cgit v1.2.1