From 65921ae67a98fa1aa9010ffd433e6420dd224e81 Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Sun, 13 Nov 2011 20:10:51 +0100
Subject: [ticket/10453] PM viewmessage page is misplacing the online icon

PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
---
 .../prosilver/template/ucp_pm_message_header.html  | 29 +++++++++++-----------
 .../prosilver/template/ucp_pm_viewfolder.html      |  1 -
 .../prosilver/template/ucp_pm_viewmessage.html     | 11 +++++---
 phpBB/styles/prosilver/theme/colours.css           |  6 -----
 phpBB/styles/prosilver/theme/cp.css                | 27 +++-----------------
 5 files changed, 24 insertions(+), 50 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index fcebab0868..a1017d4b44 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -1,25 +1,28 @@
 <h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
 
-<div class="panel clearfix pm-panel-header<!-- IF S_VIEW_MESSAGE --> pm<!-- ENDIF -->">
+<form id="viewfolder" method="post" action="{S_PM_ACTION}">
+
+<div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
-
+	<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
+		<div class="reply-all">
+			<ul class="linklist">
+				<li><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></li>	
+			</ul>
+		</div>
+	<!-- ENDIF -->
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
-			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
+			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
 			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
 			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
 		</div>
-
-		<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
-			<div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">&raquo; {L_REPLY_TO_ALL}</a></div>
-		<!-- ENDIF -->
-
 	<!-- ENDIF -->
 
-		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-	<ul class="linklist pm-return-to">
+	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
+	<ul class="linklist">
 		<li class="rightside pagination">
 			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
 			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
@@ -28,8 +31,4 @@
 			<!-- ENDIF -->
 		</li>
 	</ul>
-		<!-- ENDIF -->
-	</div>
-</div>
-
-<form id="viewfolder" method="post" action="{S_PM_ACTION}">
+	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index d7e02e405e..c9f28cec64 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -2,7 +2,6 @@
 
 <!-- IF not PROMPT -->
 	<!-- INCLUDE ucp_pm_message_header.html -->
-	<div class="panel pm-panel-message"><div>
 <!-- ENDIF -->
 
 <!-- IF PROMPT -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index df0cf25e82..79c2c0355f 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -1,18 +1,21 @@
-	<!-- INCLUDE ucp_header.html -->
+<!-- INCLUDE ucp_header.html -->
 
 <!-- INCLUDE ucp_pm_message_header.html -->
 
+		<span class="corners-bottom"><span></span></span></div>
+</div>
+
 
 <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
-	<fieldset class="display-options clearfix bg1 pm-message-nav">
+	<fieldset class="display-options clearfix">
 		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
 		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 
 
-<div id="post-{MESSAGE_ID}" class="panel clearfix post pm-panel-message pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
-<div>
+<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
+<div class="inner"><span class="corners-top"><span></span></span>
 
 	<div class="postbody">
 
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index e98ce237bc..b9e4491feb 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -884,12 +884,6 @@ dl.mini dt {
 	color: #000000 !important;
 }
 
-/* PM panel adjustments */
-.pm-panel-header,
-#cp-main .pm-message-nav {
-	border-bottom-color: #A4B3BF;
-}
-
 /* PM marking colours */
 .pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
 	border-left-color: #BC2A4D;
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index b574b0ae1f..9d04371115 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -349,31 +349,10 @@ dl.mini dd {
 }
 
 /* PM panel adjustments */
-.pm-panel-header {
-	margin: 0; 
-	padding-bottom: 10px; 
-	border-bottom: 1px dashed #A4B3BF;
-}
-
 .reply-all {
-	display: block; 
-	padding-top: 4px; 
-	clear: both;
-	float: left;
-}
-
-.pm-panel-message {
-	padding-top: 10px;
-}
-
-.pm-return-to {
-	padding-top: 23px;
-}
-
-#cp-main .pm-message-nav {
-	margin: 0; 
-	padding: 2px 10px 5px 10px; 
-	border-bottom: 1px dashed #A4B3BF;
+	margin-bottom: -60px;
+	position: absolute;
+	margin-left: 200px;
 }
 
 /* PM Message history */
-- 
cgit v1.2.1


From c0ffc8386ccad6a6a3070faed1ae748f61ac9858 Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Mon, 14 Nov 2011 21:38:10 +0100
Subject: [ticket/10453] PM viewmessage page is misplacing the online icon

Removed the position: absolute value, and made it so that if the
buttons are bigger the text move with it, also added support for
bidi.css (text right to left).

PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
---
 phpBB/styles/prosilver/template/ucp_pm_message_header.html |  8 +-------
 phpBB/styles/prosilver/theme/bidi.css                      | 13 +++++++++++++
 phpBB/styles/prosilver/theme/cp.css                        | 13 ++++++++++---
 3 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index a1017d4b44..c3b7e54f45 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -6,18 +6,12 @@
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
-	<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
-		<div class="reply-all">
-			<ul class="linklist">
-				<li><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></li>	
-			</ul>
-		</div>
-	<!-- ENDIF -->
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
 			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
 			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
 			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
+	        <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			
 		</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f441784d85..c4a46b432c 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -591,6 +591,19 @@
 /* PM Styles
 ----------------------------------------*/
 
+/* PM panel adjustments */
+.rtl .reply-all a.right {
+	background-position: 5% 60%;
+}
+
+.rtl .reply-all a.right:hover {
+	background-position: 3% 60%;
+}
+
+.rtl .reply-all {
+	padding-left: 5px;
+}
+
 /* Defined rules list for PM options */
 .rtl ol.def-rules {
 	padding-right: 0;
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 9d04371115..6f45d13cef 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -349,10 +349,17 @@ dl.mini dd {
 }
 
 /* PM panel adjustments */
+.reply-all a.left {
+	background-position: 3px 60%;
+}
+
+.reply-all a.left:hover {
+	background-position: 0px 60%;
+}
+
 .reply-all {
-	margin-bottom: -60px;
-	position: absolute;
-	margin-left: 200px;
+    font-size: 11px;
+	padding-top: 5px;
 }
 
 /* PM Message history */
-- 
cgit v1.2.1


From 18aa4e4ecd55b846ead8e15853164bb5742099ef Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Dec 2011 15:13:11 +0000
Subject: [ticket/10535] Remove email confirm check on registration form

PHPBB3-10535
---
 phpBB/styles/prosilver/template/ucp_register.html  | 4 ----
 phpBB/styles/subsilver2/template/ucp_register.html | 4 ----
 2 files changed, 8 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index dd0e5ad02a..30ed37eecc 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -38,10 +38,6 @@
 		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
 		<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
-		<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
 		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index ad6fb8d056..0c3533292d 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -41,10 +41,6 @@
 	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
 	<td class="row2"><input class="post" type="text" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
 </tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b></td>
-	<td class="row2"><input class="post" type="text" name="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" /></td>
-</tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_PASSWORD}: </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td>
 	<td class="row2"><input class="post" type="password" name="new_password" size="25" value="{PASSWORD}" /></td>
-- 
cgit v1.2.1


From d73c3a297e1f31320c054685d5e38cb72a6357f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Dec 2011 23:15:24 +0000
Subject: [ticket/10535] Removed email confirm from UCP, removed unused
 language entries

PHPBB3-10535
---
 phpBB/styles/prosilver/template/ucp_profile_reg_details.html | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
index 9c3e98d053..9d4a9e3463 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
@@ -20,12 +20,6 @@
 		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
 		<dd><!-- IF S_CHANGE_EMAIL --><input type="text" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>
 	</dl>
-	<!-- IF S_CHANGE_EMAIL -->
-		<dl>
-			<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-			<dd><input type="text" name="email_confirm" id="email_confirm" maxlength="100" value="{CONFIRM_EMAIL}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd>
-		</dl>
-	<!-- ENDIF -->
 	<!-- IF S_CHANGE_PASSWORD -->
 		<dl>
 			<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-- 
cgit v1.2.1


From fd58a0ad374cfd535b0aff2f4bf1564a479fcdd0 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Dec 2011 23:17:21 +0000
Subject: [ticket/10535] Forgot a subsilver2 change. *doh*

PHPBB3-10535
---
 phpBB/styles/subsilver2/template/ucp_profile_reg_details.html | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
index 1b1c28fa3b..96e2e26683 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
@@ -22,12 +22,6 @@
 	<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
 	<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="100" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
 </tr>
-<!-- IF S_CHANGE_EMAIL -->
-	<tr>
-		<td class="row1" width="35%"><b class="genmed">{L_CONFIRM_EMAIL}: </b><br /><span class="gensmall">{L_CONFIRM_EMAIL_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" class="post" name="email_confirm" size="30" maxlength="100" value="{CONFIRM_EMAIL}" /></td>
-	</tr>
-<!-- ENDIF -->
 <!-- IF S_CHANGE_PASSWORD -->
 	<tr>
 		<td class="row1" width="35%"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td>
-- 
cgit v1.2.1


From 7295e5824aed6f5ec32cfab0ad17cfa2c24855ac Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Mon, 16 Jan 2012 14:35:29 +0200
Subject: [ticket/10380] BIDI support for imageset

BIDI support for imageset conversion script, added RTL imageset entries to prosilver and subsilver2, fixed small bug in imageset.css, changed spacing in code to match phpbb coding guidelines

PHPBB3-10380
---
 phpBB/styles/prosilver/theme/bidi.css        | 30 ++++++++++++++++++++++
 phpBB/styles/prosilver/theme/imageset.css    |  1 -
 phpBB/styles/subsilver2/theme/stylesheet.css | 38 ++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 81b916d373..6d77cb43f0 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -755,3 +755,33 @@
 .rtl #wrap, .rtl .headerbar, .rtl #site-description, .rtl .navbar {
 	position: relative;
 }
+
+/* Former imageset */
+.rtl .imageset.site_logo {
+	padding-right: 139px;
+	padding-left: 0;
+}
+.rtl .imageset.forum_link, .rtl .imageset.forum_read, .rtl .imageset.forum_read_locked, .rtl .imageset.forum_read_subforum, .rtl .imageset.forum_unread, .rtl .imageset.forum_unread_locked, .rtl .imageset.forum_unread_subforum, .rtl .imageset.topic_moved, .rtl .imageset.topic_read, .rtl .imageset.topic_read_mine, .rtl .imageset.topic_read_hot, .rtl .imageset.topic_read_hot_mine, .rtl .imageset.topic_read_locked, .rtl .imageset.topic_read_locked_mine, .rtl .imageset.topic_unread, .rtl .imageset.topic_unread_mine, .rtl .imageset.topic_unread_hot, .rtl .imageset.topic_unread_hot_mine, .rtl .imageset.topic_unread_locked, .rtl .imageset.topic_unread_locked_mine, .rtl .imageset.sticky_read, .rtl .imageset.sticky_read_mine, .rtl .imageset.sticky_read_locked, .rtl .imageset.sticky_read_locked_mine, .rtl .imageset.sticky_unread, .rtl .imageset.sticky_unread_mine, .rtl .imageset.sticky_unread_locked, .rtl .imageset.sticky_unread_locked_mine, .rtl .imageset.announce_read, .rtl .imageset.announce_read_mine, .rtl .imageset.announce_read_locked, .rtl .imageset.announce_read_locked_mine, .rtl .imageset.announce_unread, .rtl .imageset.announce_unread_mine, .rtl .imageset.announce_unread_locked, .rtl .imageset.announce_unread_locked_mine, .rtl .imageset.global_read, .rtl .imageset.global_read_mine, .rtl .imageset.global_read_locked, .rtl .imageset.global_read_locked_mine, .rtl .imageset.global_unread, .rtl .imageset.global_unread_mine, .rtl .imageset.global_unread_locked, .rtl .imageset.global_unread_locked_mine, .rtl .imageset.pm_read, .rtl .imageset.pm_unread {
+	padding-right: 27px;
+	padding-left: 0;
+}
+.rtl .imageset.subforum_read, .rtl .imageset.subforum_unread, .rtl .imageset.icon_post_target, .rtl .imageset.icon_post_target_unread, .rtl .imageset.icon_topic_latest, .rtl .imageset.icon_topic_newest {
+	padding-right: 11px;
+	padding-left: 0;
+}
+.rtl .imageset.icon_back_top {
+	padding-right: 11px;
+	padding-left: 0;
+}
+.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
+	padding-right: 20px;
+	padding-left: 0;
+}
+.rtl .imageset.icon_topic_attach {
+	padding-right: 7px;
+	padding-left: 0;
+}
+.rtl .imageset.icon_topic_reported, .rtl .imageset.icon_topic_unapproved {
+	padding-right: 16px;
+	padding-left: 0;
+}
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css
index cebab7845d..cb99e9e715 100644
--- a/phpBB/styles/prosilver/theme/imageset.css
+++ b/phpBB/styles/prosilver/theme/imageset.css
@@ -4,7 +4,6 @@ span.imageset {
 	background: transparent none 0 0 no-repeat;
 	margin: 0;
 	padding: 0;
-	padding-right: 0 !important;
 	width: 0;
 	height: 0;
 	overflow: hidden;
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index a753c914ba..427fe85e37 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1099,3 +1099,41 @@ a.imageset {
 	padding-left: 97px;
 	padding-top: 27px;
 }
+
+/* RTL imageset entries */
+.rtl .imageset.site_logo {
+	padding-right: 170px;
+	padding-left: 0;
+}
+.rtl .imageset.upload_bar {
+	padding-right: 280px;
+	padding-left: 0;
+}
+.rtl .imageset.poll_left, .rtl .imageset.poll_right {
+	padding-right: 4px;
+	padding-left: 0;
+}
+.rtl .imageset.poll_center {
+	padding-right: 1px;
+	padding-left: 0;
+}
+.rtl .imageset.forum_link, .rtl .imageset.forum_read, .rtl .imageset.forum_read_locked, .rtl .imageset.forum_read_subforum, .rtl .imageset.forum_unread, .rtl .imageset.forum_unread_locked, .rtl .imageset.forum_unread_subforum {
+	padding-right: 46px;
+	padding-left: 0;
+}
+.rtl .imageset.topic_moved, .rtl .imageset.topic_read, .rtl .imageset.topic_read_mine, .rtl .imageset.topic_read_hot, .rtl .imageset.topic_read_hot_mine, .rtl .imageset.topic_read_locked, .rtl .imageset.topic_read_locked_mine, .rtl .imageset.topic_unread, .rtl .imageset.topic_unread_mine, .rtl .imageset.topic_unread_hot, .rtl .imageset.topic_unread_hot_mine, .rtl .imageset.topic_unread_locked, .rtl .imageset.topic_unread_locked_mine, .rtl .imageset.sticky_read, .rtl .imageset.sticky_read_mine, .rtl .imageset.sticky_read_locked, .rtl .imageset.sticky_read_locked_mine, .rtl .imageset.sticky_unread, .rtl .imageset.sticky_unread_mine, .rtl .imageset.sticky_unread_locked, .rtl .imageset.sticky_unread_locked_mine, .rtl .imageset.announce_read, .rtl .imageset.announce_read_mine, .rtl .imageset.announce_read_locked, .rtl .imageset.announce_read_locked_mine, .rtl .imageset.announce_unread, .rtl .imageset.announce_unread_mine, .rtl .imageset.announce_unread_locked, .rtl .imageset.announce_unread_locked_mine, .rtl .imageset.global_read, .rtl .imageset.global_read_mine, .rtl .imageset.global_read_locked, .rtl .imageset.global_read_locked_mine, .rtl .imageset.global_unread, .rtl .imageset.global_unread_mine, .rtl .imageset.global_unread_locked, .rtl .imageset.global_unread_locked_mine, .rtl .imageset.pm_read, .rtl .imageset.pm_unread, .rtl .imageset.icon_topic_reported, .rtl .imageset.icon_topic_unapproved {
+	padding-right: 19px;
+	padding-left: 0;
+}
+.rtl .imageset.icon_post_target, .rtl .imageset.icon_post_target_unread {
+	padding-right: 12px;
+	padding-left: 0;
+}
+.rtl .imageset.icon_topic_attach {
+	padding-right: 14px;
+	padding-left: 0;
+}
+.rtl .imageset.icon_topic_latest, .rtl .imageset.icon_topic_newest {
+	padding-right: 18px;
+	padding-left: 0;
+}
-- 
cgit v1.2.1


From c54c06e98cc39568c8259e74091ddddb36d2921c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 20 Jan 2012 12:41:36 +0200
Subject: [ticket/10378] Missing entries from imageset to css conversion

Adding missing entries from imageset to css conversion to prosilver/theme/en/stylesheet.css

PHPBB3-10378
---
 phpBB/styles/prosilver/theme/en/stylesheet.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/en/stylesheet.css b/phpBB/styles/prosilver/theme/en/stylesheet.css
index 62d6b86726..d17f9a5be4 100644
--- a/phpBB/styles/prosilver/theme/en/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/en/stylesheet.css
@@ -11,6 +11,22 @@ ul.profile-icons li.pm-icon		{ width: 28px; height: 20px; }
 ul.profile-icons li.quote-icon	{ width: 54px; height: 20px; }
 ul.profile-icons li.edit-icon	{ width: 42px; height: 20px; }
 
+/* Online image */
+.online { background-image: url("./icon_user_online.gif"); }
+
+/* Big button images */
+.reply-icon span	{ background-image: url("./button_topic_reply.gif"); }
+.post-icon span		{ background-image: url("./button_topic_new.gif"); }
+.locked-icon span	{ background-image: url("./button_topic_locked.gif"); }
+.pmreply-icon span	{ background-image: url("./button_pm_reply.gif") ;}
+.newpm-icon span 	{ background-image: url("./button_pm_new.gif") ;}
+.forwardpm-icon span	{ background-image: url("./button_pm_forward.gif") ;}
+
+/* Icon images */
+.pm-icon, .pm-icon a				{ background-image: url("./icon_contact_pm.gif"); }
+.quote-icon, .quote-icon a		{ background-image: url("./icon_post_quote.gif"); }
+.edit-icon, .edit-icon a			{ background-image: url("./icon_post_edit.gif"); }
+
 /* EN Language Pack */
 .imageset.icon_contact_pm {
 	background-image: url("./icon_contact_pm.gif");
-- 
cgit v1.2.1


From 879c92e8a2b27586d6531de705ded49c6f662ffa Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 15:38:52 +0200
Subject: [ticket/10569] Invalid string comparison in subsilver2

Fixing invalid string comparison in ucp_main_front.html in subsilver2

PHPBB3-10569
---
 phpBB/styles/subsilver2/template/ucp_main_front.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html
index fdef0bd949..dc945c83d6 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_front.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_front.html
@@ -48,11 +48,11 @@
 		<!-- IF S_SHOW_ACTIVITY -->
 			<tr>
 				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}: </b></td>
-				<td><!-- IF ACTIVE_FORUM --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
+				<td><!-- IF ACTIVE_FORUM != '' --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td>
-				<td><!-- IF ACTIVE_TOPIC --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
+				<td><!-- IF ACTIVE_TOPIC != '' --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
 			</tr>
 		<!-- ENDIF -->
 		<!-- IF WARNINGS -->
-- 
cgit v1.2.1


From d2a34961498a03b77885af6a20497e87d36ad7ef Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 16:00:14 +0200
Subject: [ticket/10616] Add template inheritance to default styles

Adding template inheritance field to prosilver and subsilver2

PHPBB3-10616
---
 phpBB/styles/prosilver/template/template.cfg  | 5 +++++
 phpBB/styles/subsilver2/template/template.cfg | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg
index d31dcb7356..0b0533573a 100644
--- a/phpBB/styles/prosilver/template/template.cfg
+++ b/phpBB/styles/prosilver/template/template.cfg
@@ -23,3 +23,8 @@ version = 3.0.10
 
 # Defining a different template bitfield
 template_bitfield = lNg=
+
+# Template inheritance
+# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
+# Set value to empty to ignore template inheritance
+inherit_from = prosilver
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index 4e5c36af99..d557edba87 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -21,3 +21,7 @@ name = subsilver2
 copyright = &copy; phpBB Group, 2003
 version = 3.0.10
 
+# Template inheritance
+# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
+# Set value to empty to ignore template inheritance
+inherit_from = subsilver2
-- 
cgit v1.2.1


From 62288b3c05049cb02732204af062e0baa1191992 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 7 Feb 2012 22:03:24 +0200
Subject: [ticket/10569] Invalid string comparison in prosilver

Fixing invalid string comparison in ucp_main_front.html in prosilver

PHPBB3-10569
---
 phpBB/styles/prosilver/template/ucp_main_front.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 39c5d4f396..4a6fa3bf86 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -34,8 +34,8 @@
 		<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
 		<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd>
 		<dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
-		<!-- IF ACTIVE_FORUM --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
-		<!-- IF ACTIVE_TOPIC --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
+		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
+		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
 		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
 	</dl>
 
-- 
cgit v1.2.1


From 2a5e30db9e13bc5c8895774291137a9dccb3a2c4 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 11 Feb 2012 01:40:01 -0600
Subject: [ticket/10641] Update MCP template with new plurality forms

Updates the MCP template according to PHPBB3-10345

PHPBB3-10641
---
 phpBB/styles/prosilver/template/mcp_front.html  | 12 +++---------
 phpBB/styles/subsilver2/template/mcp_front.html | 18 ------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 21431b4bc1..e9635e528c 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -10,7 +10,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<h3>{L_LATEST_UNAPPROVED}</h3>
-		<!-- IF S_HAS_UNAPPROVED_POSTS --><p>{L_UNAPPROVED_TOTAL}</p><!-- ENDIF -->
+		<p>{L_UNAPPROVED_TOTAL}</p>
 
 		<!-- IF .unapproved -->
 			<ul class="topiclist">
@@ -40,8 +40,6 @@
 			</li>
 			<!-- END unapproved -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_UNAPPROVED_POSTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		<span class="corners-bottom"><span></span></span></div>
@@ -64,7 +62,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<h3>{L_LATEST_REPORTED}</h3>
-		<!-- IF S_HAS_REPORTS --><p>{L_REPORTS_TOTAL}</p><!-- ENDIF -->
+		<p>{L_REPORTS_TOTAL}</p>
 
 		<!-- IF .report -->
 			<ul class="topiclist">
@@ -92,8 +90,6 @@
 			</li>
 			<!-- END report -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_REPORTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		<span class="corners-bottom"><span></span></span></div>
@@ -105,7 +101,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<h3>{L_LATEST_REPORTED_PMS}</h3>
-		<!-- IF S_HAS_PM_REPORTS --><p>{L_PM_REPORTS_TOTAL}</p><!-- ENDIF -->
+		<p>{L_PM_REPORTS_TOTAL}</p>
 
 		<!-- IF .pm_report -->
 			<ul class="topiclist">
@@ -133,8 +129,6 @@
 			</li>
 			<!-- END pm_report -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_PM_REPORTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html
index f4b146f4c5..7c17e13c52 100644
--- a/phpBB/styles/subsilver2/template/mcp_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_front.html
@@ -24,16 +24,10 @@
 			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gensmall">{unapproved.POST_TIME}</span></td>
 			<td class="row2" align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{unapproved.POST_ID}" /></td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="6" align="center"><span class="gen">{L_UNAPPROVED_POSTS_ZERO_TOTAL}</span></td>
-		</tr>
 	<!-- END unapproved -->
-	<!-- IF S_HAS_UNAPPROVED_POSTS -->
 		<tr>
 			<td class="row3" colspan="6"><span class="gensmall">{L_UNAPPROVED_TOTAL}</span></td>
 		</tr>
-	<!-- ENDIF -->
 	<tr>
 		<td class="cat" colspan="6" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
 	</tr>
@@ -70,16 +64,10 @@
 			<td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{report.REPORTER_FULL}</span></td>
 			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gensmall">{report.REPORT_TIME}</span></td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" align="center"><span class="gen">{L_REPORTS_ZERO_TOTAL}</span></td>
-		</tr>
 	<!-- END report -->
-	<!-- IF S_HAS_REPORTS -->
 		<tr>
 			<td class="row3" colspan="5"><span class="gensmall">{L_REPORTS_TOTAL}</span></td>
 		</tr>
-	<!-- ENDIF -->
 	</table>
 
 	<br clear="all" /><br />
@@ -107,16 +95,10 @@
 			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.REPORTER_FULL}</span></td>
 			<td class="row2" align="center" width="10%" nowrap="nowrap" valign="top"><span class="gensmall">{pm_report.REPORT_TIME}</span></td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="6" align="center"><span class="gen">{L_PM_REPORTS_ZERO_TOTAL}</span></td>
-		</tr>
 	<!-- END pm_report -->
-	<!-- IF S_HAS_PM_REPORTS -->
 		<tr>
 			<td class="row3" colspan="6"><span class="gensmall">{L_PM_REPORTS_TOTAL}</span></td>
 		</tr>
-	<!-- ENDIF -->
 	</table>
 
 	<br clear="all" /><br />
-- 
cgit v1.2.1


From 340a8f19d687efab84de9335e7c40cabeef90acf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Feb 2012 11:25:22 +0100
Subject: [ticket/10456] Add tabindex to subsilver2 captcha

Did not set tabindex on registration page, as the hole page does not have any.

PHPBB3-10456
---
 phpBB/styles/subsilver2/template/captcha_default.html | 2 +-
 phpBB/styles/subsilver2/template/captcha_qa.html      | 2 +-
 phpBB/styles/subsilver2/template/login_body.html      | 2 +-
 phpBB/styles/subsilver2/template/posting_body.html    | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html
index 4c65f81643..e2edf0b810 100644
--- a/phpBB/styles/subsilver2/template/captcha_default.html
+++ b/phpBB/styles/subsilver2/template/captcha_default.html
@@ -12,6 +12,6 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" />
+		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> />
 		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="btnlite" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html
index 23d2a92f68..acc9cdcdfb 100644
--- a/phpBB/styles/subsilver2/template/captcha_qa.html
+++ b/phpBB/styles/subsilver2/template/captcha_qa.html
@@ -3,6 +3,6 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}:</b><br /><span class="gensmall">{L_CONFIRM_QUESTION_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td>
+		<td class="row2"><input class="post" type="text" name="qa_answer" size="80"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> /></td>
 		<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html
index 262341e0c0..ba316517a9 100644
--- a/phpBB/styles/subsilver2/template/login_body.html
+++ b/phpBB/styles/subsilver2/template/login_body.html
@@ -68,7 +68,7 @@
 <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
 </table>
 <table class="tablebg" width="100%" cellspacing="1">
-		
+	<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
 	<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index fec6d7ff6c..d7947caf2f 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -333,6 +333,7 @@
 <!-- ENDIF -->
 
 		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
+		<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
 		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 		<!-- ENDIF -->
 
-- 
cgit v1.2.1


From 30c08bfe5bcfa9e9a62cf8a018dd32d2a7e11b81 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Feb 2012 16:25:47 +0100
Subject: [ticket/10458] Fix xHTML errors when print-viewing PMs

PHPBB3-10458
---
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index e72d9bba6e..bafb64dbc8 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -1,10 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
+<meta charset="utf-8">
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 <meta name="robots" content="noindex" />
@@ -16,7 +13,7 @@
 
 <body id="phpbb">
 <div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
+	<a id="top" accesskey="t"></a>
 
 	<div id="page-header">
 		<h1>{SITENAME}</h1>
-- 
cgit v1.2.1


From d3d8793c1fb161c6450e50c09062c5e4fc9b11aa Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 26 Feb 2012 16:54:31 +0200
Subject: [ticket/10453] Fixing spacing

Fixing spacing

PHPBB3-10453
---
 phpBB/styles/prosilver/template/ucp_pm_message_header.html | 2 +-
 phpBB/styles/prosilver/template/ucp_pm_viewmessage.html    | 2 +-
 phpBB/styles/prosilver/theme/cp.css                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index c3b7e54f45..ae66dd0a36 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -11,7 +11,7 @@
 			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
 			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
 			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
-	        <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			
+			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			
 		</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 79c2c0355f..1840732b64 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -2,7 +2,7 @@
 
 <!-- INCLUDE ucp_pm_message_header.html -->
 
-		<span class="corners-bottom"><span></span></span></div>
+	<span class="corners-bottom"><span></span></span></div>
 </div>
 
 
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index e28887d60f..aed88831a8 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -358,7 +358,7 @@ dl.mini dd {
 }
 
 .reply-all {
-    font-size: 11px;
+	font-size: 11px;
 	padding-top: 5px;
 }
 
-- 
cgit v1.2.1


From d3091da5eade90aac1b13244d04bd1fb342bcc59 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Feb 2012 01:08:04 +0100
Subject: [ticket/9220] Remove margin on table.table1 so it's centered in the
 blue box.

The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.

PHPBB3-9220
---
 phpBB/styles/prosilver/template/memberlist_body.html    |  2 +-
 phpBB/styles/prosilver/template/memberlist_leaders.html |  4 ++--
 phpBB/styles/prosilver/template/search_body.html        |  2 +-
 phpBB/styles/prosilver/template/viewonline_body.html    |  2 +-
 phpBB/styles/prosilver/theme/common.css                 | 14 +++++++++++++-
 phpBB/styles/prosilver/theme/tweaks.css                 |  4 ----
 6 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 9e6f8c3aab..5ea774bf06 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -80,7 +80,7 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 <!-- ENDIF -->
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html
index 3917498050..26e299d261 100644
--- a/phpBB/styles/prosilver/template/memberlist_leaders.html
+++ b/phpBB/styles/prosilver/template/memberlist_leaders.html
@@ -4,7 +4,7 @@
 
 <form method="post" action="{S_MODE_ACTION}">
 
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<table class="table1" cellspacing="1">
@@ -37,7 +37,7 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 	 
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html
index 6616b95a73..4b1d30d77d 100644
--- a/phpBB/styles/prosilver/template/search_body.html
+++ b/phpBB/styles/prosilver/template/search_body.html
@@ -98,7 +98,7 @@
 </form>
 
 <!-- IF .recentsearch -->
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index b111d743f9..3f1f0e64bf 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -7,7 +7,7 @@
 	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
 </ul>
 
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 	
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 8b5e09297e..7eb00bd808 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -418,7 +418,19 @@ table.info tbody th {
 }
 
 .forumbg table.table1 {
-	margin: 0 -2px -1px -1px;
+	margin: 0;
+}
+
+.forumbg-table > .inner {
+	margin: 0 -1px;
+}
+
+.forumbg-table > .inner > span.corners-top {
+	margin: 0 -4px -1px -4px;
+}
+
+.forumbg-table > .inner > span.corners-bottom {
+	margin: -1px -4px 0 -4px;
 }
 
 /* Misc layout styles
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index f7322c2cce..5e11b2122b 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -87,10 +87,6 @@ dl.icon {
 	float: none;
 }
 
-* html .forumbg table.table1 {
-	margin: 0 -2px 0px -1px;
-}
-
 /* Headerbar height fix for IE7 and below */
 * html #site-description p {
 	margin-bottom: 1.0em;
-- 
cgit v1.2.1