From a1df726e9fb280ee02743b7562e31b15610bfba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= <dhn2@users.sourceforge.net>
Date: Wed, 11 Oct 2006 22:35:41 +0000
Subject: [PATCH] Some subsilver fixes: #4628 #4448 #4014

git-svn-id: file:///svn/phpbb/trunk@6482 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_language.html             |  27 +++++++++++-------
 .../subSilver/template/forumlist_body.html    |   2 +-
 .../subSilver/template/overall_footer.html    |   3 +-
 .../subSilver/theme/images/cellpic2_rtl.jpg   | Bin 0 -> 601 bytes
 phpBB/styles/subSilver/theme/stylesheet.css   |   9 ++++--
 5 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 phpBB/styles/subSilver/theme/images/cellpic2_rtl.jpg

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 76eb7c7b84..22cbd3921c 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -44,7 +44,7 @@
 	</dl>
 	<dl>
 		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
-		<dd><b>{LANG_ISO}</b></dd>
+		<dd><strong>{LANG_ISO}</strong></dd>
 	</dl>
 	<dl>
 		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
@@ -85,7 +85,7 @@
 		<tbody>
 		<!-- BEGIN missing -->
 			<tr class="row4">
-				<td><b>{missing.FILE}</b></td>
+				<td><strong>{missing.FILE}</strong></td>
 				<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
 			</tr>
 			{missing.TPL}
@@ -131,8 +131,12 @@
 		</tr>
 	<!-- ENDIF -->
 	<tr>
-		<td class="row3"><b>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></b></td>
-		<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /><!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method">&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
+		<td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
+		<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+	</tr>
+	<tr>
+		<td class="row3" style="text-align: right;">	
+		<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
 	</tr>
 	</thead>
 	<tbody>
@@ -144,7 +148,10 @@
 		{TPL}
 	<!-- ENDIF -->
 	<tr>
-		<td class="row3" colspan="3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /><!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio" value="{buttons.VALUE}" name="method">&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
+		<td class="row3" colspan="3" style="text-align: right;"><!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio" value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
+	</tr>
+	<tr>
+		<td class="row3" colspan="3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
 	</tr>
 	</tbody>
 	</table>
@@ -173,7 +180,7 @@
 		<legend>{L_UPLOAD_SETTINGS}</legend>
 	<dl>
 		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><b>{NAME}</b></dd>
+		<dd><strong>{NAME}</strong></dd>
 	</dl>
 	<!-- BEGIN data -->
 	<dl>
@@ -209,27 +216,27 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td class="row3" colspan="5"><b>{L_INSTALLED_LANGUAGE_PACKS}</b></td>
+		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
 	</tr>
 	<!-- BEGIN lang -->
 		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
 		<td>{lang.LOCAL_NAME}</td>
-		<td style="text-align: center;"><b>{lang.ISO}</b></td>
+		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
 		<td style="text-align: center;">{lang.USED_BY}</td>
 		<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END lang -->
 	<!-- IF .notinst -->
 	<tr>
-		<td class="row3" colspan="5"><b>{L_UNINSTALLED_LANGUAGE_PACKS}</b></td>
+		<td class="row3" colspan="5"><strong>{L_UNINSTALLED_LANGUAGE_PACKS}</strong></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- BEGIN notinst -->
 		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td>{notinst.NAME}</td>
 		<td>{notinst.LOCAL_NAME}</td>
-		<td style="text-align: center;"><b>{notinst.ISO}</b></td>
+		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
 		<td colspan="2" style="text-align: center;"><a href="{notinst.U_INSTALL}">{L_INSTALL}</a></td>
 	</tr>
 	<!-- END notinst -->
diff --git a/phpBB/styles/subSilver/template/forumlist_body.html b/phpBB/styles/subSilver/template/forumlist_body.html
index 5d0108d1f9..acddb62c24 100644
--- a/phpBB/styles/subSilver/template/forumlist_body.html
+++ b/phpBB/styles/subSilver/template/forumlist_body.html
@@ -12,7 +12,7 @@
 	<!-- IF forumrow.S_IS_CAT -->
 		<tr>
 			<td class="cat" colspan="2"><h4><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></h4></td>
-			<td class="catdiv" colspan="3">&nbsp;</td>
+			<td <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->class="catdiv-rtl"<!-- ELSE -->class="catdiv"<!-- ENDIF --> colspan="3">&nbsp;</td>
 		</tr>
 	<!-- ELSEIF forumrow.S_IS_LINK -->
 		<tr>
diff --git a/phpBB/styles/subSilver/template/overall_footer.html b/phpBB/styles/subSilver/template/overall_footer.html
index cdb39a7aa4..2669864e11 100644
--- a/phpBB/styles/subSilver/template/overall_footer.html
+++ b/phpBB/styles/subSilver/template/overall_footer.html
@@ -15,7 +15,8 @@
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
 	<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_blank">phpBB</a> &copy; 2002, 2006 phpBB Group
-	{L_TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span>
+	<!-- IF L_TRANSLATION_INFO --><br />{L_TRANSLATION_INFO}<!-- ENDIF -->
+	<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span>
 </div>
 
 </body>
diff --git a/phpBB/styles/subSilver/theme/images/cellpic2_rtl.jpg b/phpBB/styles/subSilver/theme/images/cellpic2_rtl.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..201e0637252df0b5f71a19e1d145dabb33f0434e
GIT binary patch
literal 601
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfx!_d^p1hgF(p4Kl_BK-
zP=xXSZH5*GRu&KdlC12kK+MU;%F4#c#lgYJ!NJAL#SH{pygWQSAk5D%D9Fz*E+!@>
zE(r&WY;0^?oLs`ZyuxCFe1c+d31S)l4=@OFFi0}|VrCR%U=n0x7G(T?gdv%M5dwe?
zg#u<KMs_w1uqaFjOfxbw2{1A+F|shSFvBGnnG6LLnS~t#6NQ{UG#UvqGQy=G495Sr
z7<ib0`UIH;8SEMUPJ;;Z`7w4LFtiBqI;Eb$k}KU5*6P)}xKMBplh^{)EU!i83zSVt
z+0?pJP3D#fZ8qJ)@oXBiH{*xv3QsQZH^?*CF?`v^+W<C6W)8D)gWsthAC0LCgtjo1
zwR%lmp%k`2J&Q?v*{ja8wp&@=9)EuIits%B+>oS-BWwJ{w=J@iDSn(_wb$Vl^9sHN
zRt>M%7Z~I~oW*R$re+q{+2EH5B)l&0_%d1t1}!%cv@UEa_GPqueEm?5zu5kOqKa+*
z9OtdS&>kS`aONZ96?Pz9%KYZ$7KkZ~-OTetCFU>-x4NY>OnD+X=YYCJ$QnPEqykPq
X9iEE7jx+x%8<O8LaDbKD|Gx<U^)ZVc

literal 0
HcmV?d00001

diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css
index 239ed7570d..2ca1a36e6e 100644
--- a/phpBB/styles/subSilver/theme/stylesheet.css
+++ b/phpBB/styles/subSilver/theme/stylesheet.css
@@ -36,9 +36,11 @@ body {
 }
 
 #wrapheader {
-	height: 120px;
+	height: 115px;
 	background-image: url('./images/background.gif');
+	background-position: 0 2px;
 	background-repeat: repeat-x;
+	background-color: #dfe4e9;
 	padding: 0 25px 15px 25px;
 }
 
@@ -293,7 +295,7 @@ td {
 	background-color: #A9B8C2;
 }
 
-.catdiv {
+.catdiv, .catdiv-rtl {
 	height: 28px;
 	margin: 0px;
 	padding: 0px;
@@ -302,6 +304,9 @@ td {
 	background-image: url('./images/cellpic2.jpg');
 	background-repeat: repeat-y;
 }
+.catdiv-rtl {
+	background-image: url('./images/cellpic2_rtl.jpg');
+}
 
 .cat {
 	height: 28px;