From 9f82dec04b18813c060e5a090a149c1a2c140689 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 30 Mar 2007 10:49:06 +0000
Subject: some changes/bugfixes

git-svn-id: file:///svn/phpbb/trunk@7241 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/subSilver/template/attachment.html      | 8 ++++----
 phpBB/styles/subSilver/template/posting_body.html    | 4 ++++
 phpBB/styles/subSilver/template/posting_buttons.html | 7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subSilver/template/attachment.html b/phpBB/styles/subSilver/template/attachment.html
index daa2bacdef..0b1ef32c0e 100644
--- a/phpBB/styles/subSilver/template/attachment.html
+++ b/phpBB/styles/subSilver/template/attachment.html
@@ -11,12 +11,12 @@
 
 		<!-- IF _file.S_THUMBNAIL -->
 			<a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" /></a><br />
-			<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT} ]</span>
+			<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
 		<!-- ENDIF -->
 
 		<!-- IF _file.S_IMAGE -->
 			<img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" /><br />
-			<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT} ]</span>
+			<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
 		<!-- ENDIF -->
 
 		<!-- IF _file.S_FILE -->
@@ -24,7 +24,7 @@
 				<!-- IF _file.UPLOAD_ICON -->{_file.UPLOAD_ICON} <!-- ENDIF -->
 				<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [{_file.FILESIZE} {_file.SIZE_LANG}]
 			</span><br />
-			<span class="gensmall">{_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT}</span>
+			<span class="gensmall">{_file.L_DOWNLOAD_COUNT}</span>
 		<!-- ENDIF -->
 
 		<!-- IF _file.S_WM_FILE -->
@@ -111,7 +111,7 @@
 		<!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE -->
 			<br />
 			<!-- IF _file.S_QUICKTIME_FILE --><a href="javascript:play_qt_file(document.qtstream_{_file.ATTACH_ID});">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
-			<span class="gensmall"><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT} ]</span>
+			<span class="gensmall"><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
 		<!-- ENDIF -->
 
 		<br />
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index 494671dff8..d7fb9e0e45 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -212,6 +212,7 @@
 		<!-- INCLUDE posting_buttons.html -->
 		<tr>
 			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" style="width: 98%;">{MESSAGE}</textarea></td>
+			<!-- IF S_BBCODE_ALLOWED -->
 			<td width="80" align="center" valign="top">
 				<script type="text/javascript">
 				<!--
@@ -219,6 +220,7 @@
 				//-->
 				</script>
 			</td>
+			<!-- ENDIF -->
 	 	</tr>
 		</table>
 	</td>
@@ -238,6 +240,7 @@
 		<tr>
 			<td class="gensmall">{BBCODE_STATUS}</td>
 		</tr>
+		<!-- IF S_BBCODE_ALLOWED -->
 		<tr>
 			<td class="gensmall">{IMG_STATUS}</td>
 		</tr>
@@ -250,6 +253,7 @@
 		<tr>
 			<td class="gensmall">{SMILIES_STATUS}</td>
 		</tr>
+		<!-- ENDIF -->
 		</table>
 	</td>
 	<td class="row2">
diff --git a/phpBB/styles/subSilver/template/posting_buttons.html b/phpBB/styles/subSilver/template/posting_buttons.html
index e076b2a660..dce4efb02f 100644
--- a/phpBB/styles/subSilver/template/posting_buttons.html
+++ b/phpBB/styles/subSilver/template/posting_buttons.html
@@ -48,7 +48,7 @@
 		</script>
 		<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
-	
+<!-- IF S_BBCODE_ALLOWED -->
 		<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
 		<input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
 		<input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
@@ -75,9 +75,10 @@
 			<option value="150">{L_FONT_LARGE}</option>
 			<option value="200">{L_FONT_HUGE}</option>
 		</select></span>
+<!-- ENDIF -->
 	</td>
 </tr>
-<!-- IF .custom_tags -->
+<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
 	<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
 		<td colspan="2">
 		<!-- BEGIN custom_tags -->
@@ -86,9 +87,11 @@
 		</td>
 	</tr>
 <!-- ENDIF -->
+<!-- IF S_BBCODE_ALLOWED -->
 <tr>
 	<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td>
 	<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
 		<td class="genmed" align="center">{L_FONT_COLOR}</td>
 	<!-- ENDIF -->
 </tr>
+<!-- ENDIF -->
-- 
cgit v1.2.1